Implementation of AntoxaAntoxic review

t-sormonte · t-sormonte · commit bc8cd5830624 · 2025-06-25T11:35:13.000+02:00
diff --git a/src/main/java/org/prebid/server/bidder/sparteo/SparteoBidder.java b/src/main/java/org/prebid/server/bidder/sparteo/SparteoBidder.java
@@ -10,7 +10,6 @@
 import com.iab.openrtb.response.Bid;
 import com.iab.openrtb.response.BidResponse;
 import com.iab.openrtb.response.SeatBid;
-import io.vertx.core.http.HttpMethod;
 import org.apache.commons.collections4.CollectionUtils;
 import org.prebid.server.bidder.Bidder;
 import org.prebid.server.bidder.model.BidderBid;
@@ -21,14 +20,15 @@
 import org.prebid.server.json.DecodeException;
 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.response.BidType;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid;
 import org.prebid.server.util.BidderUtil;
 import org.prebid.server.util.HttpUtil;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 
@@ -42,89 +42,158 @@ public SparteoBidder(String endpointUrl, JacksonMapper mapper) {
         this.mapper = Objects.requireNonNull(mapper);
     }
 
-    private static <T> Iterable<T> iterable(Iterator<T> it) {
-        return () -> it;
-    }
-
     @Override
     public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request) {
         final List<BidderError> errors = new ArrayList<>();
-
-        String siteNetworkId = null;
         final List<Imp> modifiedImps = new ArrayList<>();
+        String siteNetworkId = null;
 
         for (Imp imp : request.getImp()) {
             try {
-                final ObjectNode extMap = mapper.mapper()
-                        .convertValue(imp.getExt(), ObjectNode.class);
-
-                final ObjectNode bidderNode = (ObjectNode) extMap.remove("bidder");
+                final JsonNode bidderNode = imp.getExt().get("bidder");
+                final ExtImpSparteo bidderParams = mapper.mapper().treeToValue(bidderNode, ExtImpSparteo.class);
 
-                if (bidderNode != null) {
-                    if (siteNetworkId == null && bidderNode.hasNonNull("networkId")) {
-                        siteNetworkId = bidderNode.get("networkId").asText();
-                    }
-
-                    final ObjectNode sparteoNode = extMap.has("sparteo") && extMap.get("sparteo").isObject()
-                            ? (ObjectNode) extMap.get("sparteo")
-                            : extMap.putObject("sparteo");
-                    final ObjectNode paramsNode = sparteoNode.has("params") && sparteoNode.get("params").isObject()
-                            ? (ObjectNode) sparteoNode.get("params")
-                            : sparteoNode.putObject("params");
-
-                    for (String field : iterable(bidderNode.fieldNames())) {
-                        paramsNode.set(field, bidderNode.get(field));
-                    }
+                if (siteNetworkId == null && bidderParams.getNetworkId() != null) {
+                    siteNetworkId = bidderParams.getNetworkId();
                 }
 
-                modifiedImps.add(imp.toBuilder().ext(extMap).build());
-            } catch (Exception e) {
+                final ObjectNode modifiedExt = buildImpExt(imp, bidderParams, mapper);
+
+                modifiedImps.add(imp.toBuilder().ext(modifiedExt).build());
+            } catch (NullPointerException | JsonProcessingException e) {
                 errors.add(BidderError.badInput(
                         String.format("ignoring imp id=%s, error processing ext: %s",
-                                    imp.getId(), e.getMessage())));
+                                imp.getId(), e.getMessage())));
             }
         }
 
         if (modifiedImps.isEmpty()) {
             return Result.withErrors(errors);
         }
 
-        final BidRequest.BidRequestBuilder rb = request.toBuilder().imp(modifiedImps);
+        final BidRequest outgoingRequest = request.toBuilder()
+                .imp(modifiedImps)
+                .site(modifySite(request.getSite(), siteNetworkId, mapper))
+                .build();
+
+        final HttpRequest<BidRequest> call = BidderUtil.defaultRequest(outgoingRequest, endpointUrl, mapper);
+
+        return Result.of(Collections.singletonList(call), errors);
+    }
+
+    @Override
+    public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
+        final List<BidderError> errors = new ArrayList<>();
+        final int statusCode = httpCall.getResponse().getStatusCode();
 
-        final Site site = request.getSite();
-        if (site != null && site.getPublisher() != null && siteNetworkId != null) {
-            final Publisher pub = site.getPublisher();
+        if (statusCode == 204) {
+            return Result.of(Collections.emptyList(), errors);
+        }
+
+        if (statusCode != 200) {
+            return Result.withError(BidderError.badServerResponse(
+                    String.format("HTTP status %d returned from Sparteo", statusCode)));
+        }
+
+        try {
+            final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
+            return Result.of(extractBids(bidResponse, errors), errors);
+        } catch (DecodeException e) {
+            return Result.withError(BidderError.badServerResponse(
+                    String.format("Failed to decode Sparteo response: %s", e.getMessage())));
+        }
+    }
+
+    private ObjectNode buildImpExt(Imp imp, ExtImpSparteo bidderParams, JacksonMapper mapper)
+        throws JsonProcessingException {
+
+        final ObjectNode extMap = mapper.mapper().convertValue(imp.getExt(), ObjectNode.class);
+
+        extMap.remove("bidder");
+
+        final JsonNode sparteoNode = extMap.get("sparteo");
+        final ObjectNode outgoingParamsNode;
+
+        if (sparteoNode != null && sparteoNode.isObject() && sparteoNode.has("params")
+                && sparteoNode.get("params").isObject()) {
+            outgoingParamsNode = (ObjectNode) sparteoNode.get("params");
+        } else {
+            outgoingParamsNode = extMap.putObject("sparteo").putObject("params");
+        }
+
+        final ObjectNode bidderParamsAsNode = mapper.mapper().convertValue(bidderParams, ObjectNode.class);
+        outgoingParamsNode.setAll(bidderParamsAsNode);
+
+        final JsonNode prebidNode = extMap.get("prebid");
+        if (prebidNode != null && prebidNode.has("adunitcode")) {
+            outgoingParamsNode.set("adUnitCode", prebidNode.get("adunitcode"));
+        }
+
+        return extMap;
+    }
+
+    private Site modifySite(Site site, String siteNetworkId, JacksonMapper mapper) {
+        if (site == null || site.getPublisher() == null || siteNetworkId == null) {
+            return site;
+        }
 
-            final ObjectNode pubExtRaw = pub.getExt() != null
-                    ? mapper.mapper().convertValue(pub.getExt(), ObjectNode.class)
-                    : mapper.mapper().createObjectNode();
+        final Publisher publisher = site.getPublisher();
+        final ExtPublisher extPublisher;
 
-            pubExtRaw.withObjectProperty("params").put("networkId", siteNetworkId);
+        extPublisher = publisher.getExt() != null
+                ? publisher.getExt()
+                : ExtPublisher.empty();
 
-            final ExtPublisher extPub = mapper.mapper()
-                    .convertValue(pubExtRaw, ExtPublisher.class);
+        final JsonNode paramsProperty = extPublisher.getProperty("params");
+        final ObjectNode paramsNode;
 
-            final Publisher newPub = pub.toBuilder().ext(extPub).build();
-            final Site newSite = site.toBuilder().publisher(newPub).build();
-            rb.site(newSite);
+        if (paramsProperty != null && paramsProperty.isObject()) {
+            paramsNode = (ObjectNode) paramsProperty;
+        } else {
+            paramsNode = mapper.mapper().createObjectNode();
+            extPublisher.addProperty("params", paramsNode);
         }
 
-        final BidRequest outgoing = rb.build();
+        paramsNode.put("networkId", siteNetworkId);
 
-        final HttpRequest<BidRequest> call = HttpRequest.<BidRequest>builder()
-                .method(HttpMethod.POST)
-                .uri(endpointUrl)
-                .headers(HttpUtil.headers())
-                .impIds(BidderUtil.impIds(outgoing))
-                .body(mapper.encodeToBytes(outgoing))
-                .payload(outgoing)
+        final Publisher modifiedPublisher = publisher.toBuilder()
+                .ext(extPublisher)
                 .build();
 
-        final List<HttpRequest<BidRequest>> calls = Collections.singletonList(call);
+        return site.toBuilder()
+                .publisher(modifiedPublisher)
+                .build();
+    }
+
+    private List<BidderBid> extractBids(BidResponse bidResponse, List<BidderError> errors) {
+        if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) {
+            return Collections.emptyList();
+        }
 
-        return errors.isEmpty()
-                ? Result.withValues(calls)
-                : Result.of(calls, errors);
+        return bidResponse.getSeatbid().stream()
+                .filter(Objects::nonNull)
+                .map(SeatBid::getBid)
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .map(bid -> {
+                    if (bid == null) {
+                        errors.add(BidderError.badServerResponse("Received null bid object within a seatbid."));
+                        return null;
+                    }
+                    return toBidderBid(bid, bidResponse.getCur(), errors);
+                })
+                .filter(Objects::nonNull)
+                .toList();
+    }
+
+    private BidderBid toBidderBid(Bid bid, String currency, List<BidderError> errors) {
+        try {
+            final BidType bidType = getBidTypeFromBidExtension(bid);
+            return BidderBid.of(bid, bidType, currency);
+        } catch (Exception e) {
+            errors.add(BidderError.badServerResponse(e.getMessage()));
+            return null;
+        }
     }
 
     private BidType getBidTypeFromBidExtension(Bid bid) throws Exception {
@@ -168,58 +237,4 @@ private BidType getBidTypeFromBidExtension(Bid bid) throws Exception {
 
         return bidType;
     }
-
-    @Override
-    public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
-        final List<BidderError> errors = new ArrayList<>();
-
-        final int status = httpCall.getResponse().getStatusCode();
-        if (status == 204) {
-            return Result.of(Collections.emptyList(), errors);
-        }
-        if (status != 200) {
-            errors.add(BidderError.badServerResponse(
-                    String.format("HTTP status %d returned from Sparteo", status))
-            );
-            return Result.of(Collections.emptyList(), errors);
-        }
-
-        final BidResponse bidResponse;
-        try {
-            bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
-        } catch (DecodeException e) {
-            errors.add(BidderError.badServerResponse(
-                    String.format("Failed to decode Sparteo response: %s", e.getMessage()))
-            );
-            return Result.of(Collections.emptyList(), errors);
-        }
-
-        if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) {
-            return Result.of(Collections.emptyList(), errors);
-        }
-
-        final List<BidderBid> bidderBids = new ArrayList<>();
-        final String currency = bidResponse.getCur();
-
-        for (SeatBid seatBid : bidResponse.getSeatbid()) {
-            if (seatBid != null && CollectionUtils.isNotEmpty(seatBid.getBid())) {
-                for (Bid bid : seatBid.getBid()) {
-                    if (bid == null) {
-                        errors.add(BidderError.badServerResponse(
-                                "Received null bid object within a seatbid.")
-                        );
-                        continue;
-                    }
-                    try {
-                        final BidType type = getBidTypeFromBidExtension(bid);
-                        bidderBids.add(BidderBid.of(bid, type, currency));
-                    } catch (Exception e) {
-                        errors.add(BidderError.badServerResponse(e.getMessage()));
-                    }
-                }
-            }
-        }
-
-        return Result.of(bidderBids, errors);
-    }
 }
diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/sparteo/ExtImpSparteo.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/sparteo/ExtImpSparteo.java
@@ -1,15 +1,19 @@
 package org.prebid.server.proto.openrtb.ext.request.sparteo;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.NonNull;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Value;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Value(staticConstructor = "of")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ExtImpSparteo {
 
-    @NonNull
     @JsonProperty("networkId")
     String networkId;
 
@@ -27,4 +31,16 @@ public class ExtImpSparteo {
 
     @JsonProperty("custom5")
     String custom5;
+
+    Map<String, JsonNode> additionalProperties = new HashMap<>();
+
+    @JsonAnySetter
+    public void addAdditionalProperty(String key, JsonNode value) {
+        additionalProperties.put(key, value);
+    }
+
+    @JsonAnyGetter
+    public Map<String, JsonNode> getAdditionalProperties() {
+        return additionalProperties;
+    }
 }
diff --git a/src/main/resources/bidder-config/sparteo.yaml b/src/main/resources/bidder-config/sparteo.yaml
@@ -13,8 +13,8 @@ adapters:
         - native
       supported-vendors:
       vendor-id: 1028
-    userSync:
+    usersync:
       cookie-family-name: sparteo
       iframe:
         url: "https://sync.sparteo.com/s2s_sync?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&redirect_url={{redirect_url}}"
-        supportCors: true
+        support-cors: true
diff --git a/src/main/resources/static/bidder-params/sparteo.json b/src/main/resources/static/bidder-params/sparteo.json
@@ -30,6 +30,5 @@
     },
     "required": [
         "networkId"
-    ],
-    "additionalProperties": true
+    ]
 }
diff --git a/src/test/java/org/prebid/server/bidder/sparteo/SparteoBidderTest.java b/src/test/java/org/prebid/server/bidder/sparteo/SparteoBidderTest.java
@@ -90,21 +90,8 @@ public void makeHttpRequestsShouldReturnErrorIfImpExtCannotBeParsed() {
         assertThat(result.getErrors())
                 .hasSize(1)
                 .allSatisfy(error -> {
-                    assertThat(error.getType())
-                            .isEqualTo(BidderError.Type.bad_input);
-                    final String actualExceptionMessageContent =
-                            "class com.fasterxml.jackson.databind.node.TextNode cannot be cast to "
-                            + "class com.fasterxml.jackson.databind.node.ObjectNode"
-                            + " (com.fasterxml.jackson.databind.node.TextNode and "
-                            + "com.fasterxml.jackson.databind.node.ObjectNode are in unnamed module "
-                            + "of loader 'app')";
-                    final String expectedFullErrorMessage = String.format(
-                            "ignoring imp id=null, error processing ext: %s",
-                            actualExceptionMessageContent
-                    );
-
                     assertThat(error.getMessage())
-                            .isEqualTo(expectedFullErrorMessage);
+                            .startsWith("ignoring imp id=null, error processing ext: Cannot construct instance");
                 });
         assertThat(result.getValue())
                 .isEmpty();

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,5 @@`
`30`	`30`	`},`
`31`	`31`	`"required": [`
`32`	`32`	`"networkId"`
`33`		`- ],`
`34`		`- "additionalProperties": true`
	`33`	`+ ]`
`35`	`34`	`}`