Port Adgeneration: rewrite adapter to match Prebid.js v1.6.6 spec

src/main/java/org/prebid/server/bidder/adgeneration/model/request/AdgenerationRequest.java

@@ -0,0 +1,22 @@
+package org.prebid.server.bidder.adgeneration.model.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.iab.openrtb.request.BidRequest;
+import lombok.Builder;
+import lombok.Value;
+
+@Builder(toBuilder = true)
+@Value
+public class AdgenerationRequest {
+
+    String currency;
+    @JsonProperty("pbver")
+    String pbVersion;
+    @JsonProperty("sdkname")
+    String sdkName;
+    @JsonProperty("adapterver")
+    String adapterVersion;
+    BidRequest ortb;
+    @JsonProperty("imark")
+    Integer iMark;
+}

src/main/java/org/prebid/server/bidder/adgeneration/model/response/AdgenerationLocationParams.java

@@ -0,0 +1,9 @@
+package org.prebid.server.bidder.adgeneration.model.response;
+
+import lombok.Value;
+
+@Value(staticConstructor = "of")
+public class AdgenerationLocationParams {
+
+    AdgenerationOption option;
+}

src/main/java/org/prebid/server/bidder/adgeneration/model/response/AdgenerationOption.java

@@ -0,0 +1,11 @@
+package org.prebid.server.bidder.adgeneration.model.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Value;
+
+@Value(staticConstructor = "of")
+public class AdgenerationOption {
+
+    @JsonProperty("ad_type")
+    String adType;
+}

src/main/java/org/prebid/server/bidder/adgeneration/model/response/AdgenerationResponse.java

@@ -0,0 +1,18 @@
+package org.prebid.server.bidder.adgeneration.model.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Value;
+
+import java.util.List;
+
+@Value(staticConstructor = "of")
+public class AdgenerationResponse {
+
+    @JsonProperty("locationid")
+    String locationId;
+
+    @JsonProperty("location_params")
+    AdgenerationLocationParams locationParams;
+
+    List<AdgenerationResult> results;
+}

src/main/java/org/prebid/server/bidder/adgeneration/model/response/AdgenerationResult.java

@@ -0,0 +1,46 @@
+package org.prebid.server.bidder.adgeneration.model.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Value;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Value(staticConstructor = "of")
+public class AdgenerationResult {
+
+    String ad;
+
+    String beacon;
+
+    @JsonProperty("beaconurl")
+    String beaconUrl;
+
+    BigDecimal cpm;
+
+    @JsonProperty("creativeid")
+    String creativeId;
+
+    @JsonProperty("dealid")
+    String dealId;
+
+    Integer h;
+
+    Integer w;
+
+    Integer ttl;
+
+    String vastxml;
+
+    @JsonProperty("landing_url")
+    String landingUrl;
+
+    @JsonProperty("scheduleid")
+    String scheduleId;
+
+    List<String> adomain;
+
+    @JsonProperty("native")
+    JsonNode xNative;
+}

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

@@ -6,4 +6,5 @@
 public class ExtImpAdgeneration {
 
     String id;
+    String marginTop;
 }

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

@@ -6,6 +6,7 @@
 import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties;
 import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler;
 import org.prebid.server.spring.env.YamlPropertySourceFactory;
+import org.prebid.server.util.VersionInfo;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,11 +26,15 @@ BidderConfigurationProperties configurationProperties() {
 
     @Bean
     BidderDeps adgenerationBidderDeps(BidderConfigurationProperties adgenerationConfigurationProperties,
+                                      VersionInfo versionInfo,
                                       JacksonMapper mapper) {
 
         return BidderDepsAssembler.forBidder(BIDDER_NAME)
                 .withConfig(adgenerationConfigurationProperties)
-                .bidderCreator(config -> new AdgenerationBidder(config.getEndpoint(), mapper))
+                .bidderCreator(config ->
+                        new AdgenerationBidder(config.getEndpoint(),
+                                versionInfo.getVersion(),
+                                mapper))
                 .assemble();
     }
 }

src/main/resources/bidder-config/adgeneration.yaml

@@ -1,11 +1,13 @@
 adapters:
   adgeneration:
-    endpoint: https://d.socdm.com/adsv/v1
+    endpoint: https://d.socdm.com/adgen/prebid
     meta-info:
       maintainer-email: ssp-ope@supership.jp
       app-media-types:
         - banner
+        - native
       site-media-types:
         - banner
+        - native
       supported-vendors:
       vendor-id: 0

src/main/resources/static/bidder-params/adgeneration.json

@@ -7,6 +7,10 @@
     "id": {
       "type": "string",
       "description": "Ad ID registered by AdGeneration."
+    },
+    "marginTop": {
+      "type": "string",
+      "description": "marginTop passed to ADGBrowserM.init for upper_billboard placements (matches Prebid.js bidder params)."
     }
   },
   "required": [