Amp: update consented providers settings support (prebid#3590)

Author: And1sS

src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java

@@ -274,6 +274,7 @@ private static User createUser(ConsentParam consentParam, String addtlConsent) {
 
         final ExtUser extUser = consentedProvidersSettings != null
                 ? ExtUser.builder()
+                .deprecatedConsentedProvidersSettings(consentedProvidersSettings)
                 .consentedProvidersSettings(consentedProvidersSettings)
                 .build()
                 : null;

src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUser.java

@@ -55,8 +55,13 @@ public class ExtUser extends FlexibleExtension {
 
     /**
      * Defines the contract for bidrequest.user.ext.ConsentedProvidersSettings
+     * <p>
+     * TODO: Remove after PBS 4.0
      */
+    @Deprecated(forRemoval = true)
     @JsonProperty("ConsentedProvidersSettings")
+    ConsentedProvidersSettings deprecatedConsentedProvidersSettings;
+
     ConsentedProvidersSettings consentedProvidersSettings;
 
     @JsonIgnore

src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java

@@ -1277,10 +1277,12 @@ public void shouldReturnBidRequestWithProvidersSettingsContainsAddtlConsentIfPar
         final BidRequest result = target.fromRequest(routingContext, 0L).result().getBidRequest();
 
         // then
+        final ConsentedProvidersSettings settings = ConsentedProvidersSettings.of("someConsent");
         assertThat(result.getUser())
                 .isEqualTo(User.builder()
                         .ext(ExtUser.builder()
-                                .consentedProvidersSettings(ConsentedProvidersSettings.of("someConsent"))
+                                .deprecatedConsentedProvidersSettings(settings)
+                                .consentedProvidersSettings(settings)
                                 .build())
                         .build());
     }

src/test/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidderTest.java

@@ -116,7 +116,7 @@ public void makeHttpRequestsShouldUseProperEndpoints() {
     public void makeHttpRequestsShouldProperProcessConsentedProvidersSetting() {
         // given
         final ExtUser extUser = ExtUser.builder()
-                .consentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90"))
+                .deprecatedConsentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90"))
                 .build();
 
         final BidRequest bidRequest = givenBidRequest(bidRequestBuilder -> bidRequestBuilder
@@ -145,7 +145,7 @@ public void makeHttpRequestsShouldProperProcessConsentedProvidersSetting() {
     public void makeHttpRequestsShouldProperProcessConsentedProvidersSettingWithMultipleTilda() {
         // given
         final ExtUser extUser = ExtUser.builder()
-                .consentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90~anything"))
+                .deprecatedConsentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90~anything"))
                 .build();
 
         final BidRequest bidRequest = givenBidRequest(bidRequestBuilder -> bidRequestBuilder
@@ -174,7 +174,7 @@ public void makeHttpRequestsShouldProperProcessConsentedProvidersSettingWithMult
     public void makeHttpRequestsShouldReturnUserExtIfConsentedProvidersIsNotProvided() {
         // given
         final ExtUser extUser = ExtUser.builder()
-                .consentedProvidersSettings(ConsentedProvidersSettings.of(null))
+                .deprecatedConsentedProvidersSettings(ConsentedProvidersSettings.of(null))
                 .build();
 
         final BidRequest bidRequest = givenBidRequest(bidRequestBuilder ->

src/test/resources/org/prebid/server/it/amp/test-generic-bid-request.json

@@ -51,6 +51,9 @@
     "ext": {
       "ConsentedProvidersSettings": {
         "consented_providers": "someConsent"
+      },
+      "consented_providers_settings": {
+        "consented_providers": "someConsent"
       }
     }
   },

src/test/resources/org/prebid/server/it/amp/test-genericAlias-bid-request.json

@@ -49,6 +49,9 @@
     "ext": {
       "ConsentedProvidersSettings": {
         "consented_providers": "someConsent"
+      },
+      "consented_providers_settings": {
+        "consented_providers": "someConsent"
       }
     }
   },