Adnuntius Adapter: Add multi-format and native support (#3964)

Author: AntoxaAntoxic

src/main/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidder.java

@@ -0,0 +1,11 @@
+package org.prebid.server.bidder.adnuntius.model.request;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.Value;
+
+@Value(staticConstructor = "of")
+public class AdnuntiusNativeRequest {
+
+    ObjectNode ortb;
+
+}

src/main/java/org/prebid/server/bidder/adnuntius/model/request/AdnuntiusNativeRequest.java

@@ -13,7 +13,7 @@
 public class AdnuntiusRequest {
 
     @JsonProperty("adUnits")
-    List<AdnuntiusAdUnit> adUnits;
+    List<AdnuntiusRequestAdUnit> adUnits;
 
     @JsonProperty("metaData")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

src/main/java/org/prebid/server/bidder/adnuntius/model/request/AdnuntiusRequest.java

@@ -8,7 +8,7 @@
 
 @Builder(toBuilder = true)
 @Value
-public class AdnuntiusAdUnit {
+public class AdnuntiusRequestAdUnit {
 
     @JsonProperty("auId")
     String auId;
@@ -20,4 +20,10 @@ public class AdnuntiusAdUnit {
 
     @JsonProperty("maxDeals")
     Integer maxDeals;
+
+    @JsonProperty("nativeRequest")
+    AdnuntiusNativeRequest nativeRequest;
+
+    @JsonProperty("adType")
+    String adType;
 }

…ntius/model/request/AdnuntiusAdUnit.java …odel/request/AdnuntiusRequestAdUnit.javasrc/main/java/org/prebid/server/bidder/adnuntius/model/request/AdnuntiusAdUnit.java renamed to src/main/java/org/prebid/server/bidder/adnuntius/model/request/AdnuntiusRequestAdUnit.java src/main/java/org/prebid/server/bidder/adnuntius/model/request/AdnuntiusAdUnit.java renamed to src/main/java/org/prebid/server/bidder/adnuntius/model/request/AdnuntiusRequestAdUnit.java

@@ -3,12 +3,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 import lombok.Value;
+import org.prebid.server.bidder.adnuntius.model.request.AdnuntiusNativeRequest;
 
 import java.util.List;
 
 @Builder
 @Value
-public class AdnuntiusAdsUnit {
+public class AdnuntiusAdUnit {
 
     @JsonProperty("auId")
     String auId;
@@ -18,9 +19,15 @@ public class AdnuntiusAdsUnit {
 
     String html;
 
+    @JsonProperty("matchedAdCount")
+    Integer matchedAdCount;
+
     @JsonProperty("responseId")
     String responseId;
 
+    @JsonProperty("nativeJson")
+    AdnuntiusNativeRequest nativeJson;
+
     List<AdnuntiusAd> ads;
 
     List<AdnuntiusAd> deals;

…ius/model/response/AdnuntiusAdsUnit.java …tius/model/response/AdnuntiusAdUnit.javasrc/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAdsUnit.java renamed to src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAdUnit.java src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAdsUnit.java renamed to src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAdUnit.java

@@ -9,5 +9,5 @@
 public class AdnuntiusResponse {
 
     @JsonProperty("adUnits")
-    List<AdnuntiusAdsUnit> adsUnits;
+    List<AdnuntiusAdUnit> adUnits;
 }

src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusResponse.java

@@ -1,5 +1,8 @@
 package org.prebid.server.spring.config.bidder;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.prebid.server.bidder.BidderDeps;
 import org.prebid.server.bidder.adnuntius.AdnuntiusBidder;
 import org.prebid.server.json.JacksonMapper;
@@ -24,20 +27,32 @@ public class AdnuntiusBidderConfiguration {
 
     @Bean("adnuntiusConfigurationProperties")
     @ConfigurationProperties("adapters.adnuntius")
-    BidderConfigurationProperties configurationProperties() {
-        return new BidderConfigurationProperties();
+    AdnuntiusConfigurationProperties configurationProperties() {
+        return new AdnuntiusConfigurationProperties();
     }
 
     @Bean
-    BidderDeps adnuntiusBidderDeps(BidderConfigurationProperties adnuntiusConfigurationProperties,
+    BidderDeps adnuntiusBidderDeps(AdnuntiusConfigurationProperties adnuntiusConfigurationProperties,
                                    @NotBlank @Value("${external-url}") String externalUrl,
                                    Clock clock,
                                    JacksonMapper mapper) {
 
-        return BidderDepsAssembler.forBidder(BIDDER_NAME)
+        return BidderDepsAssembler.<AdnuntiusConfigurationProperties>forBidder(BIDDER_NAME)
                 .withConfig(adnuntiusConfigurationProperties)
                 .usersyncerCreator(UsersyncerCreator.create(externalUrl))
-                .bidderCreator(config -> new AdnuntiusBidder(config.getEndpoint(), clock, mapper))
+                .bidderCreator(config -> new AdnuntiusBidder(
+                        config.getEndpoint(),
+                        config.getEuEndpoint(),
+                        clock,
+                        mapper))
                 .assemble();
     }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    @NoArgsConstructor
+    private static class AdnuntiusConfigurationProperties extends BidderConfigurationProperties {
+
+        private String euEndpoint;
+    }
 }

src/main/java/org/prebid/server/spring/config/bidder/AdnuntiusBidderConfiguration.java

@@ -1,11 +1,14 @@
 adapters:
   adnuntius:
     endpoint: https://ads.adnuntius.delivery/i
+    eu-endpoint: https://europe.delivery.adnuntius.com/i
     meta-info:
       maintainer-email: [email protected]
       app-media-types:
         - banner
+        - native
       site-media-types:
         - banner
+        - native
       supported-vendors:
       vendor-id: 855