Skip to content

Commit 58a400a

Browse files
kim-ng93kim-ng93
committed
cleanup for requested changes
1 parent 555dd26 commit 58a400a

File tree

3 files changed

+38
-58
lines changed

3 files changed

+38
-58
lines changed

‎src/main/java/org/prebid/server/bidder/connatix/ConnatixBidder.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public class ConnatixBidder implements Bidder<BidRequest> {
5959
public ConnatixBidder(String endpointUrl,
6060
CurrencyConversionService currencyConversionService,
6161
JacksonMapper mapper) {
62+
6263
this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl));
6364
this.currencyConversionService = Objects.requireNonNull(currencyConversionService);
6465
this.mapper = Objects.requireNonNull(mapper);
@@ -94,7 +95,6 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
9495
}
9596

9697
private static String buildDisplayManagerVersion(BidRequest request) {
97-
9898
return Optional.ofNullable(request.getApp())
9999
.map(App::getExt)
100100
.map(ExtApp::getPrebid)
@@ -122,7 +122,6 @@ private ExtImpConnatix parseExtImp(Imp imp) {
122122
}
123123

124124
private Imp modifyImp(Imp imp, ExtImpConnatix extImpConnatix, String displayManagerVer, BidRequest request) {
125-
126125
final Price bidFloorPrice = resolveBidFloor(imp, request);
127126

128127
final ObjectNode impExt = mapper.mapper()
@@ -175,7 +174,6 @@ private Banner modifyImpBanner(Banner banner) {
175174
private HttpRequest<BidRequest> makeHttpRequest(BidRequest request, Imp imp, MultiMap headers) {
176175
final BidRequest outgoingRequest = request.toBuilder()
177176
.imp(List.of(imp))
178-
.cur(List.of(BIDDER_CURRENCY))
179177
.build();
180178

181179
return BidderUtil.defaultRequest(outgoingRequest, headers, endpointUrl, mapper);

‎src/main/java/org/prebid/server/proto/openrtb/ext/request/connatix/ExtImpConnatix.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package org.prebid.server.proto.openrtb.ext.request.connatix;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import lombok.Builder;
54
import lombok.Value;
65

76
import java.math.BigDecimal;
87

9-
@Builder(toBuilder = true)
108
@Value(staticConstructor = "of")
119
public class ExtImpConnatix {
1210

‎src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java‎

Lines changed: 37 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.util.List;
3939
import java.util.Map;
4040
import java.util.function.UnaryOperator;
41-
import java.util.stream.Stream;
4241

4342
import static java.util.Arrays.asList;
4443
import static org.assertj.core.api.Assertions.assertThat;
@@ -73,8 +72,7 @@ public void creationShouldFailOnInvalidEndpoint() {
7372
public void makeHttpRequestsShouldErrorOnMissingDeviceIp() {
7473
// given
7574
final BidRequest bidRequest = BidRequest.builder()
76-
.device(Device.builder()
77-
.build())
75+
.device(Device.builder().build())
7876
.build();
7977
// when
8078
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -88,9 +86,9 @@ public void makeHttpRequestsShouldErrorOnMissingDeviceIp() {
8886
public void makeHttpRequestsShouldErrorOnInvalidImp() {
8987
// given
9088
final BidRequest bidRequest = givenBidRequest(
91-
request -> request.device(Device.builder().ip("deviceIp").build()),
92-
impBuilder -> impBuilder.ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode())))
93-
);
89+
UnaryOperator.identity(),
90+
givenImp(impBuilder -> impBuilder.ext(mapper.valueToTree(
91+
ExtPrebid.of(null, mapper.createArrayNode())))));
9492

9593
// when
9694
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -106,12 +104,10 @@ public void makeHttpRequestsShouldErrorOnInvalidImp() {
106104
public void makeHttpRequestsShouldUpdateDisplayManagerVer() {
107105
// given
108106
final BidRequest bidRequest = givenBidRequest(
109-
request -> request.device(Device.builder().ip("deviceIp").build())
110-
.app(App.builder().ext(ExtApp.of(
111-
ExtAppPrebid.of("source", "version"), null))
112-
.build()),
113-
givenImp(givenExt(UnaryOperator.identity()))
114-
);
107+
request -> request.app(App.builder().ext(ExtApp.of(
108+
ExtAppPrebid.of("source", "version"), null))
109+
.build()),
110+
givenImp(ExtImpConnatix.of("placementId", null)));
115111

116112
// when
117113
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -129,12 +125,12 @@ public void makeHttpRequestsShouldUpdateDisplayManagerVer() {
129125
public void makeHttpRequestsShouldNotUpdateDisplayManagerVerIfPresent() {
130126
// given
131127
final BidRequest bidRequest = givenBidRequest(
132-
request -> request.device(Device.builder().ip("deviceIp").build())
133-
.app(App.builder().ext(ExtApp.of(
134-
ExtAppPrebid.of("source", "version"), null))
128+
request -> request.app(App.builder()
129+
.ext(ExtApp.of(ExtAppPrebid.of("source", "version"), null))
135130
.build()),
136-
impBuilder -> impBuilder.displaymanagerver("displayManagerVer")
137-
.ext(mapper.valueToTree(ExtPrebid.of(null, givenExt(UnaryOperator.identity())))));
131+
givenImp(impBuilder -> impBuilder.displaymanagerver("displayManagerVer")
132+
.ext(mapper.valueToTree(
133+
ExtPrebid.of(null, ExtImpConnatix.of("placementId", null))))));
138134

139135
// when
140136
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -152,13 +148,14 @@ public void makeHttpRequestsShouldNotUpdateDisplayManagerVerIfPresent() {
152148
public void makeHttpRequestsShouldNotUpdateBannerIfFormatsIsEmpty() {
153149
// given
154150
final BidRequest bidRequest = givenBidRequest(
155-
request -> request.device(Device.builder().ip("deviceIp").build()),
156-
impBuilder -> impBuilder.banner(Banner.builder()
151+
UnaryOperator.identity(),
152+
givenImp(impBuilder -> impBuilder.banner(Banner.builder()
157153
.w(100)
158154
.h(200)
159155
.format(Collections.emptyList())
160156
.build())
161-
.ext(mapper.valueToTree(ExtPrebid.of(null, givenExt(UnaryOperator.identity())))));
157+
.ext(mapper.valueToTree(ExtPrebid.of(null,
158+
ExtImpConnatix.of("placementId", null))))));
162159

163160
// when
164161
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -176,11 +173,12 @@ public void makeHttpRequestsShouldNotUpdateBannerIfFormatsIsEmpty() {
176173
public void makeHttpRequestsShouldUpdateBanner() {
177174
// given
178175
final BidRequest bidRequest = givenBidRequest(
179-
request -> request.device(Device.builder().ip("deviceIp").build()),
180-
impBuilder -> impBuilder.banner(Banner.builder().format(List.of(
176+
UnaryOperator.identity(),
177+
givenImp(impBuilder -> impBuilder.banner(Banner.builder().format(List.of(
181178
Format.builder().w(300).h(250).build(),
182179
Format.builder().w(1).h(1).build())).build())
183-
.ext(mapper.valueToTree(ExtPrebid.of(null, givenExt(UnaryOperator.identity())))));
180+
.ext(mapper.valueToTree(
181+
ExtPrebid.of(null, ExtImpConnatix.of("placementId", null))))));
184182

185183
// when
186184
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -206,11 +204,12 @@ public void makeHttpRequestsShouldConvertBidFloorWhenNotInBidderCurrency() {
206204
given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString()))
207205
.willReturn(BigDecimal.TEN);
208206
final BidRequest bidRequest = givenBidRequest(
209-
request -> request.device(Device.builder().ip("deviceIp").build()),
210-
impBuilder -> impBuilder
211-
.ext(mapper.valueToTree(ExtPrebid.of(null, givenExt(UnaryOperator.identity()))))
207+
UnaryOperator.identity(),
208+
givenImp(impBuilder -> impBuilder
209+
.ext(mapper.valueToTree(ExtPrebid.of(null,
210+
ExtImpConnatix.of("placementId", null))))
212211
.bidfloor(BigDecimal.ONE)
213-
.bidfloorcur("EUR"));
212+
.bidfloorcur("EUR")));
214213

215214
// when
216215
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -222,23 +221,19 @@ public void makeHttpRequestsShouldConvertBidFloorWhenNotInBidderCurrency() {
222221
.flatExtracting(BidRequest::getImp)
223222
.extracting(Imp::getBidfloor, Imp::getBidfloorcur)
224223
.containsOnly(tuple(BigDecimal.TEN, "USD"));
225-
assertThat(result.getValue())
226-
.extracting(HttpRequest::getPayload)
227-
.flatExtracting(BidRequest::getCur)
228-
.containsExactly("USD");
229224
}
230225

231226
@Test
232227
public void makeHttpRequestsShouldSplitRequestIntoMultipleRequests() {
233228
// given
234229
final BidRequest bidRequest = givenBidRequest(
235-
request -> request.device(Device.builder().ip("deviceIp").build()),
236-
impBuilder -> impBuilder
237-
.ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpConnatix.builder()
238-
.placementId("placement1").build()))),
239-
impBuilder -> impBuilder
240-
.ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpConnatix.builder()
241-
.placementId("placement2").build()))));
230+
UnaryOperator.identity(),
231+
givenImp(impBuilder -> impBuilder
232+
.ext(mapper.valueToTree(ExtPrebid.of(null,
233+
ExtImpConnatix.of("placement1", null))))),
234+
givenImp(impBuilder -> impBuilder
235+
.ext(mapper.valueToTree(ExtPrebid.of(null,
236+
ExtImpConnatix.of("placement2", null))))));
242237

243238
// when
244239
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -253,8 +248,8 @@ public void makeHttpRequestsShouldIncludeResolvedHttpHeadersFromDevice() {
253248
// given
254249
final BidRequest bidRequest = givenBidRequest(
255250
request -> request.device(Device.builder().ip("deviceIp").ipv6("deviceIpv6").ua("userAgent").build()),
256-
impBuilder -> impBuilder
257-
.ext(mapper.valueToTree(ExtPrebid.of(null, givenExt(UnaryOperator.identity())))));
251+
givenImp(impBuilder -> impBuilder
252+
.ext(mapper.valueToTree(ExtImpConnatix.of("placementId", null)))));
258253

259254
// when
260255
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
@@ -335,16 +330,9 @@ public void makeBidsShouldReturnVideoBidSuccessfully() throws JsonProcessingExce
335330

336331
private static BidRequest givenBidRequest(UnaryOperator<BidRequest.BidRequestBuilder> bidRequestCustomizer,
337332
Imp... imps) {
338-
return bidRequestCustomizer.apply(BidRequest.builder().imp(asList(imps))).build();
339-
}
340-
341-
@SafeVarargs
342-
private static BidRequest givenBidRequest(UnaryOperator<BidRequest.BidRequestBuilder> bidRequestCustomizer,
343-
UnaryOperator<Imp.ImpBuilder>... impCustomizers) {
344333
return bidRequestCustomizer.apply(BidRequest.builder()
345-
.imp(Stream.of(impCustomizers)
346-
.map(ConnatixBidderTest::givenImp)
347-
.toList()))
334+
.device(Device.builder().ip("deviceIp").build())
335+
.imp(asList(imps)))
348336
.build();
349337
}
350338

@@ -356,10 +344,6 @@ private static Imp givenImp(ExtImpConnatix extImpConnatix) {
356344
return givenImp(imp -> imp.ext(mapper.valueToTree(ExtPrebid.of(null, extImpConnatix))));
357345
}
358346

359-
private static ExtImpConnatix givenExt(UnaryOperator<ExtImpConnatix.ExtImpConnatixBuilder> extCustomizer) {
360-
return extCustomizer.apply(ExtImpConnatix.builder().placementId("placementId")).build();
361-
}
362-
363347
private static BidderCall<BidRequest> givenHttpCall(BidResponse response) throws JsonProcessingException {
364348
return givenHttpCall(mapper.writeValueAsString(response));
365349
}

0 commit comments

Comments
 (0)