Skip to content

Commit 7b60dee

Browse files
fix comments
1 parent 5c3c1ba commit 7b60dee

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

src/main/java/org/prebid/server/bidder/admatic/AdmaticBidder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
6060
requests.add(BidderUtil.defaultRequest(
6161
modifiedBidRequest,
6262
headers(modifiedBidRequest.getDevice()),
63-
resolveEndpoint(impExt), mapper));
63+
resolveEndpoint(impExt),
64+
mapper));
6465
} catch (PreBidException e) {
6566
errors.add(BidderError.badInput(e.getMessage()));
6667
}
@@ -85,8 +86,8 @@ private MultiMap headers(Device device) {
8586
final MultiMap headers = HttpUtil.headers();
8687

8788
if (device != null) {
88-
HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp());
8989
HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6());
90+
HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp());
9091
HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.USER_AGENT_HEADER, device.getUa());
9192
}
9293

src/test/java/org/prebid/server/bidder/admatic/AdmaticBidderTest.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ public void makeHttpRequestsShouldReturnExpectedHeaders() {
9898
// then
9999
assertThat(result.getValue()).hasSize(1).first()
100100
.extracting(HttpRequest::getHeaders)
101-
.satisfies(headers -> assertThat(headers.get(CONTENT_TYPE_HEADER))
102-
.isEqualTo(APPLICATION_JSON_CONTENT_TYPE))
103-
.satisfies(headers -> assertThat(headers.get(ACCEPT_HEADER))
104-
.isEqualTo(APPLICATION_JSON_VALUE));
101+
.satisfies(headers -> {
102+
assertThat(headers.get(CONTENT_TYPE_HEADER)).isEqualTo(APPLICATION_JSON_CONTENT_TYPE);
103+
assertThat(headers.get(ACCEPT_HEADER)).isEqualTo(APPLICATION_JSON_VALUE);
104+
});
105105
assertThat(result.getErrors()).isEmpty();
106106
}
107107

@@ -120,14 +120,12 @@ public void makeHttpRequestsShouldReturnRequestsWithHeadersIfDeviceIsPresent() {
120120
assertThat(result.getErrors()).isEmpty();
121121
assertThat(result.getValue()).hasSize(1).first()
122122
.extracting(HttpRequest::getHeaders)
123-
.satisfies(headers -> assertThat(headers.get(CONTENT_TYPE_HEADER))
124-
.isEqualTo(APPLICATION_JSON_CONTENT_TYPE))
125-
.satisfies(headers -> assertThat(headers.get(ACCEPT_HEADER))
126-
.isEqualTo(APPLICATION_JSON_VALUE))
127-
.satisfies(headers -> assertThat(headers.get(USER_AGENT_HEADER))
128-
.isEqualTo("ua"))
129-
.satisfies(headers -> assertThat(headers.get(X_FORWARDED_FOR_HEADER))
130-
.isEqualTo("ip"));
123+
.satisfies(headers -> {
124+
assertThat(headers.get(CONTENT_TYPE_HEADER)).isEqualTo(APPLICATION_JSON_CONTENT_TYPE);
125+
assertThat(headers.get(ACCEPT_HEADER)).isEqualTo(APPLICATION_JSON_VALUE);
126+
assertThat(headers.get(USER_AGENT_HEADER)).isEqualTo("ua");
127+
assertThat(headers.get(X_FORWARDED_FOR_HEADER)).isEqualTo("ipv6");
128+
});
131129
assertThat(result.getErrors()).isEmpty();
132130
}
133131

0 commit comments

Comments
 (0)