Fix comments

prebid · Feb 7, 2024 · 4901127 · 4901127
1 parent e0af661
commit 4901127
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 61 deletions.
diff --git a/src/main/java/org/prebid/server/bidder/adquery/AdQueryBidder.java b/src/main/java/org/prebid/server/bidder/adquery/AdQueryBidder.java
@@ -87,18 +87,20 @@ private ExtImpAdQuery parseImpExt(Imp imp) {
         }
     }
 
-    @Override
-    public final Result<List<BidderBid>> makeBids(BidderCall<AdQueryRequest> httpCall, BidRequest bidRequest) {
-        try {
-            final AdQueryResponse bidResponse = mapper.decodeValue(
-                    httpCall.getResponse().getBody(), AdQueryResponse.class);
-            return Result.withValues(extractBids(bidResponse, bidRequest.getId()));
-        } catch (DecodeException | PreBidException e) {
-            return Result.withError(BidderError.badServerResponse(e.getMessage()));
-        }
+    private HttpRequest<AdQueryRequest> createRequest(BidRequest bidRequest, Imp imp, ExtImpAdQuery extImpAdQuery) {
+        final AdQueryRequest outgoingRequest = createAdQueryRequest(bidRequest, imp, extImpAdQuery);
+
+        return HttpRequest.<AdQueryRequest>builder()
+                .method(HttpMethod.POST)
+                .uri(endpointUrl)
+                .headers(makeHeaders(bidRequest.getDevice()))
+                .impIds(Collections.singleton(imp.getId()))
+                .payload(outgoingRequest)
+                .body(mapper.encodeToBytes(outgoingRequest))
+                .build();
     }
 
-    private AdQueryRequest createAdQueryRequest(BidRequest bidRequest, Imp imp, ExtImpAdQuery extImpAdQuery) {
+    private static AdQueryRequest createAdQueryRequest(BidRequest bidRequest, Imp imp, ExtImpAdQuery extImpAdQuery) {
         final Optional<Device> optionalDevice = Optional.ofNullable(bidRequest.getDevice());
         return AdQueryRequest.builder()
                 .v(PREBID_VERSION)
@@ -107,7 +109,7 @@ private AdQueryRequest createAdQueryRequest(BidRequest bidRequest, Imp imp, ExtI
                 .type(extImpAdQuery.getType())
                 .adUnitCode(imp.getTagid())
                 .bidQid(Optional.ofNullable(bidRequest.getUser()).map(User::getId).orElse(StringUtils.EMPTY))
-                .bidId(bidRequest.getId() + imp.getId())
+                .bidId(StringUtils.defaultString(bidRequest.getId()) + StringUtils.defaultString(imp.getId()))
                 .bidder(BIDDER_NAME)
                 .bidderRequestId(bidRequest.getId())
                 .bidRequestsCount(1)
@@ -120,6 +122,53 @@ private AdQueryRequest createAdQueryRequest(BidRequest bidRequest, Imp imp, ExtI
                 .build();
     }
 
+    private static String getImpSizes(Imp imp) {
+        final Banner banner = imp.getBanner();
+        if (banner == null) {
+            return StringUtils.EMPTY;
+        }
+
+        final List<Format> format = banner.getFormat();
+        if (CollectionUtils.isNotEmpty(format)) {
+            return format.stream()
+                    .map(singleFormat -> FORMAT_TEMPLATE.formatted(
+                            ObjectUtils.defaultIfNull(singleFormat.getW(), 0),
+                            ObjectUtils.defaultIfNull(singleFormat.getH(), 0)))
+                    .collect(Collectors.joining(","));
+        }
+
+        final Integer w = banner.getW();
+        final Integer h = banner.getH();
+        if (w != null && h != null) {
+            return FORMAT_TEMPLATE.formatted(w, h);
+        }
+
+        return StringUtils.EMPTY;
+    }
+
+    private static MultiMap makeHeaders(Device device) {
+        final MultiMap headers = HttpUtil.headers();
+        headers.add(HttpUtil.X_OPENRTB_VERSION_HEADER, ORTB_VERSION);
+
+        Optional.ofNullable(device)
+                .map(Device::getIp)
+                .filter(StringUtils::isNotBlank)
+                .ifPresent(ip -> headers.add(HttpUtil.X_FORWARDED_FOR_HEADER, ip));
+
+        return headers;
+    }
+
+    @Override
+    public final Result<List<BidderBid>> makeBids(BidderCall<AdQueryRequest> httpCall, BidRequest bidRequest) {
+        try {
+            final AdQueryResponse bidResponse = mapper.decodeValue(
+                    httpCall.getResponse().getBody(), AdQueryResponse.class);
+            return Result.withValues(extractBids(bidResponse, bidRequest.getId()));
+        } catch (DecodeException | PreBidException e) {
+            return Result.withError(BidderError.badServerResponse(e.getMessage()));
+        }
+    }
+
     private static List<BidderBid> extractBids(AdQueryResponse adQueryResponse, String bidRequestId) {
         if (adQueryResponse == null || adQueryResponse.getData() == null) {
             return Collections.emptyList();
@@ -155,53 +204,4 @@ private static BidType resolveMediaType(BidType bidType) {
         }
         return BidType.banner;
     }
-
-    private HttpRequest<AdQueryRequest> createRequest(BidRequest bidRequest, Imp imp, ExtImpAdQuery extImpAdQuery) {
-        final AdQueryRequest outgoingRequest = createAdQueryRequest(bidRequest, imp, extImpAdQuery);
-
-        return HttpRequest.<AdQueryRequest>builder()
-                .method(HttpMethod.POST)
-                .uri(endpointUrl)
-                .headers(makeHeaders(bidRequest.getDevice()))
-                .impIds(Collections.singleton(imp.getId()))
-                .payload(outgoingRequest)
-                .body(mapper.encodeToBytes(outgoingRequest))
-                .build();
-    }
-
-    private String getImpSizes(Imp imp) {
-        final Banner banner = imp.getBanner();
-        if (banner == null) {
-            return StringUtils.EMPTY;
-        }
-
-        final List<Format> format = banner.getFormat();
-        if (CollectionUtils.isNotEmpty(format)) {
-            return format.stream()
-                    .map(singleFormat -> FORMAT_TEMPLATE.formatted(
-                            ObjectUtils.defaultIfNull(singleFormat.getW(), 0),
-                            ObjectUtils.defaultIfNull(singleFormat.getH(), 0)))
-                    .collect(Collectors.joining("_"));
-        }
-
-        final Integer w = banner.getW();
-        final Integer h = banner.getH();
-        if (w != null && h != null) {
-            return FORMAT_TEMPLATE.formatted(w, h);
-        }
-
-        return StringUtils.EMPTY;
-    }
-
-    private MultiMap makeHeaders(Device device) {
-        final MultiMap headers = HttpUtil.headers();
-        headers.add(HttpUtil.X_OPENRTB_VERSION_HEADER, ORTB_VERSION);
-
-        Optional.ofNullable(device)
-                .map(Device::getIp)
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(ip -> headers.add(HttpUtil.X_FORWARDED_FOR_HEADER, ip));
-
-        return headers;
-    }
 }
diff --git a/src/test/java/org/prebid/server/bidder/adquery/AdQueryBidderTest.java b/src/test/java/org/prebid/server/bidder/adquery/AdQueryBidderTest.java
@@ -79,7 +79,7 @@ public void makeHttpRequestsShouldCorrectPopulateAdQueryRequest() {
                         .bidderRequestId("22e26bd9a702bc")
                         .bidderRequestsCount(1)
                         .bidRequestsCount(1)
-                        .sizes("320x100_300x250")
+                        .sizes("320x100,300x250")
                         .build());
     }