Kobler: New adapter ported from Go

src/main/java/org/prebid/server/bidder/kobler/KoblerBidder.java

@@ -2,6 +2,7 @@
 
 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;
 import com.iab.openrtb.request.Imp;
@@ -40,19 +41,23 @@ public class KoblerBidder implements Bidder<BidRequest> {
     private static final TypeReference<ExtPrebid<?, ExtImpKobler>> KOBLER_EXT_TYPE_REFERENCE =
             new TypeReference<>() {
             };
-    private static final String EXT_PREBID = "prebid";
-    private static final String DEFAULT_BID_CURRENCY = "USD";
-    private static final String DEV_ENDPOINT = "https://bid-service.dev.essrtb.com/bid/prebid_server_rtb_call";
-
     private final String endpointUrl;
+    private final String defaultBidCurrency;
+    private final String devEndpoint;
+    private final String extPrebid;
     private final CurrencyConversionService currencyConversionService;
     private final JacksonMapper mapper;
 
     public KoblerBidder(String endpointUrl,
+                        String defaultBidCurrency,
+                        String devEndpoint,
+                        String extPrebid,
                         CurrencyConversionService currencyConversionService,
                         JacksonMapper mapper) {
-
         this.endpointUrl = HttpUtil.validateUrl(endpointUrl);
+        this.defaultBidCurrency = Objects.requireNonNull(defaultBidCurrency);
+        this.devEndpoint = Objects.requireNonNull(devEndpoint);
+        this.extPrebid = Objects.requireNonNull(extPrebid);
         this.currencyConversionService = Objects.requireNonNull(currencyConversionService);
         this.mapper = Objects.requireNonNull(mapper);
     }
@@ -63,19 +68,13 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
         boolean testMode = false;
         final List<Imp> modifiedImps = new ArrayList<>();
 
-        final List<String> currencies = new ArrayList<>(bidRequest.getCur());
-        if (!currencies.contains(DEFAULT_BID_CURRENCY)) {
-            currencies.add(DEFAULT_BID_CURRENCY);
-        }
+        final List<String> currencies = normalizeCurrencies(bidRequest);
 
         final List<Imp> imps = bidRequest.getImp();
-        if (!imps.isEmpty()) {
-            try {
-                testMode = parseImpExt(imps.getFirst()).getTest();
-            } catch (PreBidException e) {
-                errors.add(BidderError.badInput(e.getMessage()));
-                return Result.withErrors(errors);
-            }
+        try {
+            testMode = isTest(imps.getFirst());
+        } catch (PreBidException e) {
+            errors.add(BidderError.badInput(e.getMessage()));
         }
 
         for (Imp imp : imps) {
@@ -92,12 +91,28 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
                 .imp(modifiedImps)
                 .build();
 
-        final String endpoint = testMode ? DEV_ENDPOINT : endpointUrl;
+        final String endpoint = testMode ? devEndpoint : endpointUrl;
 
         final HttpRequest<BidRequest> httpRequest = BidderUtil.defaultRequest(modifiedRequest, endpoint, mapper);
         return Result.of(Collections.singletonList(httpRequest), errors);
     }
 
+    private boolean isTest(Imp imp) {
+        try {
+            return parseImpExt(imp).getTest();
+        } catch (PreBidException e) {
+            return false;
+        }
+    }
+
+    private List<String> normalizeCurrencies(BidRequest bidRequest) {
+        final List<String> currencies = new ArrayList<>(bidRequest.getCur());
+        if (!currencies.contains(defaultBidCurrency)) {
+            currencies.add(defaultBidCurrency);
+        }
+        return currencies;
+    }
+
     private Imp modifyImp(BidRequest bidRequest, Imp imp) {
         final Price resolvedBidFloor = resolveBidFloor(imp, bidRequest);
 
@@ -109,7 +124,7 @@ private Imp modifyImp(BidRequest bidRequest, Imp imp) {
 
     private Price resolveBidFloor(Imp imp, BidRequest bidRequest) {
         final Price initialBidFloorPrice = Price.of(imp.getBidfloorcur(), imp.getBidfloor());
-        return BidderUtil.shouldConvertBidFloor(initialBidFloorPrice, DEFAULT_BID_CURRENCY)
+        return BidderUtil.shouldConvertBidFloor(initialBidFloorPrice, defaultBidCurrency)
                 ? convertBidFloor(initialBidFloorPrice, bidRequest)
                 : initialBidFloorPrice;
     }
@@ -119,9 +134,9 @@ private Price convertBidFloor(Price bidFloorPrice, BidRequest bidRequest) {
                 bidFloorPrice.getValue(),
                 bidRequest,
                 bidFloorPrice.getCurrency(),
-                DEFAULT_BID_CURRENCY);
+                defaultBidCurrency);
 
-        return Price.of(DEFAULT_BID_CURRENCY, convertedPrice);
+        return Price.of(defaultBidCurrency, convertedPrice);
     }
 
     private ExtImpKobler parseImpExt(Imp imp) {
@@ -155,13 +170,15 @@ private List<BidderBid> bidsFromResponse(BidResponse bidResponse) {
                 .map(SeatBid::getBid)
                 .filter(Objects::nonNull)
                 .flatMap(Collection::stream)
+                .filter(Objects::nonNull)
                 .map(bid -> BidderBid.of(bid, getBidType(bid), bidResponse.getCur()))
                 .toList();
     }
 
     private BidType getBidType(Bid bid) {
         return Optional.ofNullable(bid.getExt())
-                .map(ext -> ext.get(EXT_PREBID))
+                .map(ext -> ext.get(extPrebid))
+                .filter(JsonNode::isObject)
                 .map(ObjectNode.class::cast)
                 .map(this::parseExtBidPrebid)
                 .map(ExtBidPrebid::getType)

src/main/java/org/prebid/server/proto/openrtb/ext/request/kobler/ExtImpKobler.java

@@ -1,11 +1,9 @@
 package org.prebid.server.proto.openrtb.ext.request.kobler;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
 
 @Value(staticConstructor = "of")
 public class ExtImpKobler {
 
-    @JsonProperty("test")
     Boolean test;
 }

src/main/java/org/prebid/server/spring/config/bidder/KoblerConfiguration.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.kobler.KoblerBidder;
 import org.prebid.server.currency.CurrencyConversionService;
@@ -13,6 +16,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.validation.annotation.Validated;
 
 import jakarta.validation.constraints.NotBlank;
 
@@ -24,20 +28,43 @@ public class KoblerConfiguration {
 
     @Bean("koblerConfigurationProperties")
     @ConfigurationProperties("adapters.kobler")
-    BidderConfigurationProperties configurationProperties() {
-        return new BidderConfigurationProperties();
+    KoblerConfigurationProperties configurationProperties() {
+        return new KoblerConfigurationProperties();
     }
 
     @Bean
-    BidderDeps koblerBidderDeps(BidderConfigurationProperties koblerConfigurationProperties,
+    BidderDeps koblerBidderDeps(KoblerConfigurationProperties config,
                                 CurrencyConversionService currencyConversionService,
                                 @NotBlank @Value("${external-url}") String externalUrl,
                                 JacksonMapper mapper) {
 
-        return BidderDepsAssembler.forBidder(BIDDER_NAME)
-                .withConfig(koblerConfigurationProperties)
+        return BidderDepsAssembler.<KoblerConfigurationProperties>forBidder(BIDDER_NAME)
+                .withConfig(config)
                 .usersyncerCreator(UsersyncerCreator.create(externalUrl))
-                .bidderCreator(config -> new KoblerBidder(config.getEndpoint(), currencyConversionService, mapper))
+                .bidderCreator(cfg -> new KoblerBidder(
+                        cfg.getEndpoint(),
+                        cfg.getDefaultBidCurrency(),
+                        cfg.getDevEndpoint(),
+                        cfg.getExtPrebid(),
+                        currencyConversionService,
+                        mapper))
                 .assemble();
+
+    }
+
+    @Validated
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    @NoArgsConstructor
+    private static class KoblerConfigurationProperties extends BidderConfigurationProperties {
+
+        @NotBlank
+        private String defaultBidCurrency;
+
+        @NotBlank
+        private String devEndpoint;
+
+        @NotBlank
+        private String extPrebid;
     }
 }

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

@@ -1,6 +1,9 @@
 adapters:
   kobler:
     endpoint: "https://bid.essrtb.com/bid/prebid_server_rtb_call"
+    default-bid-currency: "USD"
+    dev-endpoint: "https://bid-service.dev.essrtb.com/bid/prebid_server_rtb_call"
+    ext-prebid: "prebid"
     endpoint-compression: gzip
     geoscope:
       - NOR

src/test/java/org/prebid/server/bidder/kobler/KoblerBidderTest.java

@@ -43,6 +43,8 @@ public class KoblerBidderTest extends VertxTest {
 
     private static final String ENDPOINT_URL = "https://test.com";
     private static final String DEV_ENDPOINT = "https://bid-service.dev.essrtb.com/bid/prebid_server_rtb_call";
+    private static final String DEFAULT_BID_CURRENCY = "USD";
+    private static final String EXT_PREBID = "prebid";
 
     @Mock
     private CurrencyConversionService currencyConversionService;
@@ -51,13 +53,25 @@ public class KoblerBidderTest extends VertxTest {
 
     @BeforeEach
     public void setUp() {
-        target = new KoblerBidder(ENDPOINT_URL, currencyConversionService, jacksonMapper);
+        target = new KoblerBidder(
+                ENDPOINT_URL,
+                DEFAULT_BID_CURRENCY,
+                DEV_ENDPOINT,
+                EXT_PREBID,
+                currencyConversionService,
+                jacksonMapper);
     }
 
     @Test
     public void creationShouldFailOnInvalidEndpointUrl() {
         assertThatIllegalArgumentException().isThrownBy(() ->
-                new KoblerBidder("invalid_url", currencyConversionService, jacksonMapper));
+                new KoblerBidder(
+                        "invalid_url",
+                        DEFAULT_BID_CURRENCY,
+                        DEV_ENDPOINT,
+                        EXT_PREBID,
+                        currencyConversionService,
+                        jacksonMapper));
     }
 
     @Test
@@ -98,13 +112,15 @@ public void makeHttpRequestsShouldConvertBidFloorCurrency() {
 
         // then
         assertThat(result.getErrors()).isEmpty();
-        assertThat(result.getValue().get(0).getPayload().getImp())
+        assertThat(result.getValue())
+                .extracting(HttpRequest::getPayload)
+                .flatExtracting(BidRequest::getImp)
                 .extracting(Imp::getBidfloor, Imp::getBidfloorcur)
                 .containsExactly(tuple(BigDecimal.TEN, "USD"));
     }
 
     @Test
-    public void makeHttpRequestsShouldUseDevEndpointwhenTestModeEnabled() {
+    public void makeHttpRequestsShouldUseDevEndpointWhenTestModeEnabled() {
         // given
         final BidRequest bidRequest = givenBidRequest(bidRequestBuilder -> bidRequestBuilder
                         .cur(singletonList("EUR")),
@@ -132,6 +148,28 @@ public void makeHttpRequestsShouldAddUsdToCurrenciesIfMissing() {
         assertThat(result.getValue().get(0).getPayload().getCur()).containsExactlyInAnyOrder("EUR", "USD");
     }
 
+    @Test
+    public void makeHttpRequestsShouldUseDevEndpointwhenImpExtTestIsTrue() {
+        // given
+        final ObjectNode extNode = jacksonMapper.mapper().createObjectNode();
+        extNode.putObject("bidder").put("test", true);
+
+        final Imp imp = Imp.builder().id("test-imp").ext(extNode).build();
+
+        final BidRequest bidRequest = BidRequest.builder()
+                .imp(Collections.singletonList(imp)).cur(Collections.singletonList("USD")).build();
+
+        // when
+        final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
+
+        // then
+        assertThat(result.getErrors()).isEmpty();
+        assertThat(result.getValue()).hasSize(1);
+
+        final HttpRequest<BidRequest> httpRequest = result.getValue().get(0);
+        assertThat(httpRequest.getUri()).isEqualTo(DEV_ENDPOINT);
+    }
+
     @Test
     public void makeBidsShouldReturnErrorIfResponseBodyIsInvalid() {
         // given
@@ -196,28 +234,6 @@ public void makeBidsShouldReturnEmptyListwhenSeatbidIsEmpty() throws JsonProcess
         assertThat(result.getErrors()).isEmpty();
     }
 
-    @Test
-    public void makeHttpRequestsShouldUseDevEndpointwhenImpExtTestIsTrue() {
-        // given
-        final ObjectNode extNode = jacksonMapper.mapper().createObjectNode();
-        extNode.putObject("bidder").put("test", true);
-
-        final Imp imp = Imp.builder().id("test-imp").ext(extNode).build();
-
-        final BidRequest bidRequest = BidRequest.builder()
-                .imp(Collections.singletonList(imp)).cur(Collections.singletonList("USD")).build();
-
-        // when
-        final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
-
-        // then
-        assertThat(result.getErrors()).isEmpty();
-        assertThat(result.getValue()).hasSize(1);
-
-        final HttpRequest<BidRequest> httpRequest = result.getValue().get(0);
-        assertThat(httpRequest.getUri()).isEqualTo(DEV_ENDPOINT);
-    }
-
     private static BidRequest givenBidRequest(UnaryOperator<Imp.ImpBuilder> impCustomizer) {
         return givenBidRequest(identity(), impCustomizer);
     }