Remove fields from requests to bidders

src/main/java/org/prebid/server/auction/bidderrequestpostprocessor/BidderRequestCleaner.java

@@ -1,13 +1,27 @@
 package org.prebid.server.auction.bidderrequestpostprocessor;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.iab.openrtb.request.BidRequest;
 import io.vertx.core.Future;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.auction.aliases.BidderAliases;
 import org.prebid.server.auction.model.AuctionContext;
 import org.prebid.server.auction.model.BidderRequest;
+import org.prebid.server.model.UpdateResult;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
+import org.prebid.server.proto.openrtb.ext.request.ExtRequestBidAdjustmentFactors;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid;
+import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidAlternateBidderCodes;
+import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidAlternateBidderCodesBidder;
+import org.prebid.server.proto.openrtb.ext.request.ImpMediaType;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.Iterator;
+import java.util.Map;
 
 public class BidderRequestCleaner implements BidderRequestPostProcessor {
 
@@ -17,21 +31,168 @@ public Future<BidderRequestPostProcessingResult> process(BidderRequest bidderReq
                                                              AuctionContext auctionContext) {
 
         final BidRequest bidRequest = bidderRequest.getBidRequest();
-        final ExtRequest ext = bidRequest.getExt();
+        final UpdateResult<ExtRequest> cleanedExt = cleanExt(bidRequest.getExt(), bidderRequest.getBidder());
+
+        final BidderRequest cleanedBidderRequest = cleanedExt.isUpdated()
+                ? bidderRequest.with(bidRequest.toBuilder().ext(cleanedExt.getValue()).build())
+                : bidderRequest;
+
+        return Future.succeededFuture(BidderRequestPostProcessingResult.withValue(cleanedBidderRequest));
+    }
+
+    private UpdateResult<ExtRequest> cleanExt(ExtRequest ext, String bidder) {
         final ExtRequestPrebid extPrebid = ext != null ? ext.getPrebid() : null;
-        final ObjectNode bidderControls = extPrebid != null ? extPrebid.getBiddercontrols() : null;
+        if (extPrebid == null) {
+            return UpdateResult.unaltered(ext);
+        }
 
-        if (bidderControls == null) {
-            return resultOf(bidderRequest);
+        final UpdateResult<ExtRequestBidAdjustmentFactors> cleanedBidAdjustmentFactors =
+                cleanBidAdjustmentFactors(extPrebid.getBidadjustmentfactors(), bidder);
+        final UpdateResult<ObjectNode> cleanedBidAdjustments =
+                cleanBidAdjustments(extPrebid.getBidadjustments(), bidder);
+        final UpdateResult<ExtRequestPrebidAlternateBidderCodes> cleanedAlternateCodes =
+                cleanAlternateCodes(extPrebid.getAlternateBidderCodes(), bidder);
+
+        if (!cleanedBidAdjustmentFactors.isUpdated()
+                && !cleanedBidAdjustments.isUpdated()
+                && !cleanedAlternateCodes.isUpdated()
+                && ObjectUtils.allNull(
+                extPrebid.getReturnallbidstatus(),
+                extPrebid.getAliasgvlids(),
+                extPrebid.getAdservertargeting(),
+                extPrebid.getCache(),
+                extPrebid.getEvents(),
+                extPrebid.getNosale(),
+                extPrebid.getBiddercontrols(),
+                extPrebid.getAnalytics(),
+                extPrebid.getPassthrough(),
+                extPrebid.getKvps())) {
+
+            return UpdateResult.unaltered(ext);
         }
 
-        final ExtRequest cleanedExt = ExtRequest.of(extPrebid.toBuilder().biddercontrols(null).build());
+        final ExtRequest cleanedExt = ExtRequest.of(extPrebid.toBuilder()
+                .returnallbidstatus(null)
+                .aliasgvlids(null)
+                .bidadjustmentfactors(cleanedBidAdjustmentFactors.getValue())
+                .bidadjustments(cleanedBidAdjustments.getValue())
+                .adservertargeting(null)
+                .cache(null)
+                .events(null)
+                .nosale(null)
+                .biddercontrols(null)
+                .analytics(null)
+                .passthrough(null)
+                .kvps(null)
+                .alternateBidderCodes(cleanedAlternateCodes.getValue())
+                .build());
         cleanedExt.addProperties(ext.getProperties());
 
-        return resultOf(bidderRequest.with(bidRequest.toBuilder().ext(cleanedExt).build()));
+        return UpdateResult.updated(cleanedExt);
+    }
+
+    private static UpdateResult<ExtRequestBidAdjustmentFactors> cleanBidAdjustmentFactors(
+            ExtRequestBidAdjustmentFactors bidAdjustmentFactors,
+            String bidder) {
+
+        if (bidAdjustmentFactors == null) {
+            return UpdateResult.unaltered(null);
+        }
+
+        final Map<String, BigDecimal> cleanedAdjustments =
+                cleanBidderMap(bidAdjustmentFactors.getAdjustments(), bidder);
+        final EnumMap<ImpMediaType, Map<String, BigDecimal>> cleanedMediaTypes =
+                cleanMediaTypes(bidAdjustmentFactors.getMediatypes(), bidder);
+
+        if (cleanedAdjustments == null && cleanedMediaTypes == null) {
+            return UpdateResult.updated(null);
+        }
+
+        final ExtRequestBidAdjustmentFactors cleanedBidAdjustmentFactors = ExtRequestBidAdjustmentFactors.builder()
+                .mediatypes(cleanedMediaTypes)
+                .build();
+        if (cleanedAdjustments != null) {
+            cleanedAdjustments.forEach(cleanedBidAdjustmentFactors::addFactor);
+        }
+
+        return UpdateResult.updated(cleanedBidAdjustmentFactors);
+    }
+
+    private static <T> Map<String, T> cleanBidderMap(Map<String, T> map, String bidder) {
+        if (map == null) {
+            return null;
+        }
+
+        for (Map.Entry<String, T> entry : map.entrySet()) {
+            if (StringUtils.equalsIgnoreCase(entry.getKey(), bidder)) {
+                return Collections.singletonMap(entry.getKey(), entry.getValue());
+            }
+        }
+
+        return null;
     }
 
-    private static Future<BidderRequestPostProcessingResult> resultOf(BidderRequest bidderRequest) {
-        return Future.succeededFuture(BidderRequestPostProcessingResult.withValue(bidderRequest));
+    private static EnumMap<ImpMediaType, Map<String, BigDecimal>> cleanMediaTypes(
+            EnumMap<ImpMediaType, Map<String, BigDecimal>> mediaTypes,
+            String bidder) {
+
+        if (mediaTypes == null) {
+            return null;
+        }
+
+        final EnumMap<ImpMediaType, Map<String, BigDecimal>> cleanedMediaTypes = new EnumMap<>(ImpMediaType.class);
+        for (Map.Entry<ImpMediaType, Map<String, BigDecimal>> entry : mediaTypes.entrySet()) {
+            final Map<String, BigDecimal> cleanedMap = cleanBidderMap(entry.getValue(), bidder);
+            if (cleanedMap != null) {
+                cleanedMediaTypes.put(entry.getKey(), cleanedMap);
+            }
+        }
+
+        return !cleanedMediaTypes.isEmpty() ? cleanedMediaTypes : null;
+    }
+
+    private static UpdateResult<ObjectNode> cleanBidAdjustments(ObjectNode bidAdjustments, String bidder) {
+        if (bidAdjustments == null) {
+            return UpdateResult.unaltered(null);
+        }
+
+        final ObjectNode cleanedBidAdjustments = bidAdjustments.deepCopy();
+        final JsonNode mediaTypeToBidAdjustments = cleanedBidAdjustments.path("mediatype");
+        for (Iterator<JsonNode> maps = mediaTypeToBidAdjustments.elements(); maps.hasNext(); ) {
+            final JsonNode bidderMap = maps.next();
+            if (!bidderMap.isObject()) {
+                continue;
+            }
+
+            for (Iterator<String> bidders = bidderMap.fieldNames(); bidders.hasNext(); ) {
+                if (!StringUtils.equalsIgnoreCase(bidders.next(), bidder)) {
+                    bidders.remove();
+                }
+            }
+
+            if (bidderMap.isEmpty()) {
+                maps.remove();
+            }
+        }
+
+        return !mediaTypeToBidAdjustments.isEmpty()
+                ? UpdateResult.updated(cleanedBidAdjustments)
+                : UpdateResult.updated(null);
+    }
+
+    private static UpdateResult<ExtRequestPrebidAlternateBidderCodes> cleanAlternateCodes(
+            ExtRequestPrebidAlternateBidderCodes alternateBidderCodes,
+            String bidder) {
+
+        final Map<String, ExtRequestPrebidAlternateBidderCodesBidder> bidders = alternateBidderCodes != null
+                ? alternateBidderCodes.getBidders()
+                : null;
+        if (bidders == null) {
+            return UpdateResult.unaltered(alternateBidderCodes);
+        }
+
+        return UpdateResult.updated(ExtRequestPrebidAlternateBidderCodes.of(
+                alternateBidderCodes.getEnabled(),
+                cleanBidderMap(bidders, bidder)));
     }
 }

src/test/groovy/org/prebid/server/functional/model/config/AlternateBidderCodes.groovy

@@ -12,5 +12,5 @@ import org.prebid.server.functional.model.bidder.BidderName
 class AlternateBidderCodes {
 
     Boolean enabled
-    Map<BidderName, BidderConfig> bidders
+    Map<BidderName, CodesBidderConfig> bidders
 }

src/test/groovy/org/prebid/server/functional/model/config/BidderConfig.groovy → src/test/groovy/org/prebid/server/functional/model/config/CodesBidderConfig.groovy

@@ -10,7 +10,7 @@ import org.prebid.server.functional.model.bidder.BidderName
 @EqualsAndHashCode
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
-class BidderConfig {
+class CodesBidderConfig {
 
     Boolean enabled
     List<BidderName> allowedBidderCodes

src/test/groovy/org/prebid/server/functional/model/request/Channel.groovy

@@ -0,0 +1,13 @@
+package org.prebid.server.functional.model.request
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+import org.prebid.server.functional.model.ChannelType
+
+@ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
+class Channel {
+
+    ChannelType name
+    String version
+}

src/test/groovy/org/prebid/server/functional/model/request/amp/AmpRequest.groovy

@@ -2,11 +2,13 @@ package org.prebid.server.functional.model.request.amp
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.util.PBSUtils
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
+@EqualsAndHashCode
 class AmpRequest {
 
     String tagId

src/test/groovy/org/prebid/server/functional/model/request/auction/AdjustmentRule.groovy

@@ -3,11 +3,13 @@ package org.prebid.server.functional.model.request.auction
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.model.Currency
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class AdjustmentRule {
 
     @JsonProperty('adjtype')

src/test/groovy/org/prebid/server/functional/model/request/auction/Amp.groovy

@@ -1,9 +1,11 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.model.request.amp.AmpRequest
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class Amp {
 
     AmpRequest data

src/test/groovy/org/prebid/server/functional/model/request/auction/AppExt.groovy

@@ -1,8 +1,10 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class AppExt {
 
     AppExtData data

src/test/groovy/org/prebid/server/functional/model/request/auction/AppExtData.groovy

@@ -1,8 +1,10 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class AppExtData {
 
     String language

src/test/groovy/org/prebid/server/functional/model/request/auction/AppPrebid.groovy

@@ -1,8 +1,10 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class AppPrebid {
 
     String source

src/test/groovy/org/prebid/server/functional/model/request/auction/BidAdjustment.groovy

@@ -2,11 +2,13 @@ package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.util.PBSUtils
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class BidAdjustment {
 
     Map<BidAdjustmentMediaType, BidAdjustmentRule> mediaType

src/test/groovy/org/prebid/server/functional/model/request/auction/BidAdjustmentFactors.groovy

@@ -4,11 +4,13 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.model.bidder.BidderName
 
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class BidAdjustmentFactors {
 
     @JsonAnySetter

src/test/groovy/org/prebid/server/functional/model/request/auction/BidAdjustmentRule.groovy

@@ -1,9 +1,11 @@
 package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
+@EqualsAndHashCode
 class BidAdjustmentRule {
 
     @JsonProperty('*')

src/test/groovy/org/prebid/server/functional/model/request/auction/ConsentedProvidersSettings.groovy

@@ -2,10 +2,12 @@ package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
+@EqualsAndHashCode
 class ConsentedProvidersSettings {
 
     String consentedProviders

src/test/groovy/org/prebid/server/functional/model/request/auction/DeviceExt.groovy

@@ -1,13 +1,16 @@
 package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.annotation.JsonValue
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @ToString
+@EqualsAndHashCode
 class DeviceExt {
 
     Atts atts
     String cdep
+    DevicePrebid prebid
 
     enum Atts {
 

src/test/groovy/org/prebid/server/functional/model/request/auction/DevicePrebid.groovy

@@ -0,0 +1,11 @@
+package org.prebid.server.functional.model.request.auction
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+@EqualsAndHashCode
+@ToString(includeNames = true, ignoreNulls = true)
+class DevicePrebid {
+
+    Interstitial interstitial
+}