From 890941b3636c5f0444a1f2d676a503286a7293f0 Mon Sep 17 00:00:00 2001 From: Karim Mourra Date: Fri, 5 Sep 2025 12:39:52 -0300 Subject: [PATCH 1/7] keeps entire imp ext --- .../prebid/server/bidder/connatix/ConnatixBidder.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java index b319b04c932..5ee2a4f3bd9 100644 --- a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java +++ b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java @@ -171,13 +171,11 @@ private ExtImpConnatix parseExtImp(Imp imp) { private Imp modifyImp(Imp imp, ExtImpConnatix extImpConnatix, String displayManagerVer, BidRequest request) { final Price bidFloorPrice = resolveBidFloor(imp, request); - final ObjectNode impExt = mapper.mapper() - .createObjectNode().set("connatix", mapper.mapper().valueToTree(extImpConnatix)); + final ObjectNode impExt = imp.getExt() != null + ? (ObjectNode) imp.getExt().deepCopy() + : mapper.mapper().createObjectNode(); - Optional.ofNullable(imp.getExt()) - .map(ext -> ext.get(GPID_KEY)) - .filter(JsonNode::isTextual) - .ifPresent(gpidNode -> impExt.set(GPID_KEY, gpidNode)); + impExt.set("connatix", mapper.mapper().valueToTree(extImpConnatix)); return imp.toBuilder() .ext(impExt) From c26257ffcf05e710aeb7295c3b2c27e59cbc0312 Mon Sep 17 00:00:00 2001 From: Karim Mourra Date: Fri, 5 Sep 2025 12:41:22 -0300 Subject: [PATCH 2/7] removes redundant casting --- .../java/org/prebid/server/bidder/connatix/ConnatixBidder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java index 5ee2a4f3bd9..1df415eb23e 100644 --- a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java +++ b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java @@ -172,7 +172,7 @@ private Imp modifyImp(Imp imp, ExtImpConnatix extImpConnatix, String displayMana final Price bidFloorPrice = resolveBidFloor(imp, request); final ObjectNode impExt = imp.getExt() != null - ? (ObjectNode) imp.getExt().deepCopy() + ? imp.getExt().deepCopy() : mapper.mapper().createObjectNode(); impExt.set("connatix", mapper.mapper().valueToTree(extImpConnatix)); From 8bf075fb6c26a81878c1cc71209317fb02b4999d Mon Sep 17 00:00:00 2001 From: Karim Mourra Date: Fri, 5 Sep 2025 12:50:40 -0300 Subject: [PATCH 3/7] adds tests --- .../org/prebid/server/bidder/connatix/ConnatixBidderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java b/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java index f24dec142fb..01fb0c58930 100644 --- a/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java @@ -350,11 +350,12 @@ public void makeHttpRequestsShouldExcludeDataCenterWhenUserIdIsMissing() { } @Test - public void makeHttpRequestsShouldIncludeGpidWhenPresent() { + public void makeHttpRequestsShouldIncludeEntireImpExt() { // given final ObjectNode impExt = mapper.createObjectNode(); impExt.set("bidder", mapper.valueToTree(ExtImpConnatix.of("placementId", null))); impExt.put("gpid", "test-gpid"); + impExt.put("random", "test-random"); final BidRequest bidRequest = givenBidRequest( UnaryOperator.identity(), @@ -367,6 +368,7 @@ public void makeHttpRequestsShouldIncludeGpidWhenPresent() { final ObjectNode expectedExt = mapper.createObjectNode(); expectedExt.set("connatix", mapper.valueToTree(ExtImpConnatix.of("placementId", null))); expectedExt.put("gpid", "test-gpid"); + expectedExt.put("random", "test-random"); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) From ecab6579175f303655861a98c197d101b02a30ce Mon Sep 17 00:00:00 2001 From: Karim Mourra Date: Fri, 5 Sep 2025 13:00:19 -0300 Subject: [PATCH 4/7] removes space --- .../java/org/prebid/server/bidder/connatix/ConnatixBidder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java index 1df415eb23e..e9b7e00fa07 100644 --- a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java +++ b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java @@ -171,7 +171,7 @@ private ExtImpConnatix parseExtImp(Imp imp) { private Imp modifyImp(Imp imp, ExtImpConnatix extImpConnatix, String displayManagerVer, BidRequest request) { final Price bidFloorPrice = resolveBidFloor(imp, request); - final ObjectNode impExt = imp.getExt() != null + final ObjectNode impExt = imp.getExt() != null ? imp.getExt().deepCopy() : mapper.mapper().createObjectNode(); From 8db736991a0c3d945eecbf272f6f1bebbcb1f551 Mon Sep 17 00:00:00 2001 From: Karim Mourra Date: Fri, 5 Sep 2025 15:51:44 -0300 Subject: [PATCH 5/7] removes bidder --- .../java/org/prebid/server/bidder/connatix/ConnatixBidder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java index e9b7e00fa07..aef2abcaf61 100644 --- a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java +++ b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java @@ -175,6 +175,7 @@ private Imp modifyImp(Imp imp, ExtImpConnatix extImpConnatix, String displayMana ? imp.getExt().deepCopy() : mapper.mapper().createObjectNode(); + impExt.remove("bidder"); impExt.set("connatix", mapper.mapper().valueToTree(extImpConnatix)); return imp.toBuilder() From 2801e6c0ed9f1b68c0dbc8413cd69154bca3ee98 Mon Sep 17 00:00:00 2001 From: Karim Mourra Date: Fri, 5 Sep 2025 16:30:49 -0300 Subject: [PATCH 6/7] keeps bidder data --- .../java/org/prebid/server/bidder/connatix/ConnatixBidder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java index aef2abcaf61..e9b7e00fa07 100644 --- a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java +++ b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java @@ -175,7 +175,6 @@ private Imp modifyImp(Imp imp, ExtImpConnatix extImpConnatix, String displayMana ? imp.getExt().deepCopy() : mapper.mapper().createObjectNode(); - impExt.remove("bidder"); impExt.set("connatix", mapper.mapper().valueToTree(extImpConnatix)); return imp.toBuilder() From 9c193b96d3b35be47db17a9306819b44caf71418 Mon Sep 17 00:00:00 2001 From: Karim Mourra Date: Fri, 5 Sep 2025 16:47:57 -0300 Subject: [PATCH 7/7] fixes tests --- .../java/org/prebid/server/bidder/connatix/ConnatixBidder.java | 1 + .../it/openrtb2/connatix/test-banner-connatix-bid-request.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java index e9b7e00fa07..aef2abcaf61 100644 --- a/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java +++ b/src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java @@ -175,6 +175,7 @@ private Imp modifyImp(Imp imp, ExtImpConnatix extImpConnatix, String displayMana ? imp.getExt().deepCopy() : mapper.mapper().createObjectNode(); + impExt.remove("bidder"); impExt.set("connatix", mapper.mapper().valueToTree(extImpConnatix)); return imp.toBuilder() diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connatix/test-banner-connatix-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/connatix/test-banner-connatix-bid-request.json index c9007f58508..206373719fb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/connatix/test-banner-connatix-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/connatix/test-banner-connatix-bid-request.json @@ -12,6 +12,7 @@ "connatix": { "placementId": "some-placement-id" }, + "tid": "${json-unit.any-string}", "gpid": "test-gpid" } }