Use two separate DTOs for imp ext to brings more clarity

Author: t-sormonte

src/main/java/org/prebid/server/bidder/sparteo/SparteoBidder.java

@@ -1,6 +1,7 @@
 package org.prebid.server.bidder.sparteo;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.iab.openrtb.request.BidRequest;
@@ -22,6 +23,7 @@
 import org.prebid.server.json.JacksonMapper;
 import org.prebid.server.proto.openrtb.ext.request.ExtPublisher;
 import org.prebid.server.proto.openrtb.ext.request.sparteo.ExtImpSparteo;
+import org.prebid.server.proto.openrtb.ext.request.sparteo.ExtImpParamsSparteo;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid;
 import org.prebid.server.util.BidderUtil;
@@ -30,7 +32,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -88,27 +92,45 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
     private ObjectNode buildImpExt(ObjectNode impExt, ExtImpSparteo bidderParams, JacksonMapper mapper)
         throws JsonProcessingException {
 
-        impExt.remove("bidder");
+        final String adUnitCode = Optional.ofNullable(impExt.get("prebid"))
+                .map(prebidNode -> prebidNode.get("adunitcode"))
+                .filter(JsonNode::isTextual)
+                .map(JsonNode::asText)
+                .orElse(null);
 
-        final JsonNode sparteoNode = impExt.get("sparteo");
-        final ObjectNode outgoingParamsNode;
-
-        if (sparteoNode != null && sparteoNode.isObject() && sparteoNode.has("params")
-                && sparteoNode.get("params").isObject()) {
-            outgoingParamsNode = (ObjectNode) sparteoNode.get("params");
-        } else {
-            outgoingParamsNode = impExt.putObject("sparteo").putObject("params");
-        }
-
-        final ObjectNode bidderParamsAsNode = mapper.mapper().convertValue(bidderParams, ObjectNode.class);
-        outgoingParamsNode.setAll(bidderParamsAsNode);
+        final Map<String, JsonNode> sparteoProperties = Optional.ofNullable(impExt.get("sparteo"))
+                .map(sparteoNode -> sparteoNode.get("params"))
+                .filter(JsonNode::isObject)
+                .map(paramsNode -> mapper.mapper().convertValue(paramsNode,
+                        new TypeReference<Map<String, JsonNode>>() { }))
+                .orElse(Collections.emptyMap());
+
+        final Map<String, JsonNode> additionnalProperties = new HashMap<>(sparteoProperties);
+        additionnalProperties.putAll(bidderParams.getAdditionalProperties());
+
+        final ExtImpParamsSparteo sparteoParams = ExtImpParamsSparteo.of(
+                bidderParams.getNetworkId(),
+                bidderParams.getCustom1(),
+                bidderParams.getCustom2(),
+                bidderParams.getCustom3(),
+                bidderParams.getCustom4(),
+                bidderParams.getCustom5(),
+                adUnitCode,
+                additionnalProperties);
+
+        final ObjectNode ext = mapper.mapper().createObjectNode();
+
+        impExt.fields().forEachRemaining(entry -> {
+            final String key = entry.getKey();
+            if (!key.equals("bidder") && !key.equals("sparteo")) {
+                ext.set(key, entry.getValue());
+            }
+        });
 
-        final JsonNode prebidNode = impExt.get("prebid");
-        if (prebidNode != null && prebidNode.has("adunitcode")) {
-            outgoingParamsNode.set("adUnitCode", prebidNode.get("adunitcode"));
-        }
+        final ObjectNode sparteoParamsAsNode = mapper.mapper().convertValue(sparteoParams, ObjectNode.class);
+        ext.putObject("sparteo").set("params", sparteoParamsAsNode);
 
-        return impExt;
+        return ext;
     }
 
     private Site modifySite(Site site, String siteNetworkId, JacksonMapper mapper) {

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

@@ -0,0 +1,46 @@
+package org.prebid.server.proto.openrtb.ext.request.sparteo;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Value;
+
+import java.util.Map;
+
+@Value(staticConstructor = "of")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ExtImpParamsSparteo {
+
+    @JsonProperty("networkId")
+    String networkId;
+
+    @JsonProperty("custom1")
+    String custom1;
+
+    @JsonProperty("custom2")
+    String custom2;
+
+    @JsonProperty("custom3")
+    String custom3;
+
+    @JsonProperty("custom4")
+    String custom4;
+
+    @JsonProperty("custom5")
+    String custom5;
+
+    @JsonProperty("adUnitCode")
+    String adUnitCode;
+
+    @JsonAnyGetter
+    Map<String, JsonNode> additionalProperties;
+
+    @JsonAnyGetter
+    public Map<String, JsonNode> getAdditionalProperties() {
+        if (additionalProperties != null && additionalProperties.isEmpty()) {
+            return null;
+        }
+        return additionalProperties;
+    }
+}