Merge pull request #5 from Connatix/add-cnx-adapter

Increment package version to v3
prebid · Nov 4, 2024 · 4be32f5 · 4be32f5
2 parents a69ba3c + ce01457
commit 4be32f5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/adapters/connatix/connatix.go b/adapters/connatix/connatix.go
@@ -9,10 +9,11 @@ import (
 
 	"github.com/buger/jsonparser"
 	"github.com/prebid/openrtb/v20/openrtb2"
-	"github.com/prebid/prebid-server/v2/adapters"
-	"github.com/prebid/prebid-server/v2/config"
-	"github.com/prebid/prebid-server/v2/errortypes"
-	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/v3/adapters"
+	"github.com/prebid/prebid-server/v3/config"
+	"github.com/prebid/prebid-server/v3/errortypes"
+	"github.com/prebid/prebid-server/v3/openrtb_ext"
+	"github.com/prebid/prebid-server/v3/util/jsonutil"
 )
 
 const (
@@ -88,7 +89,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
 	}
 
 	var connatixResponse openrtb2.BidResponse
-	if err := json.Unmarshal(response.Body, &connatixResponse); err != nil {
+	if err := jsonutil.Unmarshal(response.Body, &connatixResponse); err != nil {
 		return nil, []error{err}
 	}
 
@@ -100,7 +101,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
 			var bidExt bidExt
 			var bidType openrtb_ext.BidType
 
-			if err := json.Unmarshal(bid.Ext, &bidExt); err != nil {
+			if err := jsonutil.Unmarshal(bid.Ext, &bidExt); err != nil {
 				bidType = openrtb_ext.BidTypeBanner
 			} else {
 				bidType = getBidType(bidExt)
@@ -120,7 +121,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
 
 func validateAndBuildImpExt(imp *openrtb2.Imp) (impExtIncoming, error) {
 	var ext impExtIncoming
-	if err := json.Unmarshal(imp.Ext, &ext); err != nil {
+	if err := jsonutil.Unmarshal(imp.Ext, &ext); err != nil {
 		return impExtIncoming{}, err
 	}
 
@@ -176,7 +177,7 @@ func splitRequests(imps []openrtb2.Imp, request *openrtb2.BidRequest, uri string
 		impsForReq := imps[startInd:endInd]
 		request.Imp = impsForReq
 
-		reqJSON, err := json.Marshal(request)
+		reqJSON, err := jsonutil.Marshal(request)
 		if err != nil {
 			errs = append(errs, err)
 			return nil, errs

diff --git a/adapters/connatix/connatix_test.go b/adapters/connatix/connatix_test.go
@@ -3,9 +3,9 @@ package connatix
 import (
 	"testing"
 
-	"github.com/prebid/prebid-server/v2/adapters/adapterstest"
-	"github.com/prebid/prebid-server/v2/config"
-	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/v3/adapters/adapterstest"
+	"github.com/prebid/prebid-server/v3/config"
+	"github.com/prebid/prebid-server/v3/openrtb_ext"
 )
 
 func TestJsonSamples(t *testing.T) {

diff --git a/adapters/connatix/models.go b/adapters/connatix/models.go
@@ -3,7 +3,7 @@ package connatix
 import (
 	"net/url"
 
-	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/v3/openrtb_ext"
 )
 
 type adapter struct {

diff --git a/adapters/connatix/params_test.go b/adapters/connatix/params_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/v3/openrtb_ext"
 )
 
 // This file actually intends to test static/bidder-params/connatix.json

diff --git a/exchange/adapter_builders.go b/exchange/adapter_builders.go
@@ -72,6 +72,7 @@ import (
 	"github.com/prebid/prebid-server/v3/adapters/colossus"
 	"github.com/prebid/prebid-server/v3/adapters/compass"
 	"github.com/prebid/prebid-server/v3/adapters/concert"
+	"github.com/prebid/prebid-server/v3/adapters/connatix"
 	"github.com/prebid/prebid-server/v3/adapters/connectad"
 	"github.com/prebid/prebid-server/v3/adapters/consumable"
 	"github.com/prebid/prebid-server/v3/adapters/conversant"