From 49e6a7afa83d19be2857f8c65e54dac9534fafbd Mon Sep 17 00:00:00 2001 From: SerhiiNahornyi Date: Wed, 26 Jun 2024 15:52:00 +0200 Subject: [PATCH] Rubicon: No longer copy FPD fields (#3263) --- .../server/bidder/rubicon/RubiconBidder.java | 25 ------- .../bidder/rubicon/RubiconBidderTest.java | 65 +------------------ 2 files changed, 1 insertion(+), 89 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java b/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java index 144a13918fa..45c43a00af6 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java @@ -141,12 +141,7 @@ public class RubiconBidder implements Bidder { private static final String FPD_GPID_FIELD = "gpid"; private static final String FPD_SKADN_FIELD = "skadn"; - private static final String FPD_SECTIONCAT_FIELD = "sectioncat"; - private static final String FPD_PAGECAT_FIELD = "pagecat"; private static final String FPD_PAGE_FIELD = "page"; - private static final String FPD_REF_FIELD = "ref"; - private static final String FPD_SEARCH_FIELD = "search"; - private static final String FPD_CONTEXT_FIELD = "context"; private static final String FPD_DATA_FIELD = "data"; private static final String FPD_DATA_PBADSLOT_FIELD = "pbadslot"; private static final String FPD_ADSERVER_FIELD = "adserver"; @@ -157,7 +152,6 @@ public class RubiconBidder implements Bidder { private static final String PREBID_EXT = "prebid"; private static final String PPUID_STYPE = "ppuid"; - private static final String OTHER_STYPE = "other"; private static final String SHA256EMAIL_STYPE = "sha256email"; private static final String DMP_STYPE = "dmp"; private static final String XAPI_CURRENCY = "USD"; @@ -728,16 +722,8 @@ private void mergeFirstPartyDataFromSite(Site site, ObjectNode result) { populateFirstPartyDataAttributes(siteExt.getData(), result); } - // merge OPENRTB.site.sectioncat to every impression XAPI.imp[].ext.rp.target.sectioncat - mergeCollectionAttributeIntoArray(result, site, Site::getSectioncat, FPD_SECTIONCAT_FIELD); - // merge OPENRTB.site.pagecat to every impression XAPI.imp[].ext.rp.target.pagecat - mergeCollectionAttributeIntoArray(result, site, Site::getPagecat, FPD_PAGECAT_FIELD); // merge OPENRTB.site.page to every impression XAPI.imp[].ext.rp.target.page mergeStringAttributeIntoArray(result, site, Site::getPage, FPD_PAGE_FIELD); - // merge OPENRTB.site.ref to every impression XAPI.imp[].ext.rp.target.ref - mergeStringAttributeIntoArray(result, site, Site::getRef, FPD_REF_FIELD); - // merge OPENRTB.site.search to every impression XAPI.imp[].ext.rp.target.search - mergeStringAttributeIntoArray(result, site, Site::getSearch, FPD_SEARCH_FIELD); } private void mergeFirstPartyDataFromApp(App app, ObjectNode result) { @@ -746,11 +732,6 @@ private void mergeFirstPartyDataFromApp(App app, ObjectNode result) { if (appExt != null) { populateFirstPartyDataAttributes(appExt.getData(), result); } - - // merge OPENRTB.app.sectioncat to every impression XAPI.imp[].ext.rp.target.sectioncat - mergeCollectionAttributeIntoArray(result, app, App::getSectioncat, FPD_SECTIONCAT_FIELD); - // merge OPENRTB.app.pagecat to every impression XAPI.imp[].ext.rp.target.pagecat - mergeCollectionAttributeIntoArray(result, app, App::getPagecat, FPD_PAGECAT_FIELD); } private void mergeFirstPartyDataFromImp(Imp imp, @@ -761,12 +742,6 @@ private void mergeFirstPartyDataFromImp(Imp imp, mergeFirstPartyDataKeywords(imp, result); // merge OPENRTB.imp[].ext.rubicon.keywords to XAPI.imp[].ext.rp.target.keywords mergeCollectionAttributeIntoArray(result, rubiconImpExt, ExtImpRubicon::getKeywords, FPD_KEYWORDS_FIELD); - // merge OPENRTB.imp[].ext.data.search to XAPI.imp[].ext.rp.target.search - mergeStringAttributeIntoArray( - result, - imp.getExt().get(FPD_DATA_FIELD), - node -> getTextValueFromNodeByPath(node, FPD_SEARCH_FIELD), - FPD_SEARCH_FIELD); } private void mergeFirstPartyDataFromData(Imp imp, ObjectNode result) { diff --git a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java b/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java index 39d17a580ac..d533aef4ca9 100644 --- a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java @@ -2533,30 +2533,6 @@ public void makeHttpRequestsShouldCopyImpExtVideoLanguageToSiteContentLanguage() .containsOnly("ua"); } - @Test - public void makeHttpRequestsShouldMergeSiteSearchAndCopyToRubiconImpExtRpTarget() - throws JsonProcessingException { - // given - final BidRequest bidRequest = givenBidRequest( - requestBuilder -> requestBuilder.site(Site.builder().search("site search").build()), - impBuilder -> impBuilder.video(Video.builder().build()), - identity()); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) - .flatExtracting(BidRequest::getImp) - .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) - .containsOnly(mapper.readTree("{\"search\":[\"site search\"]}")); - } - @Test public void makeHttpRequestsShouldMergeSiteAttributesAndCopyToRubiconImpExtRpTarget() { // given @@ -2584,16 +2560,7 @@ public void makeHttpRequestsShouldMergeSiteAttributesAndCopyToRubiconImpExtRpTar .extracting(RubiconImpExt::getRp) .extracting(RubiconImpExtRp::getTarget) .containsOnly(mapper.createObjectNode() - .set("sectioncat", mapper.createArrayNode() - .add("site sectioncat")) - .set("pagecat", mapper.createArrayNode() - .add("site pagecat")) - .set("page", mapper.createArrayNode() - .add("site page")) - .set("ref", mapper.createArrayNode() - .add("site ref")) - .set("search", mapper.createArrayNode() - .add("site search"))); + .set("page", mapper.createArrayNode().add("site page"))); } @Test @@ -2647,36 +2614,6 @@ public void makeHttpRequestsShouldOverrideDfpAdunitCodeIfAdslotPresentInImpExtDa .containsExactly(TextNode.valueOf("adslotvalue")); } - @Test - public void makeHttpRequestsShouldMergeAppAttributesAndCopyToRubiconImpExtRpTarget() { - // given - final BidRequest bidRequest = givenBidRequest( - requestBuilder -> requestBuilder.app(App.builder() - .sectioncat(singletonList("app sectioncat")) - .pagecat(singletonList("app pagecat")) - .build()), - impBuilder -> impBuilder.video(Video.builder().build()), - identity()); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) - .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) - .flatExtracting(BidRequest::getImp) - .extracting(Imp::getExt) - .extracting(objectNode -> mapper.convertValue(objectNode, RubiconImpExt.class)) - .extracting(RubiconImpExt::getRp) - .extracting(RubiconImpExtRp::getTarget) - .containsOnly(mapper.createObjectNode() - .set("sectioncat", mapper.createArrayNode() - .add("app sectioncat")) - .set("pagecat", mapper.createArrayNode() - .add("app pagecat"))); - } - @Test public void makeHttpRequestsShouldCopySiteKeywords() { // given