Remove bidder pbs-enforces-gdpr property (#1489)

Author: rpanchyk

docs/config-app.md

@@ -119,7 +119,6 @@ Removes and downloads file again if depending service cant process probably corr
 There are several typical keys:
 - `adapters.<BIDDER_NAME>.enabled` - indicates the bidder should be active and ready for auction. By default all bidders are disabled.
 - `adapters.<BIDDER_NAME>.endpoint` - the url for submitting bids.
-- `adapters.<BIDDER_NAME>.pbs-enforces-gdpr` - indicates if PBS server provides GDPR support for bidder or bidder will handle it itself.
 - `adapters.<BIDDER_NAME>.pbs-enforces-ccpa` - indicates if PBS server provides CCPA support for bidder or bidder will handle it itself.
 - `adapters.<BIDDER_NAME>.modifying-vast-xml-allowed` - indicates if PBS server is allowed to modify VAST creatives received from this bidder.
 - `adapters.<BIDDER_NAME>.deprecated-names` - comma separated deprecated names of bidder.

src/main/java/org/prebid/server/proto/response/BidderInfo.java

@@ -35,7 +35,6 @@ public static BidderInfo create(boolean enabled,
                                     List<String> siteMediaTypes,
                                     List<String> supportedVendors,
                                     int vendorId,
-                                    boolean enforceGdpr,
                                     boolean ccpaEnforced,
                                     boolean modifyingVastXmlAllowed) {
 
@@ -46,7 +45,7 @@ public static BidderInfo create(boolean enabled,
                 new MaintainerInfo(maintainerEmail),
                 new CapabilitiesInfo(platformInfo(appMediaTypes), platformInfo(siteMediaTypes)),
                 supportedVendors,
-                new GdprInfo(vendorId, enforceGdpr),
+                new GdprInfo(vendorId),
                 ccpaEnforced,
                 modifyingVastXmlAllowed);
     }
@@ -91,11 +90,5 @@ public static class GdprInfo {
          */
         @JsonProperty("vendorId")
         int vendorId;
-
-        /**
-         * Flag, which true value means that PBS will keep gdpr logic for bidder, otherwise bidder will keep
-         * gdpr support and request should be sent without gdpr changes.
-         */
-        boolean enforced;
     }
 }

src/main/java/org/prebid/server/spring/config/bidder/model/BidderConfigurationProperties.java

@@ -28,8 +28,6 @@ public class BidderConfigurationProperties {
     @NotBlank
     private String endpoint;
 
-    private Boolean pbsEnforcesGdpr;
-
     private Boolean pbsEnforcesCcpa;
 
     private Boolean modifyingVastXmlAllowed;
@@ -55,7 +53,6 @@ public BidderConfigurationProperties() {
     @PostConstruct
     private void init() {
         enabled = ObjectUtils.defaultIfNull(enabled, defaultProperties.getEnabled());
-        pbsEnforcesGdpr = ObjectUtils.defaultIfNull(pbsEnforcesGdpr, defaultProperties.getPbsEnforcesGdpr());
         pbsEnforcesCcpa = ObjectUtils.defaultIfNull(pbsEnforcesCcpa, defaultProperties.getPbsEnforcesCcpa());
         modifyingVastXmlAllowed = ObjectUtils.defaultIfNull(modifyingVastXmlAllowed,
                 defaultProperties.getModifyingVastXmlAllowed());

src/main/java/org/prebid/server/spring/config/bidder/model/DefaultBidderConfigurationProperties.java

@@ -15,9 +15,6 @@ public class DefaultBidderConfigurationProperties {
     @NotNull
     private Boolean enabled;
 
-    @NotNull
-    private Boolean pbsEnforcesGdpr;
-
     @NotNull
     private Boolean pbsEnforcesCcpa;
 

src/main/java/org/prebid/server/spring/config/bidder/util/BidderInfoCreator.java

@@ -25,7 +25,6 @@ public static BidderInfo create(BidderConfigurationProperties configurationPrope
                 metaInfo.getSiteMediaTypes(),
                 metaInfo.getSupportedVendors(),
                 metaInfo.getVendorId(),
-                configurationProperties.getPbsEnforcesGdpr(),
                 configurationProperties.getPbsEnforcesCcpa(),
                 configurationProperties.getModifyingVastXmlAllowed());
     }

src/main/resources/application.yaml

@@ -100,7 +100,6 @@ data-center: dataCenter
 profile: profile
 adapter-defaults:
   enabled: false
-  pbs-enforces-gdpr: true
   pbs-enforces-ccpa: true
   modifying-vast-xml-allowed: true
 auction:

src/test/java/org/prebid/server/auction/PrivacyEnforcementServiceTest.java

@@ -1764,7 +1764,7 @@ private static BidderInfo givenBidderInfo(int gdprVendorId, boolean enforceCcpa)
                 null,
                 null,
                 null,
-                new BidderInfo.GdprInfo(gdprVendorId, true),
+                new BidderInfo.GdprInfo(gdprVendorId),
                 enforceCcpa,
                 false);
     }

src/test/java/org/prebid/server/bidder/BidderCatalogTest.java

@@ -94,7 +94,6 @@ public void metaInfoByNameShouldReturnMetaInfoForKnownBidder() {
                 null,
                 99,
                 true,
-                true,
                 false);
 
         final BidderDeps bidderDeps = BidderDeps.of(singletonList(BidderInstanceDeps.builder()
@@ -169,7 +168,6 @@ public void nameByVendorIdShouldReturnBidderNameForVendorId() {
                 null,
                 99,
                 true,
-                true,
                 false);
 
         final BidderDeps bidderDeps = BidderDeps.of(singletonList(BidderInstanceDeps.builder()

src/test/java/org/prebid/server/handler/CookieSyncHandlerTest.java

@@ -664,7 +664,7 @@ public void shouldTolerateRejectedBidderByTcf() throws IOException {
         given(bidderCatalog.isActive(APPNEXUS)).willReturn(true);
 
         given(bidderCatalog.bidderInfoByName(APPNEXUS))
-                .willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, true, false));
+                .willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, false));
 
         givenTcfServiceReturningVendorIdResult(singleton(1));
         givenTcfServiceReturningBidderNamesResult(singleton(RUBICON));
@@ -730,7 +730,7 @@ bidderCatalog, tcfDefinerService, privacyEnforcementService, null, false, emptyL
 
         given(bidderCatalog.bidderInfoByName(APPNEXUS))
                 .willReturn(BidderInfo.create(true, null, null, null,
-                        null, null, null, 2, true, true, false));
+                        null, null, null, 2, true, false));
 
         givenTcfServiceReturningBidderNamesResult(singleton(RUBICON));
 
@@ -760,7 +760,7 @@ public void shouldUpdateCookieSyncSetAndRejectByTcfMetricForEachRejectedAndSynce
         given(bidderCatalog.isActive(APPNEXUS)).willReturn(true);
 
         given(bidderCatalog.bidderInfoByName(APPNEXUS))
-                .willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, true, false));
+                .willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, false));
 
         givenTcfServiceReturningVendorIdResult(singleton(1));
         givenTcfServiceReturningBidderNamesResult(singleton(RUBICON));
@@ -1316,25 +1316,20 @@ public void shouldPassSuccessfulEventToAnalyticsReporter() {
     }
 
     @Test
-    public void shouldRespondWithNoCookieWhenBothCcpaAndGdprRejectBidders() throws IOException {
+    public void shouldRespondWithNoCookieWhenCcpaRejectsBidder() throws IOException {
         // given
         given(uidsCookieService.parseFromRequest(any(RoutingContext.class))).willReturn(new UidsCookie(
                 Uids.builder().uids(emptyMap()).build(), jacksonMapper));
 
         given(routingContext.getBody())
-                .willReturn(givenRequestBody(CookieSyncRequest.builder().bidders(asList(RUBICON, APPNEXUS)).build()));
+                .willReturn(givenRequestBody(CookieSyncRequest.builder().bidders(singletonList(RUBICON)).build()));
 
         rubiconUsersyncer = createUsersyncer(RUBICON, "", null);
-        appnexusUsersyncer = createUsersyncer(APPNEXUS_COOKIE, "", null);
         givenUsersyncersReturningFamilyName();
 
         given(bidderCatalog.isActive(RUBICON)).willReturn(true);
-        given(bidderCatalog.isActive(APPNEXUS)).willReturn(true);
-
         given(bidderCatalog.bidderInfoByName(RUBICON)).willReturn(
-                BidderInfo.create(true, null, null, null, null, null, null, 2, true, true, false));
-        given(bidderCatalog.bidderInfoByName(APPNEXUS)).willReturn(
-                BidderInfo.create(true, null, null, null, null, null, null, 2, true, false, false));
+                BidderInfo.create(true, null, null, null, null, null, null, 2, true, false));
 
         given(privacyEnforcementService.isCcpaEnforced(any(), any())).willReturn(true);
 
@@ -1347,9 +1342,9 @@ public void shouldRespondWithNoCookieWhenBothCcpaAndGdprRejectBidders() throws I
         // then
         final CookieSyncResponse cookieSyncResponse = captureCookieSyncResponse();
         assertThat(cookieSyncResponse.getStatus()).isEqualTo("no_cookie");
-        assertThat(cookieSyncResponse.getBidderStatus()).hasSize(2)
+        assertThat(cookieSyncResponse.getBidderStatus()).hasSize(1)
                 .extracting(BidderUsersyncStatus::getBidder, BidderUsersyncStatus::getError)
-                .containsOnly(tuple(APPNEXUS, "Rejected by TCF"), tuple(RUBICON, "Rejected by CCPA"));
+                .containsOnly(tuple(RUBICON, "Rejected by CCPA"));
     }
 
     private void givenTcfServiceReturningVendorIdResult(Set<Integer> vendorIds) {

src/test/java/org/prebid/server/handler/info/BidderDetailsHandlerTest.java

@@ -189,7 +189,6 @@ private static BidderInfo givenBidderInfo(boolean enabled, String endpoint, Stri
                 null,
                 0,
                 true,
-                true,
                 false);
     }