From cedfb6ec6b83670546eddf15537036fee4dcc866 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Mon, 22 Sep 2025 14:45:55 +0200 Subject: [PATCH 1/4] Fix #4141 don't set the ext.adunitcode --- .../server/bidder/sovrn/SovrnBidder.java | 9 ------- .../server/bidder/sovrn/SovrnBidderTest.java | 24 +++---------------- .../sovrn/test-auction-sovrn-request.json | 2 +- .../sovrn/test-sovrn-bid-request.json | 5 ++-- 4 files changed, 6 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java b/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java index ac5e2268500..ee79f854777 100644 --- a/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java +++ b/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java @@ -41,7 +41,6 @@ public class SovrnBidder implements Bidder { private static final String LJT_READER_COOKIE_NAME = "ljt_reader"; - private static final String EXT_AD_UNIT_CODE_PARAM = "adunitcode"; private static final TypeReference> SOVRN_EXT_TYPE_REFERENCE = new TypeReference<>() { @@ -91,7 +90,6 @@ private Imp makeImp(Imp imp) { return imp.toBuilder() .bidfloor(resolveBidFloor(imp.getBidfloor(), sovrnExt.getBidfloor())) .tagid(resolveTagId(sovrnExt)) - .ext(resolveImpExt(sovrnExt, impExt)) .build(); } @@ -117,13 +115,6 @@ private String resolveTagId(ExtImpSovrn sovrnExt) { return tagId; } - private ObjectNode resolveImpExt(ExtImpSovrn sovrnExt, ObjectNode impExt) { - final ObjectNode sovrnImpExt = impExt.deepCopy(); - return StringUtils.isNotBlank(sovrnExt.getAdunitcode()) - ? sovrnImpExt.putPOJO(EXT_AD_UNIT_CODE_PARAM, sovrnExt.getAdunitcode()) - : sovrnImpExt; - } - private Result>> makeHttpRequest(BidRequest bidRequest, List errors) { diff --git a/src/test/java/org/prebid/server/bidder/sovrn/SovrnBidderTest.java b/src/test/java/org/prebid/server/bidder/sovrn/SovrnBidderTest.java index 68d4df4d00d..68f6bd9d0ec 100644 --- a/src/test/java/org/prebid/server/bidder/sovrn/SovrnBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/sovrn/SovrnBidderTest.java @@ -158,26 +158,8 @@ public void makeHttpRequestsShouldReturnResultWithHttpRequestContainingExpectedF .extracting(HttpRequest::getBody) .extracting(SovrnBidderTest::mappedToBidRequest) .flatExtracting(BidRequest::getImp) - .extracting(Imp::getBidfloor, Imp::getTagid, e -> e.getExt().get("adunitcode")) - .containsExactly(tuple(BigDecimal.TEN, "tagid", mapper.valueToTree("sovrn_auc"))); - } - - @Test - public void makeHttpRequestsShouldSetAdUnitCodeFromExtIfPresent() { - // given - final BidRequest bidRequest = givenBidRequest(identity()); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getValue()).hasSize(1) - .extracting(HttpRequest::getBody) - .extracting(SovrnBidderTest::mappedToBidRequest) - .flatExtracting(BidRequest::getImp) - .extracting(Imp::getExt) - .extracting(e -> e.get("adunitcode")) - .containsExactly(mapper.valueToTree("sovrn_auc")); + .extracting(Imp::getBidfloor, Imp::getTagid, e -> e.getExt().get("bidder").get("adunitcode")) + .containsExactly(tuple(BigDecimal.TEN, "tagid", mapper.valueToTree("sovrn_auc_bidder"))); } @Test @@ -545,7 +527,7 @@ private static Imp givenImp(UnaryOperator impCustomizer) { .protocols(singletonList(1)) .build()) .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpSovrn.of("tagid", - "legacyTagId", BigDecimal.TEN, "sovrn_auc"))))) + "legacyTagId", BigDecimal.TEN, "sovrn_auc_bidder"))))) .build(); } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json index 5351844a7e3..92f1313462f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json @@ -17,7 +17,7 @@ }, "ext": { "sovrn": { - "adunitcode": "sovrn_auc", + "adunitcode": "sovrn_auc_bidder", "tagid": "tag_id" } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json index 7de057a5d19..426347f4041 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json @@ -21,9 +21,8 @@ "tid": "${json-unit.any-string}", "bidder": { "tagid": "tag_id", - "adunitcode": "sovrn_auc" - }, - "adunitcode": "sovrn_auc" + "adunitcode": "sovrn_auc_bidder" + } } } ], From c62425e94dd0450cec1998f6e174c1080c1e718b Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Mon, 22 Sep 2025 14:53:18 +0200 Subject: [PATCH 2/4] Fix #4141 send the gpid through in the test fixtures --- .../server/it/openrtb2/sovrn/test-auction-sovrn-request.json | 3 ++- .../server/it/openrtb2/sovrn/test-sovrn-bid-request.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json index 92f1313462f..9021db66ebc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json @@ -19,7 +19,8 @@ "sovrn": { "adunitcode": "sovrn_auc_bidder", "tagid": "tag_id" - } + }, + "gpid": "test_gpid" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json index 426347f4041..7b2bfcd5ec2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json @@ -22,7 +22,8 @@ "bidder": { "tagid": "tag_id", "adunitcode": "sovrn_auc_bidder" - } + }, + "gpid": "test_gpid" } } ], From 11d3a2dc38fc8b1d873247bca151d463ed5d0231 Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Mon, 22 Sep 2025 15:08:55 +0200 Subject: [PATCH 3/4] Fix #4141 added an adUnitCode in imp.ext that should be just passed-through without alteration --- .../server/it/openrtb2/sovrn/test-auction-sovrn-request.json | 3 ++- .../server/it/openrtb2/sovrn/test-sovrn-bid-request.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json index 9021db66ebc..7864136df9b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json @@ -20,7 +20,8 @@ "adunitcode": "sovrn_auc_bidder", "tagid": "tag_id" }, - "gpid": "test_gpid" + "gpid": "test_gpid", + "adunitcode": "sovrn_auc_passthrough" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json index 7b2bfcd5ec2..0093be36410 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json @@ -23,7 +23,8 @@ "tagid": "tag_id", "adunitcode": "sovrn_auc_bidder" }, - "gpid": "test_gpid" + "gpid": "test_gpid", + "adunitcode": "sovrn_auc_passthrough" } } ], From 8bb55048b815281e8366d300cdf10c73919e491d Mon Sep 17 00:00:00 2001 From: Emil Nadimanov Date: Mon, 22 Sep 2025 15:21:23 +0200 Subject: [PATCH 4/4] Revert "Fix #4141 added an adUnitCode in imp.ext that should be just passed-through without alteration" This reverts commit 11d3a2dc38fc8b1d873247bca151d463ed5d0231. --- .../server/it/openrtb2/sovrn/test-auction-sovrn-request.json | 3 +-- .../server/it/openrtb2/sovrn/test-sovrn-bid-request.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json index 7864136df9b..9021db66ebc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-request.json @@ -20,8 +20,7 @@ "adunitcode": "sovrn_auc_bidder", "tagid": "tag_id" }, - "gpid": "test_gpid", - "adunitcode": "sovrn_auc_passthrough" + "gpid": "test_gpid" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json index 0093be36410..7b2bfcd5ec2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-sovrn-bid-request.json @@ -23,8 +23,7 @@ "tagid": "tag_id", "adunitcode": "sovrn_auc_bidder" }, - "gpid": "test_gpid", - "adunitcode": "sovrn_auc_passthrough" + "gpid": "test_gpid" } } ],