Skip to content

Commit 2ebf421

Browse files
Net-burstNet-burst
authored
Core: Move Checkstyle to the root pom.xml (#3797)
1 parent 4e07bbf commit 2ebf421

480 files changed

Lines changed: 1390 additions & 1729 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/config/ConfiantAdQualityModuleConfiguration.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public class ConfiantAdQualityModuleConfiguration {
3434
ConfiantAdQualityModule confiantAdQualityModule(
3535
@Value("${hooks.modules.confiant-ad-quality.api-key}") String apiKey,
3636
@Value("${hooks.modules.confiant-ad-quality.scan-state-check-interval}") int scanStateCheckInterval,
37-
@Value("${hooks.modules.confiant-ad-quality.bidders-to-exclude-from-scan}") List<String> biddersToExcludeFromScan,
37+
@Value("${hooks.modules.confiant-ad-quality.bidders-to-exclude-from-scan}")
38+
List<String> biddersToExcludeFromScan,
3839
RedisConfig redisConfig,
3940
RedisRetryConfig retryConfig,
4041
Vertx vertx,
@@ -43,13 +44,24 @@ ConfiantAdQualityModule confiantAdQualityModule(
4344

4445
final RedisConnectionConfig writeNodeConfig = redisConfig.getWriteNode();
4546
final RedisClient writeRedisNode = new RedisClient(
46-
vertx, writeNodeConfig.getHost(), writeNodeConfig.getPort(), writeNodeConfig.getPassword(), retryConfig, "write node");
47+
vertx,
48+
writeNodeConfig.getHost(),
49+
writeNodeConfig.getPort(),
50+
writeNodeConfig.getPassword(),
51+
retryConfig,
52+
"write node");
4753
final RedisConnectionConfig readNodeConfig = redisConfig.getReadNode();
4854
final RedisClient readRedisNode = new RedisClient(
49-
vertx, readNodeConfig.getHost(), readNodeConfig.getPort(), readNodeConfig.getPassword(), retryConfig, "read node");
55+
vertx,
56+
readNodeConfig.getHost(),
57+
readNodeConfig.getPort(),
58+
readNodeConfig.getPassword(),
59+
retryConfig,
60+
"read node");
5061

5162
final BidsScanner bidsScanner = new BidsScanner(writeRedisNode, readRedisNode, apiKey, objectMapper);
52-
final RedisScanStateChecker redisScanStateChecker = new RedisScanStateChecker(bidsScanner, scanStateCheckInterval, vertx);
63+
final RedisScanStateChecker redisScanStateChecker = new RedisScanStateChecker(
64+
bidsScanner, scanStateCheckInterval, vertx);
5365

5466
final Promise<Void> scannerPromise = Promise.promise();
5567
scannerPromise.future().onComplete(r -> redisScanStateChecker.run());

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapper.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,20 @@ public class AnalyticsMapper {
2424
private static final String INSPECTED_HAS_ISSUE = "inspected-has-issue";
2525
private static final String INSPECTED_NO_ISSUES = "inspected-no-issues";
2626

27+
private AnalyticsMapper() {
28+
}
29+
2730
public static Tags toAnalyticsTags(List<BidderResponse> bidderResponsesWithIssues,
2831
List<BidderResponse> bidderResponsesWithoutIssues,
2932
List<BidderResponse> bidderResponsesNotScanned) {
3033

3134
return TagsImpl.of(Collections.singletonList(ActivityImpl.of(
3235
AD_QUALITY_SCAN,
3336
SUCCESS_STATUS,
34-
toActivityResults(bidderResponsesWithIssues, bidderResponsesWithoutIssues, bidderResponsesNotScanned))));
37+
toActivityResults(
38+
bidderResponsesWithIssues,
39+
bidderResponsesWithoutIssues,
40+
bidderResponsesNotScanned))));
3541
}
3642

3743
private static List<Result> toActivityResults(List<BidderResponse> bidderResponsesWithIssues,

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapper.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,32 @@
1313

1414
public class BidsMapper {
1515

16-
public static RedisBidsData toRedisBidsFromBidResponses(
17-
BidRequest bidRequest,
18-
List<BidderResponse> bidderResponses) {
16+
private BidsMapper() {
17+
}
18+
19+
public static RedisBidsData toRedisBidsFromBidResponses(BidRequest bidRequest,
20+
List<BidderResponse> bidderResponses) {
1921

20-
final List<RedisBidResponseData> confiantBidResponses = bidderResponses
21-
.stream().map(bidResponse -> RedisBidResponseData
22+
final List<RedisBidResponseData> confiantBidResponses = bidderResponses.stream()
23+
.map(bidResponse -> RedisBidResponseData
2224
.builder()
2325
.dspId(bidResponse.getBidder())
2426
.bidresponse(toBidResponseFromBidderResponse(bidRequest, bidResponse))
25-
.build()).toList();
27+
.build())
28+
.toList();
2629

2730
return RedisBidsData.builder()
2831
.breq(bidRequest)
2932
.bresps(confiantBidResponses)
3033
.build();
3134
}
3235

33-
private static BidResponse toBidResponseFromBidderResponse(
34-
BidRequest bidRequest,
35-
BidderResponse bidderResponse) {
36+
private static BidResponse toBidResponseFromBidderResponse(BidRequest bidRequest,
37+
BidderResponse bidderResponse) {
3638

3739
return BidResponse.builder()
3840
.id(bidRequest.getId())
39-
.cur(bidRequest.getCur().get(0))
41+
.cur(bidRequest.getCur().getFirst())
4042
.seatbid(Collections.singletonList(SeatBid.builder()
4143
.bid(bidderResponse.getSeatBid().getBids().stream().map(BidderBid::getBid).toList())
4244
.build()))

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanner.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,18 @@ public Future<BidsScanResult> submitBids(RedisBidsData bids) {
5959

6060
final RedisAPI readRedisNodeAPI = this.readRedisNode.getRedisAPI();
6161
final boolean shouldSubmit = !isScanDisabled
62-
&& readRedisNodeAPI != null && bids.getBresps().size() > 0;
62+
&& readRedisNodeAPI != null && !bids.getBresps().isEmpty();
6363

6464
if (shouldSubmit) {
6565
readRedisNodeAPI.get("function_submit_bids", submitHash -> {
6666
final Object submitHashResult = submitHash.result();
6767
if (submitHashResult != null) {
68-
final List<String> readArgs = List.of(submitHashResult.toString(), "0", toBidsAsJson(bids), apiKey, "true");
68+
final List<String> readArgs = List.of(
69+
submitHashResult.toString(),
70+
"0",
71+
toBidsAsJson(bids),
72+
apiKey,
73+
"true");
6974

7075
readRedisNodeAPI.evalsha(readArgs, response -> {
7176
if (response.result() != null) {
@@ -120,7 +125,7 @@ public Future<Boolean> isScanDisabledFlag() {
120125
if (redisAPI != null) {
121126
redisAPI.get("scan-disabled", scanDisabledValue -> {
122127
final Response scanDisabled = scanDisabledValue.result();
123-
isDisabled.complete(scanDisabled != null && scanDisabled.toString().equals("true"));
128+
isDisabled.complete(scanDisabled != null && "true".equals(scanDisabled.toString()));
124129
});
125130

126131
return isDisabled.future();

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void attemptReconnect(int retry, Handler<AsyncResult<RedisConnection>> h
9292
if (retry > (retryConfig.getShortIntervalAttempts() + retryConfig.getLongIntervalAttempts())) {
9393
logger.info("Confiant Redis connection is not established");
9494
} else {
95-
long backoff = retry < retryConfig.getShortIntervalAttempts()
95+
final long backoff = retry < retryConfig.getShortIntervalAttempts()
9696
? retryConfig.getShortInterval()
9797
: retryConfig.getLongInterval();
9898

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public BidsScanResult parseBidsScanResult(String redisResponse) {
3636
} catch (JsonProcessingException resultParse) {
3737
String message;
3838
try {
39-
RedisError errorResponse = objectMapper.readValue(redisResponse, RedisError.class);
39+
final RedisError errorResponse = objectMapper.readValue(redisResponse, RedisError.class);
4040
message = String.format("Redis error - %s: %s", errorResponse.getCode(), errorResponse.getMessage());
4141
} catch (JsonProcessingException errorParse) {
4242
message = String.format("Error during parse redis response: %s", redisResponse);

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/model/RedisRetryConfig.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,26 @@
55
@Data
66
public class RedisRetryConfig {
77

8-
/** Maximum attempts with short interval value to try to reconnect to Confiant's Redis server in case any connection error happens */
8+
/**
9+
* Maximum attempts with short interval value to try to reconnect to
10+
* Confiant's Redis server in case any connection error happens
11+
*/
912
int shortIntervalAttempts;
1013

11-
/** Short time interval in milliseconds after which another one attempt to connect to Redis will be executed */
14+
/**
15+
* Short time interval in milliseconds after which another one attempt to connect to Redis will be executed
16+
*/
1217
int shortInterval;
1318

14-
/** Maximum attempts with long interval value to try to reconnect to Confiant's Redis server in case any connection error happens. This attempts are used when short-attempts were not successful */
19+
/**
20+
* Maximum attempts with long interval value to try to reconnect to
21+
* Confiant's Redis server in case any connection error happens.
22+
* This attempts are used when short-attempts were not successful
23+
*/
1524
int longIntervalAttempts;
1625

17-
/** Long time interval in milliseconds after which another one attempt to connect to Redis will be executed */
26+
/**
27+
* Long time interval in milliseconds after which another one attempt to connect to Redis will be executed
28+
*/
1829
int longInterval;
1930
}

‎extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.iab.openrtb.request.Device;
55
import com.iab.openrtb.request.User;
66
import io.vertx.core.Future;
7+
import org.apache.commons.collections4.ListUtils;
78
import org.prebid.server.activity.Activity;
89
import org.prebid.server.activity.ComponentType;
910
import org.prebid.server.activity.infrastructure.payload.ActivityInvocationPayload;
@@ -12,6 +13,7 @@
1213
import org.prebid.server.auction.model.AuctionContext;
1314
import org.prebid.server.auction.model.BidderResponse;
1415
import org.prebid.server.auction.privacy.enforcement.mask.UserFpdActivityMask;
16+
import org.prebid.server.hooks.execution.v1.InvocationResultImpl;
1517
import org.prebid.server.hooks.execution.v1.bidder.AllProcessedBidResponsesPayloadImpl;
1618
import org.prebid.server.hooks.modules.com.confiant.adquality.core.AnalyticsMapper;
1719
import org.prebid.server.hooks.modules.com.confiant.adquality.core.BidsMapper;
@@ -20,7 +22,6 @@
2022
import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues;
2123
import org.prebid.server.hooks.v1.InvocationAction;
2224
import org.prebid.server.hooks.v1.InvocationResult;
23-
import org.prebid.server.hooks.execution.v1.InvocationResultImpl;
2425
import org.prebid.server.hooks.v1.InvocationStatus;
2526
import org.prebid.server.hooks.v1.auction.AuctionInvocationContext;
2627
import org.prebid.server.hooks.v1.bidder.AllProcessedBidResponsesHook;
@@ -31,7 +32,6 @@
3132
import java.util.Map;
3233
import java.util.Objects;
3334
import java.util.stream.Collectors;
34-
import java.util.stream.Stream;
3535

3636
public class ConfiantAdQualityBidResponsesScanHook implements AllProcessedBidResponsesHook {
3737

@@ -117,7 +117,7 @@ private InvocationResult<AllProcessedBidResponsesPayload> toInvocationResult(
117117
.analyticsTags(AnalyticsMapper.toAnalyticsTags(
118118
bidderResponsesWithIssues, bidderResponsesWithoutIssues, notScannedBidderResponses))
119119
.payloadUpdate(payload -> AllProcessedBidResponsesPayloadImpl.of(
120-
Stream.concat(bidderResponsesWithoutIssues.stream(), notScannedBidderResponses.stream()).toList()));
120+
ListUtils.union(bidderResponsesWithoutIssues, notScannedBidderResponses)));
121121

122122
return resultBuilder.build();
123123
}

‎extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapperTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import static java.util.Collections.singletonList;
1414
import static org.assertj.core.api.Assertions.assertThat;
15+
import static org.prebid.server.hooks.modules.com.confiant.adquality.core.AnalyticsMapper.toAnalyticsTags;
1516

1617
public class AnalyticsMapperTest {
1718

@@ -29,7 +30,10 @@ public void shouldMapBidsScanResultToAnalyticsTags() {
2930
AdQualityModuleTestUtils.getBidderResponse("bidder_d", "imp_d", "bid_id_d"));
3031

3132
// when
32-
final Tags tags = AnalyticsMapper.toAnalyticsTags(bidderResponsesWithIssues, bidderResponsesWithoutIssues, bidderResponsesNotScanned);
33+
final Tags tags = toAnalyticsTags(
34+
bidderResponsesWithIssues,
35+
bidderResponsesWithoutIssues,
36+
bidderResponsesNotScanned);
3337

3438
// then
3539
assertThat(tags.activities()).isEqualTo(singletonList(ActivityImpl.of(

‎extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapperTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ public void shouldMapBidResponsesToRedisBids() {
4141
assertThat(redisBidResponseData1.getBidresponse().getId()).isEqualTo(bidRequest.getId());
4242
assertThat(redisBidResponseData1.getBidresponse().getCur()).isEqualTo(bidRequest.getCur().get(0));
4343
assertThat(redisBidResponseData1.getBidresponse().getSeatbid()).hasSize(1);
44-
SeatBid seatBid1 = redisBidResponseData1.getBidresponse().getSeatbid().get(0);
44+
final SeatBid seatBid1 = redisBidResponseData1.getBidresponse().getSeatbid().get(0);
4545
assertThat(seatBid1.getBid()).hasSize(1);
46-
assertThat(seatBid1.getBid().get(0).getId()).isEqualTo(bidderResponse1.getSeatBid().getBids().get(0).getBid().getId());
46+
assertThat(seatBid1.getBid().getFirst().getId())
47+
.isEqualTo(bidderResponse1.getSeatBid().getBids().getFirst().getBid().getId());
4748

4849
final RedisBidResponseData redisBidResponseData2 = result.getBresps().get(1);
4950
assertThat(redisBidResponseData2.getDspId()).isEqualTo(bidderResponse2.getBidder());
@@ -53,6 +54,7 @@ public void shouldMapBidResponsesToRedisBids() {
5354

5455
final SeatBid seatBid2 = redisBidResponseData2.getBidresponse().getSeatbid().get(0);
5556
assertThat(seatBid2.getBid()).hasSize(1);
56-
assertThat(seatBid2.getBid().get(0).getId()).isEqualTo(bidderResponse2.getSeatBid().getBids().get(0).getBid().getId());
57+
assertThat(seatBid2.getBid().getFirst().getId())
58+
.isEqualTo(bidderResponse2.getSeatBid().getBids().getFirst().getBid().getId());
5759
}
5860
}

0 commit comments

Comments
 (0)