Skip to content

Commit b4bf1bd

Browse files
author
EvgeniiMunin
committed
refactos code style
1 parent 197f44f commit b4bf1bd

File tree

4 files changed

+29
-429
lines changed

4 files changed

+29
-429
lines changed

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,6 @@ private List<ThrottlingMessage> extractThrottlingMessages(
405405
final ObjectNode impExt = imp.getExt();
406406
final JsonNode bidderNode = extImpPrebid(impExt.get("prebid")).getBidder();
407407

408-
final List<ThrottlingMessage> throttlingImpMessages = new ArrayList<>();
409-
410408
final String ipv4 = Optional.ofNullable(bidRequest.getDevice())
411409
.map(Device::getIp)
412410
.orElse(null);
@@ -417,6 +415,7 @@ private List<ThrottlingMessage> extractThrottlingMessages(
417415
throw new PreBidException("Failed to get country for IP", e);
418416
}
419417

418+
final List<ThrottlingMessage> throttlingImpMessages = new ArrayList<>();
420419
if (bidderNode.isObject()) {
421420
final ObjectNode bidders = (ObjectNode) bidderNode;
422421
final Iterator<String> fieldNames = bidders.fieldNames();

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import java.nio.file.Files;
4545
import java.nio.file.Paths;
4646
import java.util.Collections;
47-
import java.util.HashMap;
4847
import java.util.List;
4948
import java.util.Map;
5049
import java.util.concurrent.TimeUnit;
@@ -73,7 +72,7 @@ public class GreenbidsRealTimeDataProcessedAuctionRequestHookTest {
7372

7473
private static final String THRESHOLDS_CACHE_KEY_PREFIX = "throttlingThresholds_";
7574

76-
private GreenbidsRealTimeDataProcessedAuctionRequestHook hook;
75+
private GreenbidsRealTimeDataProcessedAuctionRequestHook target;
7776

7877
private JacksonMapper jacksonMapper;
7978

@@ -95,7 +94,7 @@ public void setUp() {
9594
thresholdsCacheWithExpiration = Caffeine.newBuilder()
9695
.expireAfterWrite(CACHE_EXPIRATION_MINUTES, TimeUnit.MINUTES)
9796
.build();
98-
hook = new GreenbidsRealTimeDataProcessedAuctionRequestHook(
97+
target = new GreenbidsRealTimeDataProcessedAuctionRequestHook(
9998
mapper,
10099
modelCacheWithExpiration,
101100
thresholdsCacheWithExpiration,
@@ -120,7 +119,7 @@ public void setUp() {
120119
}
121120

122121
@Test
123-
public void shouldExitEarlyIfPartnerNotActivatedInBidRequest() throws IOException, OrtException {
122+
public void shouldExitEarlyWhenPartnerNotActivatedInBidRequest() throws IOException, OrtException {
124123
// given
125124
final Banner banner = givenBanner();
126125

@@ -142,7 +141,7 @@ public void shouldExitEarlyIfPartnerNotActivatedInBidRequest() throws IOExceptio
142141
thresholdCache.getCache().put("throttlingThresholds_test-pbuid", givenThrottlingThresholds());
143142

144143
// when
145-
final Future<InvocationResult<AuctionRequestPayload>> future = hook
144+
final Future<InvocationResult<AuctionRequestPayload>> future = target
146145
.call(null, invocationContext);
147146
final InvocationResult<AuctionRequestPayload> result = future.result();
148147
final BidRequest resultBidRequest = result
@@ -165,7 +164,7 @@ public void shouldExitEarlyIfPartnerNotActivatedInBidRequest() throws IOExceptio
165164
}
166165

167166
@Test
168-
public void shouldExitEarlyIfThresholdIsNotAvailable() throws OrtException, IOException {
167+
public void shouldExitEarlyWhenThresholdIsNotAvailable() throws OrtException, IOException {
169168
// given
170169
final Banner banner = givenBanner();
171170

@@ -188,7 +187,7 @@ public void shouldExitEarlyIfThresholdIsNotAvailable() throws OrtException, IOEx
188187
modelCache.getCache().put("onnxModelRunner_test-pbuid", givenOnnxModelRunner());
189188

190189
// when
191-
final Future<InvocationResult<AuctionRequestPayload>> future = hook
190+
final Future<InvocationResult<AuctionRequestPayload>> future = target
192191
.call(null, invocationContext);
193192
final InvocationResult<AuctionRequestPayload> result = future.result();
194193
final BidRequest resultBidRequest = result
@@ -211,7 +210,7 @@ public void shouldExitEarlyIfThresholdIsNotAvailable() throws OrtException, IOEx
211210
}
212211

213212
@Test
214-
public void shouldExitEarlyIfModelIsNotAvailable() throws IOException {
213+
public void shouldExitEarlyWhenModelIsNotAvailable() throws IOException {
215214
// given
216215
final Banner banner = givenBanner();
217216

@@ -234,7 +233,7 @@ public void shouldExitEarlyIfModelIsNotAvailable() throws IOException {
234233
thresholdCache.getCache().put("throttlingThresholds_test-pbuid", givenThrottlingThresholds());
235234

236235
// when
237-
final Future<InvocationResult<AuctionRequestPayload>> future = hook
236+
final Future<InvocationResult<AuctionRequestPayload>> future = target
238237
.call(null, invocationContext);
239238
final InvocationResult<AuctionRequestPayload> result = future.result();
240239
final BidRequest resultBidRequest = result
@@ -283,7 +282,7 @@ public void shouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() throws
283282
final AnalyticsResult expectedAnalyticsResult = expectedAnalyticsResult(true, true);
284283

285284
// when
286-
final Future<InvocationResult<AuctionRequestPayload>> future = hook
285+
final Future<InvocationResult<AuctionRequestPayload>> future = target
287286
.call(null, invocationContext);
288287
final InvocationResult<AuctionRequestPayload> result = future.result();
289288
final BidRequest resultBidRequest = result
@@ -314,7 +313,7 @@ public void shouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() throws
314313
}
315314

316315
@Test
317-
public void shouldFilterBiddersBasedOnModelIfAnyFeatureNotAvailable() throws OrtException, IOException {
316+
public void shouldFilterBiddersBasedOnModelWhenAnyFeatureNotAvailable() throws OrtException, IOException {
318317
// given
319318
final Banner banner = givenBanner();
320319

@@ -341,7 +340,7 @@ public void shouldFilterBiddersBasedOnModelIfAnyFeatureNotAvailable() throws Ort
341340
final AnalyticsResult expectedAnalyticsResult = expectedAnalyticsResult(false, false);
342341

343342
// when
344-
final Future<InvocationResult<AuctionRequestPayload>> future = hook
343+
final Future<InvocationResult<AuctionRequestPayload>> future = target
345344
.call(null, invocationContext);
346345
final InvocationResult<AuctionRequestPayload> result = future.result();
347346
final BidRequest resultBidRequest = result
@@ -401,7 +400,7 @@ public void shouldFilterBiddersBasedOnModelResults() throws OrtException, IOExce
401400
final AnalyticsResult expectedAnalyticsResult = expectedAnalyticsResult(false, false);
402401

403402
// when
404-
final Future<InvocationResult<AuctionRequestPayload>> future = hook
403+
final Future<InvocationResult<AuctionRequestPayload>> future = target
405404
.call(null, invocationContext);
406405
final InvocationResult<AuctionRequestPayload> result = future.result();
407406
final BidRequest resultBidRequest = result
@@ -606,10 +605,10 @@ private static Ortb2ImpExtResult expectedOrtb2ImpExtResult(Boolean isExploration
606605
}
607606

608607
private static ExplorationResult expectedExplorationResult(Boolean isExploration, Boolean isKeptInAuction) {
609-
final Map<String, Boolean> keptInAuction = new HashMap<>();
610-
keptInAuction.put("appnexus", isKeptInAuction);
611-
keptInAuction.put("pubmatic", isKeptInAuction);
612-
keptInAuction.put("rubicon", isKeptInAuction);
608+
final Map<String, Boolean> keptInAuction = Map.of(
609+
"appnexus", isKeptInAuction,
610+
"pubmatic", isKeptInAuction,
611+
"rubicon", isKeptInAuction);
613612
return ExplorationResult.of(null, keptInAuction, isExploration);
614613
}
615614
}

extra/modules/greenbids-real-time-data/src/test/resources/thresholds_pbuid=test-pbuid.json

Lines changed: 12 additions & 390 deletions
Large diffs are not rendered by default.

src/test/java/org/prebid/server/vertx/httpclient/BasicHttpClientTest.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -162,26 +162,6 @@ public void requestShouldFailIfHttpRequestTimedOut(Vertx vertx, VertxTestContext
162162
}));
163163
}
164164

165-
@Test
166-
public void requestShouldFailIfHttpResponseTimedOut(Vertx vertx, VertxTestContext context) {
167-
// given
168-
final BasicHttpClient httpClient = new BasicHttpClient(vertx, vertx.createHttpClient());
169-
final int serverPort = 8888;
170-
171-
startServer(serverPort, 0L, 2000L);
172-
173-
// when
174-
final Future<?> future = httpClient.get("http://localhost:" + serverPort, 1000L);
175-
176-
// then
177-
future.onComplete(context.failing(e -> {
178-
assertThat(e)
179-
.isInstanceOf(TimeoutException.class)
180-
.hasMessage("Timeout period of 1000ms has been exceeded");
181-
context.completeNow();
182-
}));
183-
}
184-
185165
/**
186166
* The server returns entire response or body with delay.
187167
*/

0 commit comments

Comments
 (0)