diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/config/ConfiantAdQualityModuleConfiguration.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/config/ConfiantAdQualityModuleConfiguration.java index 7978153c34a..37ed7c9ec10 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/config/ConfiantAdQualityModuleConfiguration.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/config/ConfiantAdQualityModuleConfiguration.java @@ -34,7 +34,8 @@ public class ConfiantAdQualityModuleConfiguration { ConfiantAdQualityModule confiantAdQualityModule( @Value("${hooks.modules.confiant-ad-quality.api-key}") String apiKey, @Value("${hooks.modules.confiant-ad-quality.scan-state-check-interval}") int scanStateCheckInterval, - @Value("${hooks.modules.confiant-ad-quality.bidders-to-exclude-from-scan}") List biddersToExcludeFromScan, + @Value("${hooks.modules.confiant-ad-quality.bidders-to-exclude-from-scan}") + List biddersToExcludeFromScan, RedisConfig redisConfig, RedisRetryConfig retryConfig, Vertx vertx, @@ -43,13 +44,24 @@ ConfiantAdQualityModule confiantAdQualityModule( final RedisConnectionConfig writeNodeConfig = redisConfig.getWriteNode(); final RedisClient writeRedisNode = new RedisClient( - vertx, writeNodeConfig.getHost(), writeNodeConfig.getPort(), writeNodeConfig.getPassword(), retryConfig, "write node"); + vertx, + writeNodeConfig.getHost(), + writeNodeConfig.getPort(), + writeNodeConfig.getPassword(), + retryConfig, + "write node"); final RedisConnectionConfig readNodeConfig = redisConfig.getReadNode(); final RedisClient readRedisNode = new RedisClient( - vertx, readNodeConfig.getHost(), readNodeConfig.getPort(), readNodeConfig.getPassword(), retryConfig, "read node"); + vertx, + readNodeConfig.getHost(), + readNodeConfig.getPort(), + readNodeConfig.getPassword(), + retryConfig, + "read node"); final BidsScanner bidsScanner = new BidsScanner(writeRedisNode, readRedisNode, apiKey, objectMapper); - final RedisScanStateChecker redisScanStateChecker = new RedisScanStateChecker(bidsScanner, scanStateCheckInterval, vertx); + final RedisScanStateChecker redisScanStateChecker = new RedisScanStateChecker( + bidsScanner, scanStateCheckInterval, vertx); final Promise scannerPromise = Promise.promise(); scannerPromise.future().onComplete(r -> redisScanStateChecker.run()); diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapper.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapper.java index 0a7e9c7c2ea..47c73e0077c 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapper.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapper.java @@ -24,6 +24,9 @@ public class AnalyticsMapper { private static final String INSPECTED_HAS_ISSUE = "inspected-has-issue"; private static final String INSPECTED_NO_ISSUES = "inspected-no-issues"; + private AnalyticsMapper() { + } + public static Tags toAnalyticsTags(List bidderResponsesWithIssues, List bidderResponsesWithoutIssues, List bidderResponsesNotScanned) { @@ -31,7 +34,10 @@ public static Tags toAnalyticsTags(List bidderResponsesWithIssue return TagsImpl.of(Collections.singletonList(ActivityImpl.of( AD_QUALITY_SCAN, SUCCESS_STATUS, - toActivityResults(bidderResponsesWithIssues, bidderResponsesWithoutIssues, bidderResponsesNotScanned)))); + toActivityResults( + bidderResponsesWithIssues, + bidderResponsesWithoutIssues, + bidderResponsesNotScanned)))); } private static List toActivityResults(List bidderResponsesWithIssues, diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapper.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapper.java index cf4f3557862..094b7e6b494 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapper.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapper.java @@ -13,16 +13,19 @@ public class BidsMapper { - public static RedisBidsData toRedisBidsFromBidResponses( - BidRequest bidRequest, - List bidderResponses) { + private BidsMapper() { + } + + public static RedisBidsData toRedisBidsFromBidResponses(BidRequest bidRequest, + List bidderResponses) { - final List confiantBidResponses = bidderResponses - .stream().map(bidResponse -> RedisBidResponseData + final List confiantBidResponses = bidderResponses.stream() + .map(bidResponse -> RedisBidResponseData .builder() .dspId(bidResponse.getBidder()) .bidresponse(toBidResponseFromBidderResponse(bidRequest, bidResponse)) - .build()).toList(); + .build()) + .toList(); return RedisBidsData.builder() .breq(bidRequest) @@ -30,13 +33,12 @@ public static RedisBidsData toRedisBidsFromBidResponses( .build(); } - private static BidResponse toBidResponseFromBidderResponse( - BidRequest bidRequest, - BidderResponse bidderResponse) { + private static BidResponse toBidResponseFromBidderResponse(BidRequest bidRequest, + BidderResponse bidderResponse) { return BidResponse.builder() .id(bidRequest.getId()) - .cur(bidRequest.getCur().get(0)) + .cur(bidRequest.getCur().getFirst()) .seatbid(Collections.singletonList(SeatBid.builder() .bid(bidderResponse.getSeatBid().getBids().stream().map(BidderBid::getBid).toList()) .build())) diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanner.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanner.java index d8b9657e22d..1b3afe3092d 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanner.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanner.java @@ -59,13 +59,18 @@ public Future submitBids(RedisBidsData bids) { final RedisAPI readRedisNodeAPI = this.readRedisNode.getRedisAPI(); final boolean shouldSubmit = !isScanDisabled - && readRedisNodeAPI != null && bids.getBresps().size() > 0; + && readRedisNodeAPI != null && !bids.getBresps().isEmpty(); if (shouldSubmit) { readRedisNodeAPI.get("function_submit_bids", submitHash -> { final Object submitHashResult = submitHash.result(); if (submitHashResult != null) { - final List readArgs = List.of(submitHashResult.toString(), "0", toBidsAsJson(bids), apiKey, "true"); + final List readArgs = List.of( + submitHashResult.toString(), + "0", + toBidsAsJson(bids), + apiKey, + "true"); readRedisNodeAPI.evalsha(readArgs, response -> { if (response.result() != null) { @@ -120,7 +125,7 @@ public Future isScanDisabledFlag() { if (redisAPI != null) { redisAPI.get("scan-disabled", scanDisabledValue -> { final Response scanDisabled = scanDisabledValue.result(); - isDisabled.complete(scanDisabled != null && scanDisabled.toString().equals("true")); + isDisabled.complete(scanDisabled != null && "true".equals(scanDisabled.toString())); }); return isDisabled.future(); diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java index d4c9864dd9c..d1b424f314e 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java @@ -92,7 +92,7 @@ private void attemptReconnect(int retry, Handler> h if (retry > (retryConfig.getShortIntervalAttempts() + retryConfig.getLongIntervalAttempts())) { logger.info("Confiant Redis connection is not established"); } else { - long backoff = retry < retryConfig.getShortIntervalAttempts() + final long backoff = retry < retryConfig.getShortIntervalAttempts() ? retryConfig.getShortInterval() : retryConfig.getLongInterval(); diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java index 11cabafbeb0..4dfca9b2449 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java @@ -36,7 +36,7 @@ public BidsScanResult parseBidsScanResult(String redisResponse) { } catch (JsonProcessingException resultParse) { String message; try { - RedisError errorResponse = objectMapper.readValue(redisResponse, RedisError.class); + final RedisError errorResponse = objectMapper.readValue(redisResponse, RedisError.class); message = String.format("Redis error - %s: %s", errorResponse.getCode(), errorResponse.getMessage()); } catch (JsonProcessingException errorParse) { message = String.format("Error during parse redis response: %s", redisResponse); diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/model/RedisRetryConfig.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/model/RedisRetryConfig.java index 60034a8345d..3c7f83d7164 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/model/RedisRetryConfig.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/model/RedisRetryConfig.java @@ -5,15 +5,26 @@ @Data public class RedisRetryConfig { - /** Maximum attempts with short interval value to try to reconnect to Confiant's Redis server in case any connection error happens */ + /** + * Maximum attempts with short interval value to try to reconnect to + * Confiant's Redis server in case any connection error happens + */ int shortIntervalAttempts; - /** Short time interval in milliseconds after which another one attempt to connect to Redis will be executed */ + /** + * Short time interval in milliseconds after which another one attempt to connect to Redis will be executed + */ int shortInterval; - /** 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 */ + /** + * 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 + */ int longIntervalAttempts; - /** Long time interval in milliseconds after which another one attempt to connect to Redis will be executed */ + /** + * Long time interval in milliseconds after which another one attempt to connect to Redis will be executed + */ int longInterval; } diff --git a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java index 8a65e74db63..d9a2146852e 100644 --- a/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java +++ b/extra/modules/confiant-ad-quality/src/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHook.java @@ -4,6 +4,7 @@ import com.iab.openrtb.request.Device; import com.iab.openrtb.request.User; import io.vertx.core.Future; +import org.apache.commons.collections4.ListUtils; import org.prebid.server.activity.Activity; import org.prebid.server.activity.ComponentType; import org.prebid.server.activity.infrastructure.payload.ActivityInvocationPayload; @@ -12,6 +13,7 @@ import org.prebid.server.auction.model.AuctionContext; import org.prebid.server.auction.model.BidderResponse; import org.prebid.server.auction.privacy.enforcement.mask.UserFpdActivityMask; +import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.execution.v1.bidder.AllProcessedBidResponsesPayloadImpl; import org.prebid.server.hooks.modules.com.confiant.adquality.core.AnalyticsMapper; import org.prebid.server.hooks.modules.com.confiant.adquality.core.BidsMapper; @@ -20,7 +22,6 @@ import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues; import org.prebid.server.hooks.v1.InvocationAction; import org.prebid.server.hooks.v1.InvocationResult; -import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.v1.InvocationStatus; import org.prebid.server.hooks.v1.auction.AuctionInvocationContext; import org.prebid.server.hooks.v1.bidder.AllProcessedBidResponsesHook; @@ -31,7 +32,6 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import java.util.stream.Stream; public class ConfiantAdQualityBidResponsesScanHook implements AllProcessedBidResponsesHook { @@ -117,7 +117,7 @@ private InvocationResult toInvocationResult( .analyticsTags(AnalyticsMapper.toAnalyticsTags( bidderResponsesWithIssues, bidderResponsesWithoutIssues, notScannedBidderResponses)) .payloadUpdate(payload -> AllProcessedBidResponsesPayloadImpl.of( - Stream.concat(bidderResponsesWithoutIssues.stream(), notScannedBidderResponses.stream()).toList())); + ListUtils.union(bidderResponsesWithoutIssues, notScannedBidderResponses))); return resultBuilder.build(); } diff --git a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapperTest.java b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapperTest.java index f3ea0d4764e..16caae6a684 100644 --- a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapperTest.java +++ b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapperTest.java @@ -12,6 +12,7 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; +import static org.prebid.server.hooks.modules.com.confiant.adquality.core.AnalyticsMapper.toAnalyticsTags; public class AnalyticsMapperTest { @@ -29,7 +30,10 @@ public void shouldMapBidsScanResultToAnalyticsTags() { AdQualityModuleTestUtils.getBidderResponse("bidder_d", "imp_d", "bid_id_d")); // when - final Tags tags = AnalyticsMapper.toAnalyticsTags(bidderResponsesWithIssues, bidderResponsesWithoutIssues, bidderResponsesNotScanned); + final Tags tags = toAnalyticsTags( + bidderResponsesWithIssues, + bidderResponsesWithoutIssues, + bidderResponsesNotScanned); // then assertThat(tags.activities()).isEqualTo(singletonList(ActivityImpl.of( diff --git a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapperTest.java b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapperTest.java index e60f3beaea4..3d168eaeedd 100644 --- a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapperTest.java +++ b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapperTest.java @@ -41,9 +41,10 @@ public void shouldMapBidResponsesToRedisBids() { assertThat(redisBidResponseData1.getBidresponse().getId()).isEqualTo(bidRequest.getId()); assertThat(redisBidResponseData1.getBidresponse().getCur()).isEqualTo(bidRequest.getCur().get(0)); assertThat(redisBidResponseData1.getBidresponse().getSeatbid()).hasSize(1); - SeatBid seatBid1 = redisBidResponseData1.getBidresponse().getSeatbid().get(0); + final SeatBid seatBid1 = redisBidResponseData1.getBidresponse().getSeatbid().get(0); assertThat(seatBid1.getBid()).hasSize(1); - assertThat(seatBid1.getBid().get(0).getId()).isEqualTo(bidderResponse1.getSeatBid().getBids().get(0).getBid().getId()); + assertThat(seatBid1.getBid().getFirst().getId()) + .isEqualTo(bidderResponse1.getSeatBid().getBids().getFirst().getBid().getId()); final RedisBidResponseData redisBidResponseData2 = result.getBresps().get(1); assertThat(redisBidResponseData2.getDspId()).isEqualTo(bidderResponse2.getBidder()); @@ -53,6 +54,7 @@ public void shouldMapBidResponsesToRedisBids() { final SeatBid seatBid2 = redisBidResponseData2.getBidresponse().getSeatbid().get(0); assertThat(seatBid2.getBid()).hasSize(1); - assertThat(seatBid2.getBid().get(0).getId()).isEqualTo(bidderResponse2.getSeatBid().getBids().get(0).getBid().getId()); + assertThat(seatBid2.getBid().getFirst().getId()) + .isEqualTo(bidderResponse2.getSeatBid().getBids().getFirst().getBid().getId()); } } diff --git a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanResultTest.java b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanResultTest.java index 335d00527c2..fd6377f9a18 100644 --- a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanResultTest.java +++ b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanResultTest.java @@ -4,11 +4,11 @@ import org.junit.jupiter.api.Test; import org.prebid.server.auction.model.BidderResponse; import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues; -import org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils.getBidderResponse; public class BidsScanResultTest { @@ -17,7 +17,16 @@ public class BidsScanResultTest { @Test public void shouldProperlyGetIssuesMessage() { // given - final String redisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\", \"issues\": [{ \"value\": \"ads.deceivenetworks.net\", \"spec_name\": \"malicious_domain\", \"first_adinstance\": \"e91e8da982bb8b7f80100426\"}]}]]]"; + final String redisResponse = """ + [[[{ + "tag_key": "key_a", + "imp_id": "imp_a", + "issues": [{ + "value": "ads.deceivenetworks.net", + "spec_name": "malicious_domain", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]]]"""; final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(redisResponse); // when @@ -25,7 +34,11 @@ public void shouldProperlyGetIssuesMessage() { // then assertThat(issues.size()).isEqualTo(1); - assertThat(issues.get(0)).isEqualTo("key_a: [Issue(specName=malicious_domain, value=ads.deceivenetworks.net, firstAdinstance=e91e8da982bb8b7f80100426)]"); + assertThat(issues.getFirst()).isEqualTo(""" + key_a: [\ + Issue(specName=malicious_domain, \ + value=ads.deceivenetworks.net, \ + firstAdinstance=e91e8da982bb8b7f80100426)]"""); } @Test @@ -39,16 +52,31 @@ public void shouldProperlyGetDebugMessage() { // then assertThat(messages.size()).isEqualTo(1); - assertThat(messages.get(0)).isEqualTo("Error during parse redis response: invalid redis response"); + assertThat(messages.getFirst()).isEqualTo("Error during parse redis response: invalid redis response"); } @Test public void shouldProperlyGroupBiddersByIssues() { // given - final String redisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\", \"issues\": [{ \"value\": \"ads.deceivenetworks.net\", \"spec_name\": \"malicious_domain\", \"first_adinstance\": \"e91e8da982bb8b7f80100426\"}]}],[{\"tag_key\": \"key_b\", \"imp_id\": \"imp_b\"}]]]"; + final String redisResponse = """ + [[ + [{ + "tag_key": "key_a", + "imp_id": "imp_a", + "issues": [{ + "value": "ads.deceivenetworks.net", + "spec_name": "malicious_domain", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }], + [{ + "tag_key": "key_b", + "imp_id": "imp_b" + }] + ]]"""; final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(redisResponse); - final BidderResponse br1 = AdQualityModuleTestUtils.getBidderResponse("critio1", "1", "11"); - final BidderResponse br2 = AdQualityModuleTestUtils.getBidderResponse("critio2", "2", "12"); + final BidderResponse br1 = getBidderResponse("critio1", "1", "11"); + final BidderResponse br2 = getBidderResponse("critio2", "2", "12"); // when final GroupByIssues groupByIssues = bidsScanResult.toGroupByIssues(List.of(br1, br2)); @@ -63,10 +91,20 @@ public void shouldProperlyGroupBiddersByIssues() { @Test public void shouldProperlyGroupBiddersByIssuesWithoutIssues() { // given - final String redisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\"}],[{\"tag_key\": \"key_b\", \"imp_id\": \"imp_b\"}]]]"; + final String redisResponse = """ + [[ + [{ + "tag_key": "key_a", + "imp_id": "imp_a" + }], + [{ + "tag_key": "key_b", + "imp_id": "imp_b" + }] + ]]"""; final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(redisResponse); - final BidderResponse br1 = AdQualityModuleTestUtils.getBidderResponse("critio1", "1", "11"); - final BidderResponse br2 = AdQualityModuleTestUtils.getBidderResponse("critio2", "2", "12"); + final BidderResponse br1 = getBidderResponse("critio1", "1", "11"); + final BidderResponse br2 = getBidderResponse("critio2", "2", "12"); // when final GroupByIssues groupByIssues = bidsScanResult.toGroupByIssues(List.of(br1, br2)); diff --git a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScannerTest.java b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScannerTest.java index 7138dd536e1..eaedc93e170 100644 --- a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScannerTest.java +++ b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScannerTest.java @@ -18,7 +18,6 @@ import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues; import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisBidResponseData; import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisBidsData; -import org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils; import java.util.List; @@ -26,6 +25,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; +import static org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils.getBidderResponse; @ExtendWith(MockitoExtension.class) public class BidsScannerTest { @@ -118,9 +118,10 @@ public void shouldReturnEmptyScanResultWhenApiIsNotInitialized() { public void shouldReturnEmptyScanResultWhenThereIsNoBidderResponses() { // given doReturn(redisAPI).when(readRedisNode).getRedisAPI(); + final RedisBidsData redisBidsData = RedisBidsData.builder().bresps(List.of()).build(); // when - final Future scanResult = bidsScannerTest.submitBids(RedisBidsData.builder().bresps(List.of()).build()); + final Future scanResult = bidsScannerTest.submitBids(redisBidsData); final GroupByIssues groupByIssues = scanResult.result().toGroupByIssues(List.of()); // then @@ -132,7 +133,16 @@ public void shouldReturnEmptyScanResultWhenThereIsNoBidderResponses() { @Test() public void shouldReturnEmptyScanResultWhenThereIsSomeBidderResponseAndScanIsDisabled() { // given - final String redisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\", \"issues\": [{ \"value\": \"ads.deceivenetworks.net\", \"spec_name\": \"malicious_domain\", \"first_adinstance\": \"e91e8da982bb8b7f80100426\"}]}]]]"; + final String redisResponse = """ + [[[{ + "tag_key": "key_a", + "imp_id": "imp_a", + "issues": [{ + "value": "ads.deceivenetworks.net", + "spec_name": "malicious_domain", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]]]"""; final RedisAPI redisAPI = getRedisEmulationWithAnswer(redisResponse); final RedisBidsData bidsData = RedisBidsData.builder() .breq(BidRequest.builder().build()) @@ -145,7 +155,7 @@ public void shouldReturnEmptyScanResultWhenThereIsSomeBidderResponseAndScanIsDis // when final Future scanResult = bidsScannerTest.submitBids(bidsData); final GroupByIssues groupByIssues = scanResult.result() - .toGroupByIssues(List.of(AdQualityModuleTestUtils.getBidderResponse("bidder-a", "imp-a", "imp-id-a"))); + .toGroupByIssues(List.of(getBidderResponse("bidder-a", "imp-a", "imp-id-a"))); // then assertThat(scanResult.succeeded()).isTrue(); @@ -156,7 +166,22 @@ public void shouldReturnEmptyScanResultWhenThereIsSomeBidderResponseAndScanIsDis @Test() public void shouldReturnRedisScanResultFromReadNodeWhenThereAreSomeBidderResponsesAndScanIsEnabled() { // given - final String redisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\", \"issues\": [{ \"value\": \"ads.deceivenetworks.net\", \"spec_name\": \"malicious_domain\", \"first_adinstance\": \"e91e8da982bb8b7f80100426\"}]}],[{\"tag_key\": \"key_b\", \"imp_id\": \"imp_b\"}]]]"; + final String redisResponse = """ + [[ + [{ + "tag_key": "key_a", + "imp_id": "imp_a", + "issues": [{ + "value": "ads.deceivenetworks.net", + "spec_name": "malicious_domain", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }], + [{ + "tag_key": "key_b", + "imp_id": "imp_b" + }] + ]]"""; final RedisAPI redisAPI = getRedisEmulationWithAnswer(redisResponse); final RedisBidsData bidsData = RedisBidsData.builder() .breq(BidRequest.builder().build()) @@ -171,8 +196,8 @@ public void shouldReturnRedisScanResultFromReadNodeWhenThereAreSomeBidderRespons final Future scanResult = bidsScannerTest.submitBids(bidsData); final GroupByIssues groupByIssues = scanResult.result() .toGroupByIssues(List.of( - AdQualityModuleTestUtils.getBidderResponse("bidder-a", "imp-a", "imp-id-a"), - AdQualityModuleTestUtils.getBidderResponse("bidder-b", "imp-b", "imp-id-b"))); + getBidderResponse("bidder-a", "imp-a", "imp-id-a"), + getBidderResponse("bidder-b", "imp-b", "imp-id-b"))); // then assertThat(scanResult.succeeded()).isTrue(); @@ -183,7 +208,12 @@ public void shouldReturnRedisScanResultFromReadNodeWhenThereAreSomeBidderRespons @Test() public void shouldReturnRedisScanResultFromWriteNodeWhenReadNodeHasMissingResults() { // given - final String readRedisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\", \"ro_skipped\": \"true\"}]]]"; + final String readRedisResponse = """ + [[[{ + "tag_key": "key_a", + "imp_id": "imp_a", + "ro_skipped": "true" + }]]]"""; final RedisAPI readRedisAPI = getRedisEmulationWithAnswer(readRedisResponse); final RedisBidsData bidsData = RedisBidsData.builder() .breq(BidRequest.builder().build()) @@ -194,14 +224,23 @@ public void shouldReturnRedisScanResultFromWriteNodeWhenReadNodeHasMissingResult bidsScannerTest.enableScan(); doReturn(readRedisAPI).when(readRedisNode).getRedisAPI(); - final String writeRedisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\", \"issues\": [{ \"value\": \"ads.deceivenetworks.net\", \"spec_name\": \"malicious_domain\", \"first_adinstance\": \"e91e8da982bb8b7f80100426\"}]}]]]"; + final String writeRedisResponse = """ + [[[{ + "tag_key": "key_a", + "imp_id": "imp_a", + "issues": [{ + "value": "ads.deceivenetworks.net", + "spec_name": "malicious_domain", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]]]"""; final RedisAPI writeRedisAPI = getRedisEmulationWithAnswer(writeRedisResponse); doReturn(writeRedisAPI).when(writeRedisNode).getRedisAPI(); // when final Future scanResult = bidsScannerTest.submitBids(bidsData); final GroupByIssues groupByIssues = scanResult.result() - .toGroupByIssues(List.of(AdQualityModuleTestUtils.getBidderResponse("bidder-a", "imp-a", "imp-id-a"))); + .toGroupByIssues(List.of(getBidderResponse("bidder-a", "imp-a", "imp-id-a"))); // then assertThat(scanResult.succeeded()).isTrue(); diff --git a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParserTest.java b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParserTest.java index ab1bfe12516..28d889c48b6 100644 --- a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParserTest.java +++ b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParserTest.java @@ -12,7 +12,17 @@ public class RedisParserTest { @Test public void shouldParseBidsScanResult() { // given - final String redisResponse = "[[[{\"tag_key\": \"key_a\", \"imp_id\": \"imp_a\"}]],[[{\"tag_key\": \"key_b\", \"imp_id\": \"imp_b\"}]]]"; + final String redisResponse = """ + [ + [[{ + "tag_key": "key_a", + "imp_id": "imp_a" + }]], + [[{ + "tag_key": "key_b", + "imp_id": "imp_b" + }]] + ]"""; // when final BidsScanResult actualScanResults = redisParser.parseBidsScanResult(redisResponse); @@ -28,58 +38,59 @@ public void shouldParseBidsScanResult() { @Test public void shouldParseFullBidsScanResult() { // given - final String redisResponse = "[[[{\n" + - " \"tag_key\": \"tg\",\n" + - " \"imp_id\": \"123\",\n" + - " \"known_creative\": true,\n" + - " \"ro_skipped\": false,\n" + - " \"issues\": [{\n" + - " \"value\": \"ads.deceivenetworks.net\",\n" + - " \"spec_name\": \"malicious_domain\",\n" + - " \"first_adinstance\": \"e91e8da982bb8b7f80100426\"\n" + - " }],\n" + - " \"attributes\": {\n" + - " \"is_ssl\": true,\n" + - " \"ssl_error\": false,\n" + - " \"width\": 600,\n" + - " \"height\": 300,\n" + - " \"anim\": 5,\n" + - " \"network_load_startup\": 1024,\n" + - " \"network_load_polite\": 1024,\n" + - " \"vast\": {\n" + - " \"redirects\": 3\n" + - " },\n" + - " \"brands\": [\n" + - " \"Pfizer\"\n" + - " ],\n" + - " \"categories\": [\n" + - " {\n" + - " \"code\": \"CAT-2\",\n" + - " \"name\": \"Health and Medical Services\"\n" + - " },\n" + - " {\n" + - " \"code\": \"CAT-75\",\n" + - " \"name\": \"Pharmaceutical Drugs\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " \"metrics\": {\n" + - " \"submitted\": \"2017-05-10T13:29:28-04:00\",\n" + - " \"fetched\":\"2017-05-10T13:29:29-04:00\",\n" + - " \"scanned\":\"2017-07-22T11:49:40-04:00\",\n" + - " \"synchronized\": {\n" + - " \"first\":\"2017-05-10T13:29:55-04:00\",\n" + - " \"last\":\"2017-07-24T00:52:04-04:00\"\n" + - " }\n" + - " },\n" + - " \"adinstance\": \"qwerty\"\n" + - "}]]]"; + final String redisResponse = """ + [[[{ + "tag_key": "tg", + "imp_id": "123", + "known_creative": true, + "ro_skipped": false, + "issues": [{ + "value": "ads.deceivenetworks.net", + "spec_name": "malicious_domain", + "first_adinstance": "e91e8da982bb8b7f80100426" + }], + "attributes": { + "is_ssl": true, + "ssl_error": false, + "width": 600, + "height": 300, + "anim": 5, + "network_load_startup": 1024, + "network_load_polite": 1024, + "vast": { + "redirects": 3 + }, + "brands": [ + "Pfizer" + ], + "categories": [ + { + "code": "CAT-2", + "name": "Health and Medical Services" + }, + { + "code": "CAT-75", + "name": "Pharmaceutical Drugs" + } + ] + }, + "metrics": { + "submitted": "2017-05-10T13:29:28-04:00", + "fetched":"2017-05-10T13:29:29-04:00", + "scanned":"2017-07-22T11:49:40-04:00", + "synchronized": { + "first":"2017-05-10T13:29:55-04:00", + "last":"2017-07-24T00:52:04-04:00" + } + }, + "adinstance": "qwerty" + }]]]"""; // when final BidsScanResult actualScanResults = redisParser.parseBidsScanResult(redisResponse); // then - assertThat(actualScanResults.getBidScanResults().get(0).getTagKey()).isEqualTo("tg"); + assertThat(actualScanResults.getBidScanResults().getFirst().getTagKey()).isEqualTo("tg"); assertThat(actualScanResults.getBidScanResults().size()).isEqualTo(1); assertThat(actualScanResults.getDebugMessages().size()).isEqualTo(0); } @@ -87,14 +98,15 @@ public void shouldParseFullBidsScanResult() { @Test public void shouldParseBidsScanResultWithError() { // given - final String redisResponse = "{\"code\": \"123\", \"message\": \"error message\", \"error\": true, \"dsp_id\": \"cri\"}"; + final String redisResponse = """ + {"code": "123", "message": "error message", "error": true, "dsp_id": "cri"}"""; // when final BidsScanResult actualScanResults = redisParser.parseBidsScanResult(redisResponse); // then assertThat(actualScanResults.getBidScanResults().size()).isEqualTo(0); - assertThat(actualScanResults.getDebugMessages().get(0)).isEqualTo("Redis error - 123: error message"); + assertThat(actualScanResults.getDebugMessages().getFirst()).isEqualTo("Redis error - 123: error message"); } @Test @@ -107,6 +119,7 @@ public void shouldParseBidsScanResultWithInvalidResponse() { // then assertThat(actualScanResults.getBidScanResults().size()).isEqualTo(0); - assertThat(actualScanResults.getDebugMessages().get(0)).isEqualTo("Error during parse redis response: invalid redis response"); + assertThat(actualScanResults.getDebugMessages().getFirst()) + .isEqualTo("Error during parse redis response: invalid redis response"); } } diff --git a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/util/AdQualityModuleTestUtils.java b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/util/AdQualityModuleTestUtils.java index 865214fd648..594bbb08445 100644 --- a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/util/AdQualityModuleTestUtils.java +++ b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/util/AdQualityModuleTestUtils.java @@ -12,18 +12,24 @@ public class AdQualityModuleTestUtils { + private AdQualityModuleTestUtils() { + } + public static BidderResponse getBidderResponse(String bidderName, String impId, String bidId) { - return BidderResponse.of(bidderName, BidderSeatBid.builder() - .bids(Collections.singletonList(BidderBid.builder() - .type(BidType.banner) - .bid(Bid.builder() - .id(bidId) - .price(BigDecimal.valueOf(11)) - .impid(impId) - .adm("adm") - .adomain(List.of("www.goog.com", "www.gumgum.com")) - .build()) - .build())) - .build(), 11); + return BidderResponse.of( + bidderName, + BidderSeatBid.builder() + .bids(Collections.singletonList(BidderBid.builder() + .type(BidType.banner) + .bid(Bid.builder() + .id(bidId) + .price(BigDecimal.valueOf(11)) + .impid(impId) + .adm("adm") + .adomain(List.of("www.goog.com", "www.gumgum.com")) + .build()) + .build())) + .build(), + 11); } } diff --git a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHookTest.java b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHookTest.java index 926865781d3..47ca8d9b86f 100644 --- a/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHookTest.java +++ b/extra/modules/confiant-ad-quality/src/test/java/org/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHookTest.java @@ -24,7 +24,6 @@ import org.prebid.server.hooks.modules.com.confiant.adquality.core.BidsScanResult; import org.prebid.server.hooks.modules.com.confiant.adquality.core.BidsScanner; import org.prebid.server.hooks.modules.com.confiant.adquality.core.RedisParser; -import org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils; import org.prebid.server.hooks.v1.InvocationAction; import org.prebid.server.hooks.v1.InvocationResult; import org.prebid.server.hooks.v1.InvocationStatus; @@ -41,6 +40,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; +import static org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils.getBidderResponse; @ExtendWith(MockitoExtension.class) public class ConfiantAdQualityBidResponsesScanHookTest { @@ -105,12 +105,19 @@ public void callShouldReturnResultWithNoActionWhenRedisHasNoAnswer() { @Test public void callShouldReturnResultWithUpdateActionWhenRedisHasFoundSomeIssues() { // given - final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult( - "[[[{\"tag_key\": \"tag\", \"issues\":[{\"spec_name\":\"malicious_domain\",\"value\":\"ads.deceivenetworks.net\",\"first_adinstance\":\"e91e8da982bb8b7f80100426\"}]}]]]"); + final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(""" + [[[{ + "tag_key": "tag", + "issues": [{ + "spec_name": "malicious_domain", + "value": "ads.deceivenetworks.net", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]]]"""); doReturn(Future.succeededFuture(bidsScanResult)).when(bidsScanner).submitBids(any()); doReturn(getAuctionContext()).when(auctionInvocationContext).auctionContext(); - doReturn(List.of(AdQualityModuleTestUtils.getBidderResponse("bidder_a", "imp_a", "bid_id_a"))) + doReturn(List.of(getBidderResponse("bidder_a", "imp_a", "bid_id_a"))) .when(allProcessedBidResponsesPayload).bidResponses(); // when @@ -125,7 +132,12 @@ public void callShouldReturnResultWithUpdateActionWhenRedisHasFoundSomeIssues() assertThat(result).isNotNull(); assertThat(result.status()).isEqualTo(InvocationStatus.success); assertThat(result.action()).isEqualTo(InvocationAction.update); - assertThat(result.errors().get(0)).isEqualTo("tag: [Issue(specName=malicious_domain, value=ads.deceivenetworks.net, firstAdinstance=e91e8da982bb8b7f80100426)]"); + assertThat(result.errors().getFirst()) + .isEqualTo(""" + tag: [\ + Issue(specName=malicious_domain, \ + value=ads.deceivenetworks.net, \ + firstAdinstance=e91e8da982bb8b7f80100426)]"""); assertThat(result.debugMessages()).isNull(); assertThat(result.analyticsTags().activities()).isEqualTo(singletonList(ActivityImpl.of( "ad-scan", "success", List.of( @@ -140,8 +152,15 @@ public void callShouldReturnResultWithUpdateActionWhenRedisHasFoundSomeIssues() @Test public void callShouldSubmitBidsToScanWhenBidsCome() { // given - final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult( - "[[[{\"tag_key\": \"tag\", \"issues\":[{\"spec_name\":\"malicious_domain\",\"value\":\"ads.deceivenetworks.net\",\"first_adinstance\":\"e91e8da982bb8b7f80100426\"}]}]]]"); + final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(""" + [[[{ + "tag_key": "tag", + "issues": [{ + "spec_name": "malicious_domain", + "value": "ads.deceivenetworks.net", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]]]"""); doReturn(Future.succeededFuture(bidsScanResult)).when(bidsScanner).submitBids(any()); doReturn(getAuctionContext()).when(auctionInvocationContext).auctionContext(); @@ -154,16 +173,32 @@ public void callShouldSubmitBidsToScanWhenBidsCome() { } @Test - public void callShouldSubmitToScanBidsWhichAreNotPartOfTheExcludeToScanListWhenHookIsConfiguredWithExcludeToScanList() { + public void callShouldSubmitBidsWhichAreNotPartOfTheExcludeToScanListWhenHookIsConfiguredWithExcludeToScanList() { // given final String secureBidderName = "securebidder"; final String notSecureBadBidderName = "notsecurebadbidder"; final String notSecureGoodBidderName = "notsecuregoodbidder"; - final BidderResponse secureBidderResponse = AdQualityModuleTestUtils.getBidderResponse(secureBidderName, "imp_a", "bid_id_a"); - final BidderResponse notSecureBadBidderResponse = AdQualityModuleTestUtils.getBidderResponse(notSecureBadBidderName, "imp_b", "bid_id_b"); - final BidderResponse notSecureGoodBidderResponse = AdQualityModuleTestUtils.getBidderResponse(notSecureGoodBidderName, "imp_c", "bid_id_c"); - final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult( - "[[[{\"tag_key\": \"tag\", \"issues\":[{\"spec_name\":\"malicious_domain\",\"value\":\"ads.deceivenetworks.net\",\"first_adinstance\":\"e91e8da982bb8b7f80100426\"}]}]],[[{\"tag_key\": \"key_b\", \"imp_id\": \"imp_b\", \"issues\": []}]]]]"); + final BidderResponse secureBidderResponse = getBidderResponse(secureBidderName, "imp_a", "bid_id_a"); + final BidderResponse notSecureBadBidderResponse = + getBidderResponse(notSecureBadBidderName, "imp_b", "bid_id_b"); + final BidderResponse notSecureGoodBidderResponse = + getBidderResponse(notSecureGoodBidderName, "imp_c", "bid_id_c"); + final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(""" + [ + [[{ + "tag_key": "tag", + "issues": [{ + "spec_name": "malicious_domain", + "value": "ads.deceivenetworks.net", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]], + [[{ + "tag_key": "key_b", + "imp_id": "imp_b", + "issues": [] + }]] + ]"""); final AuctionContext auctionContext = AuctionContext.builder() .activityInfrastructure(activityInfrastructure) .bidRequest(BidRequest.builder().cur(List.of("USD")).build()) @@ -171,7 +206,8 @@ public void callShouldSubmitToScanBidsWhichAreNotPartOfTheExcludeToScanListWhenH target = new ConfiantAdQualityBidResponsesScanHook(bidsScanner, List.of(secureBidderName), userFpdActivityMask); - doReturn(List.of(secureBidderResponse, notSecureBadBidderResponse, notSecureGoodBidderResponse)).when(allProcessedBidResponsesPayload).bidResponses(); + doReturn(List.of(secureBidderResponse, notSecureBadBidderResponse, notSecureGoodBidderResponse)) + .when(allProcessedBidResponsesPayload).bidResponses(); doReturn(Future.succeededFuture(bidsScanResult)).when(bidsScanner).submitBids(any()); doReturn(auctionContext).when(auctionInvocationContext).auctionContext(); @@ -180,9 +216,9 @@ public void callShouldSubmitToScanBidsWhichAreNotPartOfTheExcludeToScanListWhenH .call(allProcessedBidResponsesPayload, auctionInvocationContext); // then - verify(bidsScanner).submitBids( - BidsMapper.toRedisBidsFromBidResponses(auctionContext.getBidRequest(), List.of(notSecureBadBidderResponse, notSecureGoodBidderResponse)) - ); + verify(bidsScanner).submitBids(BidsMapper.toRedisBidsFromBidResponses( + auctionContext.getBidRequest(), + List.of(notSecureBadBidderResponse, notSecureGoodBidderResponse))); final PayloadUpdate payloadUpdate = invocationResult.result().payloadUpdate(); final AllProcessedBidResponsesPayloadImpl initPayloadToUpdate = AllProcessedBidResponsesPayloadImpl.of( @@ -217,11 +253,19 @@ public void callShouldSubmitToScanOnlyBidsWithDataWhenSomeBiddersRespondWithEmpt final String secureBidderName = "securebidder"; final String notSecureBadBidderName = "notsecurebadbidder"; final String emptyBidderName = "emptybidder"; - final BidderResponse secureBidderResponse = AdQualityModuleTestUtils.getBidderResponse(secureBidderName, "imp_a", "bid_id_a"); - final BidderResponse notSecureBadBidderResponse = AdQualityModuleTestUtils.getBidderResponse(notSecureBadBidderName, "imp_b", "bid_id_b"); - final BidderResponse emptyBidderResponse = getEmptyBidderResponse(emptyBidderName); - final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult( - "[[[{\"tag_key\": \"tag\", \"issues\":[{\"spec_name\":\"malicious_domain\",\"value\":\"ads.deceivenetworks.net\",\"first_adinstance\":\"e91e8da982bb8b7f80100426\"}]}]]]"); + final BidderResponse secureBidderResponse = getBidderResponse(secureBidderName, "imp_a", "bid_id_a"); + final BidderResponse notSecureBadBidderResponse = + getBidderResponse(notSecureBadBidderName, "imp_b", "bid_id_b"); + final BidderResponse emptyBidderResponse = getEmptyBidderResponse(); + final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(""" + [[[{ + "tag_key": "tag", + "issues": [{ + "spec_name": "malicious_domain", + "value": "ads.deceivenetworks.net", + "first_adinstance":"e91e8da982bb8b7f80100426" + }] + }]]]"""); final AuctionContext auctionContext = AuctionContext.builder() .activityInfrastructure(activityInfrastructure) .bidRequest(BidRequest.builder().cur(List.of("USD")).build()) @@ -229,7 +273,8 @@ public void callShouldSubmitToScanOnlyBidsWithDataWhenSomeBiddersRespondWithEmpt target = new ConfiantAdQualityBidResponsesScanHook(bidsScanner, List.of(secureBidderName), userFpdActivityMask); - doReturn(List.of(secureBidderResponse, notSecureBadBidderResponse, emptyBidderResponse)).when(allProcessedBidResponsesPayload).bidResponses(); + doReturn(List.of(secureBidderResponse, notSecureBadBidderResponse, emptyBidderResponse)) + .when(allProcessedBidResponsesPayload).bidResponses(); doReturn(Future.succeededFuture(bidsScanResult)).when(bidsScanner).submitBids(any()); doReturn(auctionContext).when(auctionInvocationContext).auctionContext(); @@ -238,9 +283,8 @@ public void callShouldSubmitToScanOnlyBidsWithDataWhenSomeBiddersRespondWithEmpt .call(allProcessedBidResponsesPayload, auctionInvocationContext); // then - verify(bidsScanner).submitBids( - BidsMapper.toRedisBidsFromBidResponses(auctionContext.getBidRequest(), List.of(notSecureBadBidderResponse)) - ); + verify(bidsScanner).submitBids(BidsMapper.toRedisBidsFromBidResponses( + auctionContext.getBidRequest(), List.of(notSecureBadBidderResponse))); final PayloadUpdate payloadUpdate = invocationResult.result().payloadUpdate(); final AllProcessedBidResponsesPayloadImpl initPayloadToUpdate = AllProcessedBidResponsesPayloadImpl.of( @@ -260,16 +304,22 @@ public void callShouldSubmitToScanOnlyBidsWithDataWhenSomeBiddersRespondWithEmpt .bidders(List.of(notSecureBadBidderName)) .impIds(List.of("imp_b")) .bidIds(List.of("bid_id_b")) - .build())) - ))); + .build()))))); } @Test public void callShouldSubmitBidsWithoutMaskedGeoInfoWhenTransmitGeoIsAllowed() { // given final Boolean transmitGeoIsAllowed = true; - final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult( - "[[[{\"tag_key\": \"tag\", \"issues\":[{\"spec_name\":\"malicious_domain\",\"value\":\"ads.deceivenetworks.net\",\"first_adinstance\":\"e91e8da982bb8b7f80100426\"}]}]]]"); + final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(""" + [[[{ + "tag_key": "tag", + "issues": [{ + "spec_name": "malicious_domain", + "value": "ads.deceivenetworks.net", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]]]"""); final User user = userFpdActivityMask.maskUser(getUser(), true, true); final Device device = userFpdActivityMask.maskDevice( getDevice(), true, !transmitGeoIsAllowed); @@ -296,8 +346,15 @@ public void callShouldSubmitBidsWithoutMaskedGeoInfoWhenTransmitGeoIsAllowed() { public void callShouldSubmitBidsWithMaskedGeoInfoWhenTransmitGeoIsNotAllowed() { // given final Boolean transmitGeoIsAllowed = false; - final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult( - "[[[{\"tag_key\": \"tag\", \"issues\":[{\"spec_name\":\"malicious_domain\",\"value\":\"ads.deceivenetworks.net\",\"first_adinstance\":\"e91e8da982bb8b7f80100426\"}]}]]]"); + final BidsScanResult bidsScanResult = redisParser.parseBidsScanResult(""" + [[[{ + "tag_key": "tag", + "issues": [{ + "spec_name": "malicious_domain", + "value": "ads.deceivenetworks.net", + "first_adinstance": "e91e8da982bb8b7f80100426" + }] + }]]]"""); final User user = userFpdActivityMask.maskUser(getUser(), true, true); final Device device = userFpdActivityMask.maskDevice( getDevice(), true, !transmitGeoIsAllowed); @@ -342,7 +399,7 @@ public void callShouldReturnResultWithDebugInfoWhenDebugIsEnabledAndRequestIsBro assertThat(result.status()).isEqualTo(InvocationStatus.success); assertThat(result.action()).isEqualTo(InvocationAction.no_action); assertThat(result.errors()).isNull(); - assertThat(result.debugMessages().get(0)).isEqualTo("Error during parse redis response: [[[{\"t"); + assertThat(result.debugMessages().getFirst()).isEqualTo("Error during parse redis response: [[[{\"t"); } @Test @@ -389,8 +446,8 @@ private static Device getDevice() { return Device.builder().geo(Geo.builder().country("country-d").region("region-d").build()).build(); } - private static BidderResponse getEmptyBidderResponse(String bidderName) { - return BidderResponse.of(bidderName, BidderSeatBid.builder() + private static BidderResponse getEmptyBidderResponse() { + return BidderResponse.of("emptybidder", BidderSeatBid.builder() .bids(Collections.emptyList()) .build(), 5); } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/config/FiftyOneDeviceDetectionModuleConfiguration.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/config/FiftyOneDeviceDetectionModuleConfiguration.java index 175bc5db1dc..ee93c1e3a76 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/config/FiftyOneDeviceDetectionModuleConfiguration.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/config/FiftyOneDeviceDetectionModuleConfiguration.java @@ -2,12 +2,12 @@ import fiftyone.devicedetection.DeviceDetectionPipelineBuilder; import fiftyone.pipeline.core.flowelements.Pipeline; +import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config.ModuleConfig; import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.FiftyOneDeviceDetectionModule; import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.core.DeviceEnricher; import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.core.PipelineBuilder; import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.hooks.FiftyOneDeviceDetectionEntrypointHook; import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.hooks.FiftyOneDeviceDetectionRawAuctionRequestHook; -import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config.ModuleConfig; import org.prebid.server.hooks.v1.Hook; import org.prebid.server.hooks.v1.InvocationContext; import org.prebid.server.hooks.v1.Module; @@ -21,6 +21,7 @@ @Configuration @ConditionalOnProperty(prefix = "hooks." + FiftyOneDeviceDetectionModule.CODE, name = "enabled", havingValue = "true") public class FiftyOneDeviceDetectionModuleConfiguration { + @Bean @ConfigurationProperties(prefix = "hooks.modules." + FiftyOneDeviceDetectionModule.CODE) ModuleConfig moduleConfig() { diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/boundary/CollectedEvidence.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/boundary/CollectedEvidence.java index d6ed6ab4f53..ac427e9d9e7 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/boundary/CollectedEvidence.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/boundary/CollectedEvidence.java @@ -9,6 +9,5 @@ public record CollectedEvidence( Collection> rawHeaders, String deviceUA, - Map secureHeaders -) { + Map secureHeaders) { } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilter.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilter.java index 20b22cc4e3d..c7cda11450a 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilter.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilter.java @@ -6,5 +6,6 @@ @Data public final class AccountFilter { + List allowList; } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFile.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFile.java index 6cc0dc64b7e..46cf19adf56 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFile.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFile.java @@ -4,7 +4,10 @@ @Data public final class DataFile { + String path; + Boolean makeTempCopy; + DataFileUpdate update; } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdate.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdate.java index 2ae0655c59c..8c65b7d4508 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdate.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdate.java @@ -4,10 +4,16 @@ @Data public final class DataFileUpdate { + Boolean auto; + Boolean onStartup; + String url; + String licenseKey; + Boolean watchFileSystem; + Integer pollingInterval; } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfig.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfig.java index 9783317ce5c..80f95f353e5 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfig.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfig.java @@ -4,7 +4,10 @@ @Data public final class ModuleConfig { + AccountFilter accountFilter; + DataFile dataFile; + PerformanceConfig performance; } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfig.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfig.java index 088e25eae34..7a81b11be5a 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfig.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfig.java @@ -4,9 +4,14 @@ @Data public final class PerformanceConfig { + String profile; + Integer concurrency; + Integer difference; + Boolean allowUnmatched; + Integer drift; } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricher.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricher.java index 8b34666efbf..72b1e04cee2 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricher.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricher.java @@ -27,6 +27,7 @@ import java.util.stream.Stream; public class DeviceEnricher { + private static final String EXT_DEVICE_ID_KEY = "fiftyonedegrees_deviceId"; private final Pipeline pipeline; @@ -297,7 +298,7 @@ private static String getDeviceId(Device device) { return null; } final JsonNode savedValue = ext.getProperty(EXT_DEVICE_ID_KEY); - return (savedValue != null && savedValue.isTextual()) ? savedValue.textValue() : null; + return savedValue != null && savedValue.isTextual() ? savedValue.textValue() : null; } private static void setDeviceId(Device.DeviceBuilder deviceBuilder, Device device, String deviceId) { @@ -324,4 +325,3 @@ private T getSafe(DeviceData deviceData, Function enrichedFields -) { + Collection enrichedFields) { } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/OrtbDeviceType.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/OrtbDeviceType.java index 078279fb2a3..a31d387c991 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/OrtbDeviceType.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/OrtbDeviceType.java @@ -5,6 +5,7 @@ // https://github.com/InteractiveAdvertisingBureau/AdCOM/blob/main/AdCOM%20v1.0%20FINAL.md#list--device-types- public enum OrtbDeviceType { + UNKNOWN, MOBILE_TABLET, PERSONAL_COMPUTER, diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/PipelineBuilder.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/PipelineBuilder.java index 2b10e932f5f..99bb8de408c 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/PipelineBuilder.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/PipelineBuilder.java @@ -18,6 +18,7 @@ import java.util.stream.Collectors; public class PipelineBuilder { + private static final Collection PROPERTIES_USED = List.of( "devicetype", "hardwarevendor", @@ -199,5 +200,4 @@ private static void resolveDrift( pipelineBuilder.setDrift(drift); } } - } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/SecureHeadersRetriever.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/SecureHeadersRetriever.java index 142e789adc3..cc47233e68a 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/SecureHeadersRetriever.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/SecureHeadersRetriever.java @@ -5,12 +5,13 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import jakarta.annotation.Nonnull; import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.annotation.Nonnull; public class SecureHeadersRetriever { + private SecureHeadersRetriever() { } diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHook.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHook.java index 6a652ccf109..44788286dd3 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHook.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHook.java @@ -1,17 +1,18 @@ package org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.hooks; +import io.vertx.core.Future; +import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.boundary.CollectedEvidence; import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.model.ModuleContext; import org.prebid.server.hooks.v1.InvocationAction; import org.prebid.server.hooks.v1.InvocationContext; import org.prebid.server.hooks.v1.InvocationResult; -import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.v1.InvocationStatus; import org.prebid.server.hooks.v1.entrypoint.EntrypointHook; import org.prebid.server.hooks.v1.entrypoint.EntrypointPayload; -import io.vertx.core.Future; public class FiftyOneDeviceDetectionEntrypointHook implements EntrypointHook { + private static final String CODE = "fiftyone-devicedetection-entrypoint-hook"; @Override diff --git a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionRawAuctionRequestHook.java b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionRawAuctionRequestHook.java index 5c4b268cf68..a0d91e8bb0a 100644 --- a/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionRawAuctionRequestHook.java +++ b/extra/modules/fiftyone-devicedetection/src/main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionRawAuctionRequestHook.java @@ -3,9 +3,11 @@ import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; import com.iab.openrtb.request.UserAgent; +import io.vertx.core.Future; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.prebid.server.auction.model.AuctionContext; +import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.execution.v1.auction.AuctionRequestPayloadImpl; import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.boundary.CollectedEvidence; import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config.AccountFilter; @@ -15,12 +17,10 @@ import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.model.ModuleContext; import org.prebid.server.hooks.v1.InvocationAction; import org.prebid.server.hooks.v1.InvocationResult; -import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.v1.InvocationStatus; import org.prebid.server.hooks.v1.auction.AuctionInvocationContext; import org.prebid.server.hooks.v1.auction.AuctionRequestPayload; import org.prebid.server.hooks.v1.auction.RawAuctionRequestHook; -import io.vertx.core.Future; import org.prebid.server.settings.model.Account; import org.prebid.server.util.ObjectUtil; @@ -28,6 +28,7 @@ import java.util.Optional; public class FiftyOneDeviceDetectionRawAuctionRequestHook implements RawAuctionRequestHook { + private static final String CODE = "fiftyone-devicedetection-raw-auction-request-hook"; private final AccountFilter accountFilter; diff --git a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilterTest.java b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilterTest.java index 1b5bee8465c..424d08db123 100644 --- a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilterTest.java +++ b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilterTest.java @@ -7,10 +7,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class AccountFilterTest { - private static final List TEST_ALLOW_LIST = List.of( - "sister", - "cousin" - ); + + private static final List TEST_ALLOW_LIST = List.of("sister", "cousin"); @Test public void shouldReturnAllowList() { diff --git a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileTest.java b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileTest.java index 87995a4df34..d56531ef68a 100644 --- a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileTest.java +++ b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileTest.java @@ -5,6 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DataFileTest { + @Test public void shouldReturnPath() { // given diff --git a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdateTest.java b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdateTest.java index 211ce5be364..fa3790e3261 100644 --- a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdateTest.java +++ b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdateTest.java @@ -5,6 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DataFileUpdateTest { + @Test public void shouldReturnAuto() { // given diff --git a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfigTest.java b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfigTest.java index bba6dcaab05..3157c9167d2 100644 --- a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfigTest.java +++ b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfigTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ModuleConfigTest { + @Test public void shouldReturnAccountFilter() { // given diff --git a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfigTest.java b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfigTest.java index 818e702e632..829f5298fa1 100644 --- a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfigTest.java +++ b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfigTest.java @@ -5,6 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class PerformanceConfigTest { + @Test public void shouldReturnProfile() { // given diff --git a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/FiftyOneDeviceDetectionModuleTest.java b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/FiftyOneDeviceDetectionModuleTest.java index 95bcc9de01d..e3ca77b5e24 100644 --- a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/FiftyOneDeviceDetectionModuleTest.java +++ b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/FiftyOneDeviceDetectionModuleTest.java @@ -11,6 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class FiftyOneDeviceDetectionModuleTest { + @Test public void shouldReturnNonBlankCode() { // given diff --git a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricherTest.java b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricherTest.java index 3caca5fcc4a..0aa2610f62c 100644 --- a/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricherTest.java +++ b/extra/modules/fiftyone-devicedetection/src/test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricherTest.java @@ -206,7 +206,7 @@ public void populateDeviceInfoShouldPassToFlowDataRawHeaderWhenNoDeviceInfoPrese final List> evidenceFragments = evidence.entrySet().stream().toList(); assertThat(evidenceFragments.size()).isEqualTo(rawHeaders.size()); - for (int i = 0, n = rawHeaders.size(); i < n; ++i) { + for (int i = 0, n = rawHeaders.size(); i < n; i++) { final Map.Entry rawEntry = rawHeaders.get(i); final Map.Entry newEntry = evidenceFragments.get(i); assertThat(newEntry.getKey()).isEqualTo("header." + rawEntry.getKey()); diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java index 322cdf48ff4..19155c86e8f 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java @@ -1,16 +1,16 @@ package org.prebid.server.hooks.modules.greenbids.real.time.data.config; -import io.netty.handler.codec.http.HttpResponseStatus; -import io.vertx.core.file.FileSystem; -import io.vertx.core.http.HttpClientOptions; -import io.vertx.core.http.HttpClientRequest; -import io.vertx.core.http.HttpClientResponse; import com.maxmind.db.Reader; +import com.maxmind.geoip2.DatabaseReader; +import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.core.Future; import io.vertx.core.Promise; import io.vertx.core.Vertx; -import com.maxmind.geoip2.DatabaseReader; +import io.vertx.core.file.FileSystem; import io.vertx.core.file.OpenOptions; +import io.vertx.core.http.HttpClientOptions; +import io.vertx.core.http.HttpClientRequest; +import io.vertx.core.http.HttpClientResponse; import io.vertx.core.http.HttpMethod; import io.vertx.core.http.RequestOptions; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; @@ -98,7 +98,7 @@ private DatabaseReader extractMMDB(String tarGzPath) { TarArchiveEntry currentEntry; boolean hasDatabaseFile = false; - while ((currentEntry = tarInput.getNextTarEntry()) != null) { + while ((currentEntry = tarInput.getNextEntry()) != null) { if (currentEntry.getName().contains("GeoLite2-Country.mmdb")) { hasDatabaseFile = true; break; @@ -119,7 +119,7 @@ private DatabaseReader extractMMDB(String tarGzPath) { private void removeFile(String filePath) { fileSystem.exists(filePath).onSuccess(exists -> { if (exists) { - fileSystem.delete(filePath) + fileSystem.delete(filePath) .onFailure(err -> logger.error("Failed to remove file {}", filePath, err)); } }); diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java index a6b47f7d6ad..c76d442218a 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java @@ -6,16 +6,16 @@ import com.google.cloud.storage.StorageOptions; import io.vertx.core.Vertx; import org.prebid.server.geolocation.CountryCodeMapper; -import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds; -import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory; -import org.prebid.server.hooks.modules.greenbids.real.time.data.core.GreenbidsInferenceDataService; import org.prebid.server.hooks.modules.greenbids.real.time.data.core.FilterService; +import org.prebid.server.hooks.modules.greenbids.real.time.data.core.GreenbidsInferenceDataService; +import org.prebid.server.hooks.modules.greenbids.real.time.data.core.GreenbidsInvocationService; import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ModelCache; import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner; import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerFactory; import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerWithThresholds; import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThresholdCache; -import org.prebid.server.hooks.modules.greenbids.real.time.data.core.GreenbidsInvocationService; +import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory; +import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds; import org.prebid.server.hooks.modules.greenbids.real.time.data.v1.GreenbidsRealTimeDataProcessedAuctionRequestHook; import org.prebid.server.json.ObjectMapperProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java index 4a2b5962871..77f45d0e6b2 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java @@ -109,7 +109,7 @@ private Ortb2ImpExtResult createOrtb2ImpExt( String greenbidsId, Boolean isExploration) { - final String tid = Optional.ofNullable(imp) + final String tid = Optional.of(imp) .map(Imp::getExt) .map(impExt -> impExt.get("tid")) .map(JsonNode::asText) diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsConfig.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsConfig.java index c857dd37e63..a57fb0e455c 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsConfig.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsConfig.java @@ -6,7 +6,6 @@ import java.util.Comparator; import java.util.List; -import java.util.Optional; import java.util.stream.IntStream; @Value(staticConstructor = "of") diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java index 2f2bb8dd119..f9713d4f56d 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; import io.vertx.core.Future; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.prebid.server.analytics.reporter.greenbids.model.ExplorationResult; import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult; @@ -37,8 +36,6 @@ import org.prebid.server.hooks.v1.auction.ProcessedAuctionRequestHook; import org.prebid.server.proto.openrtb.ext.request.ExtRequest; import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid; -import org.prebid.server.settings.model.Account; -import org.prebid.server.settings.model.AccountHooksConfiguration; import java.util.Collection; import java.util.Collections; @@ -210,7 +207,7 @@ private Result toResult(String status, Map.Entry entr toObjectNode(entry), AppliedToImpl.builder() .impIds(Collections.singletonList(impId)) - .bidders(removedBidders.isEmpty() ? null: removedBidders) + .bidders(removedBidders.isEmpty() ? null : removedBidders) .build()); } diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/ModelCacheTest.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/ModelCacheTest.java index 0c326f4249e..2ceeaa14e43 100644 --- a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/ModelCacheTest.java +++ b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/ModelCacheTest.java @@ -2,15 +2,15 @@ import ai.onnxruntime.OrtException; import com.github.benmanes.caffeine.cache.Cache; +import com.google.cloud.storage.Blob; import com.google.cloud.storage.Bucket; import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageException; import io.vertx.core.Future; import io.vertx.core.Vertx; -import com.google.cloud.storage.Blob; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.prebid.server.exception.PreBidException; diff --git a/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReader.java b/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReader.java index 47b3e3204c7..1296b3e50c7 100644 --- a/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReader.java +++ b/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReader.java @@ -103,14 +103,14 @@ public Result blockedAttributesFor(BidRequest bidRequest) { final Result cattaxComplement = blockedCattaxComplement(bidRequest); final Result> bapp = blockedAttribute(BAPP_FIELD, String.class, BLOCKED_APP_FIELD, requestMediaTypes); - final Result>> btype = - blockedAttributesForImps(BTYPE_FIELD, Integer.class, BLOCKED_BANNER_TYPE_FIELD, BANNER_MEDIA_TYPE, bidRequest); - final Result>> bannerBattr = - blockedAttributesForImps(BATTR_FIELD, Integer.class, BLOCKED_BANNER_ATTR_FIELD, BANNER_MEDIA_TYPE, bidRequest); - final Result>> videoBattr = - blockedAttributesForImps(BATTR_FIELD, Integer.class, BLOCKED_VIDEO_ATTR_FIELD, VIDEO_MEDIA_TYPE, bidRequest); - final Result>> audioBattr = - blockedAttributesForImps(BATTR_FIELD, Integer.class, BLOCKED_AUDIO_ATTR_FIELD, AUDIO_MEDIA_TYPE, bidRequest); + final Result>> btype = blockedAttributesForImps( + BTYPE_FIELD, Integer.class, BLOCKED_BANNER_TYPE_FIELD, BANNER_MEDIA_TYPE, bidRequest); + final Result>> bannerBattr = blockedAttributesForImps( + BATTR_FIELD, Integer.class, BLOCKED_BANNER_ATTR_FIELD, BANNER_MEDIA_TYPE, bidRequest); + final Result>> videoBattr = blockedAttributesForImps( + BATTR_FIELD, Integer.class, BLOCKED_VIDEO_ATTR_FIELD, VIDEO_MEDIA_TYPE, bidRequest); + final Result>> audioBattr = blockedAttributesForImps( + BATTR_FIELD, Integer.class, BLOCKED_AUDIO_ATTR_FIELD, AUDIO_MEDIA_TYPE, bidRequest); final Result>>> battr = mergeBlockedAttributes(bannerBattr, videoBattr, audioBattr); diff --git a/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlocker.java b/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlocker.java index 5435544e2cb..628768f1df9 100644 --- a/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlocker.java +++ b/extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlocker.java @@ -335,7 +335,7 @@ private Map toAnalyticsResultValues(BlockingResult blockingResul } final AttributeCheckResult bappResult = blockingResult.getBappCheckResult(); if (bappResult.isFailed()) { - values.put(BUNDLE_FIELD, bappResult.getFailedValues().get(0)); + values.put(BUNDLE_FIELD, bappResult.getFailedValues().getFirst()); } final AttributeCheckResult battrResult = blockingResult.getBattrCheckResult(); if (battrResult.isFailed()) { diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReaderTest.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReaderTest.java index e20bf2c3dac..48986d10d73 100644 --- a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReaderTest.java +++ b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/AccountConfigReaderTest.java @@ -48,7 +48,7 @@ public class AccountConfigReaderTest { - private static final ObjectMapper mapper = new ObjectMapper() + private static final ObjectMapper MAPPER = new ObjectMapper() .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE) .setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -98,7 +98,7 @@ public void blockedAttributesForShouldReturnEmptyResultWhenNoBlockedAdomains() { @Test public void blockedAttributesForShouldReturnErrorWhenAttributesIsNotObject() { // given - final ObjectNode accountConfig = mapper.createObjectNode().put("attributes", 1); + final ObjectNode accountConfig = MAPPER.createObjectNode().put("attributes", 1); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); // when and then @@ -110,8 +110,8 @@ public void blockedAttributesForShouldReturnErrorWhenAttributesIsNotObject() { @Test public void blockedAttributesForShouldReturnErrorWhenBadvIsNotObject() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() .put("badv", 1)); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -124,9 +124,9 @@ public void blockedAttributesForShouldReturnErrorWhenBadvIsNotObject() { @Test public void blockedAttributesForShouldReturnErrorWhenBlockedAdomainsIsNotArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() .put("blocked-adomain", 1))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -139,10 +139,10 @@ public void blockedAttributesForShouldReturnErrorWhenBlockedAdomainsIsNotArray() @Test public void blockedAttributesForShouldReturnErrorWhenBlockedAdomainsIsNotStringArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() .add(1) .add("domain2.com")))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -157,9 +157,9 @@ public void blockedAttributesForShouldReturnErrorWhenBlockedAdomainsIsNotStringA @Test public void blockedAttributesForShouldReturnErrorWhenBadvActionOverridesIsNotObject() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() .put("action-overrides", 1))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -172,13 +172,13 @@ public void blockedAttributesForShouldReturnErrorWhenBadvActionOverridesIsNotObj @Test public void blockedAttributesForShouldReturnErrorWhenBadvActionOverridesBlockedAdomainIsNotObjectArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() .add(1) - .add(mapper.createObjectNode()))))); + .add(MAPPER.createObjectNode()))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); // when and then @@ -190,12 +190,12 @@ public void blockedAttributesForShouldReturnErrorWhenBadvActionOverridesBlockedA @Test public void blockedAttributesForShouldReturnErrorWhenOverridesHasNoConditions() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode()))))); + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode()))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); // when and then @@ -207,12 +207,12 @@ public void blockedAttributesForShouldReturnErrorWhenOverridesHasNoConditions() @Test public void blockedAttributesForShouldReturnErrorWhenConditionsIsNotObject() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() .put("conditions", 1)))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -225,32 +225,32 @@ public void blockedAttributesForShouldReturnErrorWhenConditionsIsNotObject() { @Test public void blockedAttributesForShouldReturnErrorWhenBadvActionOverridesBlockedAdomainConditionsIsEmpty() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode())))))); + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode())))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); // when and then assertThatThrownBy(() -> reader.blockedAttributesFor(emptyRequest())) .isInstanceOf(InvalidAccountConfigurationException.class) - .hasMessage("conditions field in account configuration must contain at least one of bidders or " + - "media-type"); + .hasMessage( + "conditions field in account configuration must contain at least one of bidders or media-type"); } @Test public void blockedAttributesForShouldReturnErrorWhenConditionBiddersIsNotArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode() .put("bidders", 1))))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -263,14 +263,14 @@ public void blockedAttributesForShouldReturnErrorWhenConditionBiddersIsNotArray( @Test public void blockedAttributesForShouldReturnErrorWhenConditionBiddersIsNotStringArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode() - .set("bidders", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode() + .set("bidders", MAPPER.createArrayNode() .add(1) .add("abc")))))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -285,13 +285,13 @@ public void blockedAttributesForShouldReturnErrorWhenConditionBiddersIsNotString @Test public void blockedAttributesForShouldReturnErrorWhenConditionMediaTypeIsNotArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode() .put("media-type", 1))))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -304,14 +304,14 @@ public void blockedAttributesForShouldReturnErrorWhenConditionMediaTypeIsNotArra @Test public void blockedAttributesForShouldReturnErrorWhenConditionMediaTypeIsNotStringArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode() - .set("media-type", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode() + .set("media-type", MAPPER.createArrayNode() .add(1) .add("abc")))))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -326,14 +326,14 @@ public void blockedAttributesForShouldReturnErrorWhenConditionMediaTypeIsNotStri @Test public void blockedAttributesForShouldReturnErrorWhenActionOverridesHasNoOverride() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode() - .set("bidders", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode() + .set("bidders", MAPPER.createArrayNode() .add("bidder1")))))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -346,14 +346,14 @@ public void blockedAttributesForShouldReturnErrorWhenActionOverridesHasNoOverrid @Test public void blockedAttributesForShouldReturnErrorWhenBadvBlockedAdomainOverrideIsNotArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode() - .set("bidders", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode() + .set("bidders", MAPPER.createArrayNode() .add("bidder1"))) .put("override", 1)))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -367,16 +367,16 @@ public void blockedAttributesForShouldReturnErrorWhenBadvBlockedAdomainOverrideI @Test public void blockedAttributesForShouldReturnErrorWhenBlockedAdomainOverrideIsNotStringArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("blocked-adomain", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode() - .set("bidders", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("blocked-adomain", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode() + .set("bidders", MAPPER.createArrayNode() .add("bidder1"))) - .set("override", mapper.createArrayNode() + .set("override", MAPPER.createArrayNode() .add(1) .add("abc"))))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -391,10 +391,10 @@ public void blockedAttributesForShouldReturnErrorWhenBlockedAdomainOverrideIsNot @Test public void blockedAttributesForShouldReturnErrorWhenBlockedBannerTypeIsNotIntegerArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("btype", mapper.createObjectNode() - .set("blocked-banner-type", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("btype", MAPPER.createObjectNode() + .set("blocked-banner-type", MAPPER.createArrayNode() .add(1) .add("type2")))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -602,8 +602,8 @@ public void blockedAttributesForShouldReturnResultWithBadvAndWarningFromOverride .banner(Banner.builder().build())))) .isEqualTo(Result.of( attributesWithBadv(singletonList("domain3.com")), - singletonList("More than one conditions matches request. Bidder: bidder1, " + - "request media types: [banner, video]"))); + singletonList("More than one conditions matches request. Bidder: bidder1, " + + "request media types: [banner, video]"))); } @Test @@ -632,7 +632,7 @@ public void blockedAttributesForShouldReturnResultWithoutWarningWhenMultipleSpec } @Test - public void blockedAttributesForShouldReturnResultWithBadvAndWarningFromOverridesWhenMultipleSpecificAndCatchAllMatches() { + public void blockedAttributesForShouldReturnResultWithBadvAndWarningFromOverridesOnMultipleMatches() { // given final ObjectNode accountConfig = toObjectNode(ModuleConfig.of(Attributes.builder() .badv(Attribute.badvBuilder() @@ -661,8 +661,8 @@ public void blockedAttributesForShouldReturnResultWithBadvAndWarningFromOverride .banner(Banner.builder().build())))) .isEqualTo(Result.of( attributesWithBadv(singletonList("domain3.com")), - singletonList("More than one conditions matches request. Bidder: bidder1, " + - "request media types: [banner, video]"))); + singletonList("More than one conditions matches request. Bidder: bidder1, " + + "request media types: [banner, video]"))); } @Test @@ -689,8 +689,8 @@ public void blockedAttributesForShouldReturnResultWithBadvAndWarningFromOverride .banner(Banner.builder().build())))) .isEqualTo(Result.of( attributesWithBadv(singletonList("domain5.com")), - singletonList("More than one conditions matches request. Bidder: bidder1, " + - "request media types: [banner, video]"))); + singletonList("More than one conditions matches request. Bidder: bidder1, " + + "request media types: [banner, video]"))); } @Test @@ -732,8 +732,8 @@ public void blockedAttributesForShouldReturnResultWithBtypeAndWarningsFromOverri .build())) .isEqualTo(Result.of( BlockedAttributes.builder().btype(expectedBtype).build(), - List.of("More than one conditions matches request. Bidder: bidder1, " + - "request media types: [banner]"))); + List.of("More than one conditions matches request. Bidder: bidder1, " + + "request media types: [banner]"))); } @Test @@ -899,7 +899,7 @@ public void blockedAttributesForShouldReturnResultWithAllAttributesForAudio() { @Test public void blockedAttributesForShouldNotReturnCattaxIfBidderSupportsLowerThan26() throws JsonProcessingException { // given - final ObjectNode accountConfig = (ObjectNode) mapper.readTree(""" + final ObjectNode accountConfig = (ObjectNode) MAPPER.readTree(""" { "attributes": { "bcat": { @@ -919,7 +919,7 @@ public void blockedAttributesForShouldNotReturnCattaxIfBidderSupportsLowerThan26 @Test public void blockedAttributesForShouldReturnCattaxFromRequestIfPresent() throws JsonProcessingException { // given - final ObjectNode accountConfig = (ObjectNode) mapper.readTree(""" + final ObjectNode accountConfig = (ObjectNode) MAPPER.readTree(""" { "attributes": { "bcat": { @@ -941,7 +941,7 @@ public void blockedAttributesForShouldReturnCattaxFromRequestIfPresent() throws @Test public void blockedAttributesForShouldReturnCattaxFromConfigIfNotPresentInRequest() throws JsonProcessingException { // given - final ObjectNode accountConfig = (ObjectNode) mapper.readTree(""" + final ObjectNode accountConfig = (ObjectNode) MAPPER.readTree(""" { "attributes": { "bcat": { @@ -963,9 +963,9 @@ public void blockedAttributesForShouldReturnCattaxFromConfigIfNotPresentInReques @Test public void responseBlockingConfigForShouldReturnErrorWhenDefaultEnforceBlocksIsNotBoolean() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() .put("enforce-blocks", 1))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -979,9 +979,9 @@ public void responseBlockingConfigForShouldReturnErrorWhenDefaultEnforceBlocksIs @Test public void responseBlockingConfigForShouldReturnErrorWhenDefaultAllowedAdomainIsNotArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() .put("allowed-adomain-for-deals", 1))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -994,10 +994,10 @@ public void responseBlockingConfigForShouldReturnErrorWhenDefaultAllowedAdomainI @Test public void responseBlockingConfigForShouldReturnErrorWhenDefaultAllowedAdomainIsNotStringArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("allowed-adomain-for-deals", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("allowed-adomain-for-deals", MAPPER.createArrayNode() .add(1) .add("domain1.com")))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -1012,10 +1012,10 @@ public void responseBlockingConfigForShouldReturnErrorWhenDefaultAllowedAdomainI @Test public void responseBlockingConfigForShouldReturnErrorWhenDefaultAllowedBlockedAttrIsNotIntegerArray() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("battr", mapper.createObjectNode() - .set("allowed-banner-attr-for-deals", mapper.createArrayNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("battr", MAPPER.createObjectNode() + .set("allowed-banner-attr-for-deals", MAPPER.createArrayNode() .add(1) .add("domain1.com")))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); @@ -1030,13 +1030,13 @@ public void responseBlockingConfigForShouldReturnErrorWhenDefaultAllowedBlockedA @Test public void responseBlockingConfigForShouldReturnErrorWhenDealConditionsIsEmpty() { // given - final ObjectNode accountConfig = mapper.createObjectNode() - .set("attributes", mapper.createObjectNode() - .set("badv", mapper.createObjectNode() - .set("action-overrides", mapper.createObjectNode() - .set("allowed-adomain-for-deals", mapper.createArrayNode() - .add(mapper.createObjectNode() - .set("conditions", mapper.createObjectNode())))))); + final ObjectNode accountConfig = MAPPER.createObjectNode() + .set("attributes", MAPPER.createObjectNode() + .set("badv", MAPPER.createObjectNode() + .set("action-overrides", MAPPER.createObjectNode() + .set("allowed-adomain-for-deals", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode() + .set("conditions", MAPPER.createObjectNode())))))); final AccountConfigReader reader = AccountConfigReader.create(accountConfig, "bidder1", ORTB_VERSION, true); // when and then @@ -1554,6 +1554,6 @@ private static BlockedAttributes attributesWithBadv(List badv) { } private static ObjectNode toObjectNode(ModuleConfig config) { - return mapper.valueToTree(config); + return MAPPER.valueToTree(config); } } diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlockerTest.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlockerTest.java index b595b9c5fdb..ea2cd38c879 100644 --- a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlockerTest.java +++ b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlockerTest.java @@ -35,7 +35,6 @@ import static java.util.Collections.singletonMap; import static java.util.function.UnaryOperator.identity; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -43,7 +42,7 @@ @ExtendWith(MockitoExtension.class) public class BidsBlockerTest { - private static final ObjectMapper mapper = new ObjectMapper() + private static final ObjectMapper MAPPER = new ObjectMapper() .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE) .setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -56,7 +55,7 @@ public class BidsBlockerTest { public void shouldReturnEmptyResultWhenNoBlockingResponseConfig() { // given final List bids = singletonList(bid()); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, null, null, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, null, null, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -66,11 +65,11 @@ public void shouldReturnEmptyResultWhenNoBlockingResponseConfig() { @Test public void shouldReturnEmptyResultWithErrorWhenInvalidAccountConfig() { // given - final ObjectNode accountConfig = mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() .put("attributes", 1); final List bids = singletonList(bid()); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, null, true); // when and then assertThat(blocker.block()).isEqualTo(ExecutionResult.builder() @@ -82,11 +81,11 @@ public void shouldReturnEmptyResultWithErrorWhenInvalidAccountConfig() { @Test public void shouldReturnEmptyResultWithoutErrorWhenInvalidAccountConfigAndDebugDisabled() { // given - final ObjectNode accountConfig = mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() .put("attributes", 1); final List bids = singletonList(bid()); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, false); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, null, false); // when and then assertThat(blocker.block()).isEqualTo(ExecutionResult.empty()); @@ -105,7 +104,7 @@ public void shouldReturnEmptyResultWhenBidWithoutAdomainAndBlockUnknownFalse() { // when final List bids = singletonList(bid()); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, null, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -124,7 +123,7 @@ public void shouldReturnEmptyResultWhenBidWithoutAdomainAndEnforceBlocksFalseAnd // when final List bids = singletonList(bid()); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, null, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -143,7 +142,7 @@ public void shouldReturnResultWithBidWhenBidWithoutAdomainAndBlockUnknownTrue() // when final List bids = singletonList(bid()); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, false); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, null, false); // when and then assertThat(blocker.block()).satisfies(result -> hasValue(result, 0)); @@ -161,7 +160,7 @@ public void shouldReturnEmptyResultWhenBidWithBlockedAdomainAndEnforceBlocksFals // when final List bids = singletonList(bid(bid -> bid.adomain(singletonList("domain1.com")))); final BlockedAttributes blockedAttributes = attributesWithBadv(singletonList("domain1.com")); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -180,7 +179,7 @@ public void shouldReturnEmptyResultWhenBidWithNotBlockedAdomain() { // when final List bids = singletonList(bid(bid -> bid.adomain(singletonList("domain1.com")))); final BlockedAttributes blockedAttributes = attributesWithBadv(singletonList("domain2.com")); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -199,7 +198,8 @@ public void shouldReturnResultWithBidWhenBidWithBlockedAdomainAndEnforceBlocksTr // when final BidderBid bid = bid(bidBuilder -> bidBuilder.adomain(singletonList("domain1.com"))); final BlockedAttributes blockedAttributes = attributesWithBadv(singletonList("domain1.com")); - final BidsBlocker blocker = BidsBlocker.create(singletonList(bid), "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, false); + final BidsBlocker blocker = bidsBlocker( + singletonList(bid), ORTB_VERSION, accountConfig, blockedAttributes, false); // when and then assertThat(blocker.block()).satisfies(result -> hasValue(result, 0)); @@ -217,7 +217,7 @@ public void shouldReturnEmptyResultWhenBidWithAdomainAndNoBlockedAttributes() { // when final List bids = singletonList(bid(bid -> bid.adomain(singletonList("domain1.com")))); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, null, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -240,7 +240,7 @@ public void shouldReturnEmptyResultWhenBidWithAttrAndNoBlockedBannerAttrForImp() final BlockedAttributes blockedAttributes = BlockedAttributes.builder() .battr(singletonMap(MediaType.BANNER, singletonMap("impId1", asList(1, 2)))) .build(); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -263,7 +263,7 @@ public void shouldReturnEmptyResultWhenBidWithAttrAndNoBlockedVideoAttrForImp() final BlockedAttributes blockedAttributes = BlockedAttributes.builder() .battr(singletonMap(MediaType.VIDEO, singletonMap("impId1", asList(1, 2)))) .build(); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -286,7 +286,7 @@ public void shouldReturnEmptyResultWhenBidWithAttrAndNoBlockedAudioAttrForImp() final BlockedAttributes blockedAttributes = BlockedAttributes.builder() .battr(singletonMap(MediaType.AUDIO, singletonMap("impId1", asList(1, 2)))) .build(); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -306,7 +306,8 @@ public void shouldReturnEmptyResultWhenBidWithBlockedAdomainAndInDealsExceptions // when final BidderBid bid = bid(bidBuilder -> bidBuilder.adomain(singletonList("domain1.com"))); final BlockedAttributes blockedAttributes = attributesWithBadv(singletonList("domain1.com")); - final BidsBlocker blocker = BidsBlocker.create(singletonList(bid), "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker( + singletonList(bid), ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(BidsBlockerTest::isEmpty); @@ -326,7 +327,8 @@ public void shouldReturnResultWithBidWhenBidWithBlockedAdomainAndNotInDealsExcep // when final BidderBid bid = bid(bidBuilder -> bidBuilder.adomain(singletonList("domain1.com"))); final BlockedAttributes blockedAttributes = attributesWithBadv(singletonList("domain1.com")); - final BidsBlocker blocker = BidsBlocker.create(singletonList(bid), "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, false); + final BidsBlocker blocker = bidsBlocker( + singletonList(bid), ORTB_VERSION, accountConfig, blockedAttributes, false); // when and then assertThat(blocker.block()).satisfies(result -> hasValue(result, 0)); @@ -345,7 +347,7 @@ public void shouldReturnResultWithBidAndDebugMessageWhenBidIsBlocked() { // when final BidderBid bid = bid(); - final BidsBlocker blocker = BidsBlocker.create(singletonList(bid), "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(singletonList(bid), ORTB_VERSION, accountConfig, null, true); // when and then assertThat(blocker.block()).satisfies(result -> { @@ -368,7 +370,7 @@ public void shouldReturnResultWithBidWithoutDebugMessageWhenBidIsBlockedAndDebug // when final BidderBid bid = bid(); - final BidsBlocker blocker = BidsBlocker.create(singletonList(bid), "bidder1", ORTB_VERSION, accountConfig, null, bidRejectionTracker, false); + final BidsBlocker blocker = bidsBlocker(singletonList(bid), ORTB_VERSION, accountConfig, null, false); // when and then assertThat(blocker.block()).satisfies(result -> hasValue(result, 0)); @@ -416,7 +418,7 @@ public void shouldReturnResultWithAnalyticsResults() { .bapp(asList("app1", "app2", "app3")) .battr(singletonMap(MediaType.BANNER, singletonMap("impId2", asList(1, 2, 3)))) .build(); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(result -> { @@ -498,7 +500,7 @@ public void shouldReturnResultWithoutSomeBidsWhenAllAttributesInConfig() { .bapp(asList("app1", "app2")) .battr(singletonMap(MediaType.BANNER, singletonMap("impId1", asList(1, 2)))) .build(); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(result -> { @@ -539,7 +541,7 @@ public void shouldReturnEmptyResultForCattaxIfBidderSupportsLowerThan26() { bid(bid -> bid.cattax(3)), bid()); final BlockedAttributes blockedAttributes = BlockedAttributes.builder().build(); - final BidsBlocker blocker = BidsBlocker.create(bids, "bidder1", ORTB_VERSION, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker(bids, ORTB_VERSION, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()) @@ -562,8 +564,8 @@ public void shouldPassBidIfCattaxIsNull() { // when final List bids = singletonList(bid()); final BlockedAttributes blockedAttributes = BlockedAttributes.builder().build(); - final BidsBlocker blocker = BidsBlocker.create( - bids, "bidder1", OrtbVersion.ORTB_2_6, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker( + bids, OrtbVersion.ORTB_2_6, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()) @@ -588,8 +590,8 @@ public void shouldBlockBidIfCattaxNotEqualsAllowedCattax() { bid(bid -> bid.cattax(1)), bid(bid -> bid.cattax(2))); final BlockedAttributes blockedAttributes = BlockedAttributes.builder().cattaxComplement(2).build(); - final BidsBlocker blocker = BidsBlocker.create( - bids, "bidder1", OrtbVersion.ORTB_2_6, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker( + bids, OrtbVersion.ORTB_2_6, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(result -> { @@ -616,8 +618,8 @@ public void shouldBlockBidIfCattaxNotEquals1IfBlockedAttributesCattaxAbsent() { bid(bid -> bid.cattax(1)), bid(bid -> bid.cattax(2))); final BlockedAttributes blockedAttributes = BlockedAttributes.builder().build(); - final BidsBlocker blocker = BidsBlocker.create( - bids, "bidder1", OrtbVersion.ORTB_2_6, accountConfig, blockedAttributes, bidRejectionTracker, true); + final BidsBlocker blocker = bidsBlocker( + bids, OrtbVersion.ORTB_2_6, accountConfig, blockedAttributes, true); // when and then assertThat(blocker.block()).satisfies(result -> { @@ -648,7 +650,7 @@ private static BlockedAttributes attributesWithBadv(List badv) { } private static ObjectNode toObjectNode(ModuleConfig config) { - return mapper.valueToTree(config); + return MAPPER.valueToTree(config); } private static void isEmpty(ExecutionResult result) { @@ -664,4 +666,14 @@ private static void hasValue(ExecutionResult result, Integer... ind assertThat(result.getWarnings()).isNull(); assertThat(result.getDebugMessages()).isNull(); } + + private BidsBlocker bidsBlocker(List bids, + OrtbVersion ortbVersion, + ObjectNode accountConfig, + BlockedAttributes blockedAttributes, + boolean debugEnabled) { + + return BidsBlocker.create( + bids, "bidder1", ortbVersion, accountConfig, blockedAttributes, bidRejectionTracker, debugEnabled); + } } diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BlockedAttributesResolverTest.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BlockedAttributesResolverTest.java index 1ba9ca80532..2bc1afeb68c 100644 --- a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BlockedAttributesResolverTest.java +++ b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BlockedAttributesResolverTest.java @@ -27,7 +27,7 @@ public class BlockedAttributesResolverTest { - private static final ObjectMapper mapper = new ObjectMapper() + private static final ObjectMapper MAPPER = new ObjectMapper() .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE) .setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -36,7 +36,7 @@ public class BlockedAttributesResolverTest { @Test public void shouldReturnEmptyResultWhenInvalidAccountConfigurationAndDebugDisabled() { // given - final ObjectNode accountConfig = mapper.createObjectNode().put("block-lists", 1); + final ObjectNode accountConfig = MAPPER.createObjectNode().put("block-lists", 1); final BlockedAttributesResolver resolver = BlockedAttributesResolver.create( emptyRequest(), "bidder1", ORTB_VERSION, accountConfig, false); @@ -47,7 +47,7 @@ public void shouldReturnEmptyResultWhenInvalidAccountConfigurationAndDebugDisabl @Test public void shouldReturnResultWithErrorWhenInvalidAccountConfiguration() { // given - final ObjectNode accountConfig = mapper.createObjectNode().put("attributes", 1); + final ObjectNode accountConfig = MAPPER.createObjectNode().put("attributes", 1); final BlockedAttributesResolver resolver = BlockedAttributesResolver.create( emptyRequest(), "bidder1", ORTB_VERSION, accountConfig, true); @@ -83,8 +83,8 @@ public void shouldReturnResultWithValueAndWarnings() { // when and then assertThat(resolver.resolve()).isEqualTo(ExecutionResult.builder() .value(BlockedAttributes.builder().badv(singletonList("domain3.com")).build()) - .warnings(singletonList("More than one conditions matches request. Bidder: bidder1, " + - "request media types: [banner, video]")) + .warnings(singletonList("More than one conditions matches request. Bidder: bidder1, " + + "request media types: [banner, video]")) .build()); } @@ -131,6 +131,6 @@ private static BidRequest request(UnaryOperator impCustomizer) { } private static ObjectNode toObjectNode(ModuleConfig config) { - return mapper.valueToTree(config); + return MAPPER.valueToTree(config); } } diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/Attribute.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/Attribute.java index e60354670e9..4e59baac6d4 100644 --- a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/Attribute.java +++ b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/Attribute.java @@ -35,46 +35,46 @@ public Map getProperties() { properties.computeIfAbsent("allowed-" + field + "-for-deals", key -> allowedForDeals); properties.computeIfAbsent("action-overrides", key -> actionOverrides != null - ? actionOverrides.toBuilder() - .field(field) - .build() - : null); + ? actionOverrides.toBuilder() + .field(field) + .build() + : null); return properties; } public static AttributeBuilder badvBuilder() { return Attribute.builder() - .field("adomain"); + .field("adomain"); } public static AttributeBuilder bcatBuilder() { return Attribute.builder() - .field("adv-cat"); + .field("adv-cat"); } public static AttributeBuilder bappBuilder() { return Attribute.builder() - .field("app"); + .field("app"); } public static AttributeBuilder btypeBuilder() { return Attribute.builder() - .field("banner-type"); + .field("banner-type"); } public static AttributeBuilder bannerBattrBuilder() { return Attribute.builder() - .field("banner-attr"); + .field("banner-attr"); } public static AttributeBuilder videoBattrBuilder() { return Attribute.builder() - .field("video-attr"); + .field("video-attr"); } public static AttributeBuilder audioBattrBuilder() { return Attribute.builder() - .field("audio-attr"); + .field("audio-attr"); } } diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/AttributeActionOverrides.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/AttributeActionOverrides.java index 5080c35330f..1dd8403b859 100644 --- a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/AttributeActionOverrides.java +++ b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/config/AttributeActionOverrides.java @@ -36,42 +36,40 @@ public Map getProperties() { public static AttributeActionOverrides blocked(List> blocked) { return AttributeActionOverrides.builder() - .blocked(blocked) - .build(); + .blocked(blocked) + .build(); } public static AttributeActionOverrides blockUnknown(List blockUnknown) { return AttributeActionOverrides.builder() - .blockUnknown(blockUnknown) - .build(); + .blockUnknown(blockUnknown) + .build(); } - public static AttributeActionOverrides blockFlags( - List enforceBlocks, - List blockUnknown) { + public static AttributeActionOverrides blockFlags(List enforceBlocks, + List blockUnknown) { return AttributeActionOverrides.builder() - .enforceBlocks(enforceBlocks) - .blockUnknown(blockUnknown) - .build(); + .enforceBlocks(enforceBlocks) + .blockUnknown(blockUnknown) + .build(); } - public static AttributeActionOverrides response( - List enforceBlocks, - List blockUnknown, - List> allowedForDeals) { + public static AttributeActionOverrides response(List enforceBlocks, + List blockUnknown, + List> allowedForDeals) { return AttributeActionOverrides.builder() - .enforceBlocks(enforceBlocks) - .blockUnknown(blockUnknown) - .allowedForDeals(allowedForDeals) - .build(); + .enforceBlocks(enforceBlocks) + .blockUnknown(blockUnknown) + .allowedForDeals(allowedForDeals) + .build(); } public static AttributeActionOverrides allowedForDeals(List> allowedForDeals) { return AttributeActionOverrides.builder() - .allowedForDeals(allowedForDeals) - .build(); + .allowedForDeals(allowedForDeals) + .build(); } } diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHookTest.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHookTest.java index b2182a92f6e..9ecb3380322 100644 --- a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHookTest.java +++ b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHookTest.java @@ -49,7 +49,7 @@ @ExtendWith(MockitoExtension.class) public class Ortb2BlockingBidderRequestHookTest { - private static final ObjectMapper mapper = new ObjectMapper() + private static final ObjectMapper MAPPER = new ObjectMapper() .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE) .setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -99,7 +99,7 @@ public void shouldReturnResultWithNoActionWhenNoBlockingAttributes() { @Test public void shouldReturnResultWithNoActionAndErrorWhenInvalidAccountConfig() { // given - final ObjectNode accountConfig = mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() .put("attributes", 1); // when @@ -120,7 +120,7 @@ public void shouldReturnResultWithNoActionAndErrorWhenInvalidAccountConfig() { @Test public void shouldReturnResultWithNoActionAndNoErrorWhenInvalidAccountConfigAndDebugDisabled() { // given - final ObjectNode accountConfig = mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() .put("attributes", 1); // when @@ -287,6 +287,6 @@ private static BidRequest emptyRequest() { } private static ObjectNode toObjectNode(ModuleConfig config) { - return mapper.valueToTree(config); + return MAPPER.valueToTree(config); } } diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java index 351bfbb9d33..a8f21e6abf1 100644 --- a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java +++ b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java @@ -48,7 +48,7 @@ @ExtendWith(MockitoExtension.class) public class Ortb2BlockingRawBidderResponseHookTest { - private static final ObjectMapper mapper = new ObjectMapper() + private static final ObjectMapper MAPPER = new ObjectMapper() .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE) .setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -87,7 +87,7 @@ public void shouldReturnResultWithNoActionWhenNoBidsBlocked() { @Test public void shouldReturnResultWithNoActionAndErrorWhenInvalidAccountConfig() { // given - final ObjectNode accountConfig = mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() .put("attributes", 1); // when @@ -108,7 +108,7 @@ public void shouldReturnResultWithNoActionAndErrorWhenInvalidAccountConfig() { @Test public void shouldReturnResultWithNoActionAndNoErrorWhenInvalidAccountConfigAndDebugDisabled() { // given - final ObjectNode accountConfig = mapper.createObjectNode() + final ObjectNode accountConfig = MAPPER.createObjectNode() .put("attributes", 1); // when @@ -176,9 +176,9 @@ public void shouldReturnResultWithPayloadUpdateAndAnalyticsTags() { asList( ResultImpl.of( "success-blocked", - mapper.createObjectNode() - .set("adomain", mapper.createArrayNode()) - .set("attributes", mapper.createArrayNode() + MAPPER.createObjectNode() + .set("adomain", MAPPER.createArrayNode()) + .set("attributes", MAPPER.createArrayNode() .add("badv")), AppliedToImpl.builder() .bidders(singletonList("bidder1")) @@ -193,10 +193,10 @@ public void shouldReturnResultWithPayloadUpdateAndAnalyticsTags() { .build()), ResultImpl.of( "success-blocked", - mapper.createObjectNode() - .set("adomain", mapper.createArrayNode() + MAPPER.createObjectNode() + .set("adomain", MAPPER.createArrayNode() .add("domain2.com")) - .set("attributes", mapper.createArrayNode() + .set("attributes", MAPPER.createArrayNode() .add("badv")), AppliedToImpl.builder() .bidders(singletonList("bidder1")) @@ -334,6 +334,6 @@ private static BidderBid bid(UnaryOperator bidCustomizer) { } private static ObjectNode toObjectNode(ModuleConfig config) { - return mapper.valueToTree(config); + return MAPPER.valueToTree(config); } } diff --git a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/Correction.java b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/Correction.java index 2cfda5fce68..aaabf5ab005 100644 --- a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/Correction.java +++ b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/Correction.java @@ -1,7 +1,6 @@ package org.prebid.server.hooks.modules.pb.request.correction.core.correction; import com.iab.openrtb.request.BidRequest; -import org.prebid.server.hooks.modules.pb.request.correction.core.config.model.Config; public interface Correction { diff --git a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/useragent/UserAgentCorrectionProducer.java b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/useragent/UserAgentCorrectionProducer.java index f4c8d4f76dd..c5010553f5a 100644 --- a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/useragent/UserAgentCorrectionProducer.java +++ b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/correction/useragent/UserAgentCorrectionProducer.java @@ -22,7 +22,6 @@ public class UserAgentCorrectionProducer implements CorrectionProducer { private static final String PREBID_MOBILE = "prebid-mobile"; private static final Pattern USER_AGENT_PATTERN = Pattern.compile(".*PrebidMobile/[0-9]+[^ ]*.*"); - private static final int MAX_VERSION_MAJOR = 2; private static final int MAX_VERSION_MINOR = 1; private static final int MAX_VERSION_PATCH = 6; @@ -68,7 +67,6 @@ private static boolean isApplicableDevice(Device device) { .orElse(false); } - @Override public Correction produce(Config config) { return CORRECTION_INSTANCE; diff --git a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/util/VersionUtil.java b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/util/VersionUtil.java index 2e84f01183e..e2a1268c2f7 100644 --- a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/util/VersionUtil.java +++ b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/core/util/VersionUtil.java @@ -2,6 +2,9 @@ public class VersionUtil { + private VersionUtil() { + } + public static boolean isVersionLessThan(String versionAsString, int major, int minor, int patch) { return compareVersion(versionAsString, major, minor, patch) < 0; } diff --git a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/v1/RequestCorrectionProcessedAuctionHook.java b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/v1/RequestCorrectionProcessedAuctionHook.java index b9142c93d26..215e9795110 100644 --- a/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/v1/RequestCorrectionProcessedAuctionHook.java +++ b/extra/modules/pb-request-correction/src/main/java/org/prebid/server/hooks/modules/pb/request/correction/v1/RequestCorrectionProcessedAuctionHook.java @@ -28,7 +28,9 @@ public class RequestCorrectionProcessedAuctionHook implements ProcessedAuctionRe private final RequestCorrectionProvider requestCorrectionProvider; private final ObjectMapper mapper; - public RequestCorrectionProcessedAuctionHook(RequestCorrectionProvider requestCorrectionProvider, ObjectMapper mapper) { + public RequestCorrectionProcessedAuctionHook(RequestCorrectionProvider requestCorrectionProvider, + ObjectMapper mapper) { + this.requestCorrectionProvider = Objects.requireNonNull(requestCorrectionProvider); this.mapper = Objects.requireNonNull(mapper); } diff --git a/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/config/ResponseCorrectionModuleConfiguration.java b/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/config/ResponseCorrectionModuleConfiguration.java index e119bb59703..133a358dff7 100644 --- a/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/config/ResponseCorrectionModuleConfiguration.java +++ b/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/config/ResponseCorrectionModuleConfiguration.java @@ -1,10 +1,10 @@ package org.prebid.server.hooks.modules.pb.response.correction.config; +import org.prebid.server.hooks.modules.pb.response.correction.core.ResponseCorrectionProvider; import org.prebid.server.hooks.modules.pb.response.correction.core.correction.CorrectionProducer; import org.prebid.server.hooks.modules.pb.response.correction.core.correction.appvideohtml.AppVideoHtmlCorrection; import org.prebid.server.hooks.modules.pb.response.correction.core.correction.appvideohtml.AppVideoHtmlCorrectionProducer; import org.prebid.server.hooks.modules.pb.response.correction.v1.ResponseCorrectionModule; -import org.prebid.server.hooks.modules.pb.response.correction.core.ResponseCorrectionProvider; import org.prebid.server.json.ObjectMapperProvider; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHook.java b/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHook.java index 9f9e8e75659..11c740e9771 100644 --- a/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHook.java +++ b/extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHook.java @@ -7,13 +7,13 @@ import io.vertx.core.Future; import org.prebid.server.auction.model.BidderResponse; import org.prebid.server.exception.PreBidException; +import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.execution.v1.bidder.AllProcessedBidResponsesPayloadImpl; import org.prebid.server.hooks.modules.pb.response.correction.core.ResponseCorrectionProvider; import org.prebid.server.hooks.modules.pb.response.correction.core.config.model.Config; import org.prebid.server.hooks.modules.pb.response.correction.core.correction.Correction; import org.prebid.server.hooks.v1.InvocationAction; import org.prebid.server.hooks.v1.InvocationResult; -import org.prebid.server.hooks.execution.v1.InvocationResultImpl; import org.prebid.server.hooks.v1.InvocationStatus; import org.prebid.server.hooks.v1.auction.AuctionInvocationContext; import org.prebid.server.hooks.v1.bidder.AllProcessedBidResponsesHook; @@ -57,12 +57,13 @@ public Future> call(AllProcess return noAction(); } - final InvocationResult invocationResult = InvocationResultImpl.builder() - .status(InvocationStatus.success) - .action(InvocationAction.update) - .payloadUpdate(initialPayload -> AllProcessedBidResponsesPayloadImpl.of( - applyCorrections(initialPayload.bidResponses(), config, corrections))) - .build(); + final InvocationResult invocationResult = + InvocationResultImpl.builder() + .status(InvocationStatus.success) + .action(InvocationAction.update) + .payloadUpdate(initialPayload -> AllProcessedBidResponsesPayloadImpl.of( + applyCorrections(initialPayload.bidResponses(), config, corrections))) + .build(); return Future.succeededFuture(invocationResult); } @@ -75,7 +76,10 @@ private Config moduleConfig(ObjectNode accountConfig) { } } - private static List applyCorrections(List bidderResponses, Config config, List corrections) { + private static List applyCorrections(List bidderResponses, + Config config, + List corrections) { + List result = bidderResponses; for (Correction correction : corrections) { result = correction.apply(config, result); diff --git a/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionProducerTest.java b/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionProducerTest.java index 15305d6bed2..9a628f90029 100644 --- a/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionProducerTest.java +++ b/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionProducerTest.java @@ -12,7 +12,7 @@ public class AppVideoHtmlCorrectionProducerTest { - private final AppVideoHtmlCorrection CORRECTION_INSTANCE = + private static final AppVideoHtmlCorrection CORRECTION_INSTANCE = new AppVideoHtmlCorrection(ObjectMapperProvider.mapper(), 0.1); private final AppVideoHtmlCorrectionProducer target = new AppVideoHtmlCorrectionProducer(CORRECTION_INSTANCE); diff --git a/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionTest.java b/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionTest.java index 9b36b0210da..05e3d162083 100644 --- a/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionTest.java +++ b/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionTest.java @@ -39,10 +39,6 @@ public void applyShouldNotChangeBidResponsesFromExcludedBidders() { assertThat(actual).isEqualTo(givenResponses); } - private static Config givenConfig(List excludedBidders) { - return Config.of(true, AppVideoHtmlConfig.of(true, excludedBidders)); - } - @Test public void applyShouldNotChangeBidResponsesWhenAdmIsNull() { // given @@ -60,15 +56,6 @@ public void applyShouldNotChangeBidResponsesWhenAdmIsNull() { assertThat(actual).isEqualTo(givenResponses); } - private static BidderBid givenBid(String adm, BidType type) { - return givenBid(adm, type, null); - } - - private static BidderBid givenBid(String adm, BidType type, ObjectNode bidExt) { - final Bid bid = Bid.builder().adm(adm).ext(bidExt).build(); - return BidderBid.of(bid, type, "USD"); - } - @Test public void applyShouldNotChangeBidResponsesWhenBidIsVideoAndHasVastXmlInAdm() { // given @@ -130,10 +117,6 @@ public void applyShouldChangeTypeToBannerAndAddMetaTypeVideoWhenAdmIsJsonButNotN assertThat(actual).isEqualTo(expectedResponses); } - private static Config givenConfig() { - return Config.of(true, AppVideoHtmlConfig.of(true, null)); - } - @Test public void applyShouldChangeTypeToBannerAndAddMetaTypeVideoWhenAdmIsVastXmlAndTypeIsNotVideo() { // given @@ -194,4 +177,20 @@ public void applyShouldChangeTypeToBannerAndOverwriteMetaTypeToVideoWhenAdmIsNot assertThat(actual).isEqualTo(expectedResponses); } + private static Config givenConfig() { + return Config.of(true, AppVideoHtmlConfig.of(true, null)); + } + + private static Config givenConfig(List excludedBidders) { + return Config.of(true, AppVideoHtmlConfig.of(true, excludedBidders)); + } + + private static BidderBid givenBid(String adm, BidType type) { + return givenBid(adm, type, null); + } + + private static BidderBid givenBid(String adm, BidType type, ObjectNode bidExt) { + final Bid bid = Bid.builder().adm(adm).ext(bidExt).build(); + return BidderBid.of(bid, type, "USD"); + } } diff --git a/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHookTest.java b/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHookTest.java index 0e525b06f24..1379d75b23d 100644 --- a/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHookTest.java +++ b/extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/v1/ResponseCorrectionAllProcessedBidResponsesHookTest.java @@ -59,7 +59,8 @@ public void callShouldReturnFailedResultOnInvalidConfiguration() { given(invocationContext.accountConfig()).willReturn(MAPPER.valueToTree(Map.of("enabled", emptyList()))); // when - final Future> result = target.call(payload, invocationContext); + final Future> result = + target.call(payload, invocationContext); //then assertThat(result.result()).satisfies(invocationResult -> { @@ -75,7 +76,8 @@ public void callShouldReturnNoActionOnDisabledConfig() { given(invocationContext.accountConfig()).willReturn(MAPPER.valueToTree(Config.of(false, null))); // when - final Future> result = target.call(payload, invocationContext); + final Future> result = + target.call(payload, invocationContext); //then assertThat(result.result()).satisfies(invocationResult -> { @@ -90,7 +92,8 @@ public void callShouldReturnNoActionIfThereIsNoApplicableCorrections() { given(responseCorrectionProvider.corrections(any(), any())).willReturn(emptyList()); // when - final Future> result = target.call(payload, invocationContext); + final Future> result = + target.call(payload, invocationContext); //then assertThat(result.result()).satisfies(invocationResult -> { @@ -106,7 +109,8 @@ public void callShouldReturnUpdate() { given(responseCorrectionProvider.corrections(any(), any())).willReturn(singletonList(correction)); // when - final Future> result = target.call(payload, invocationContext); + final Future> result = + target.call(payload, invocationContext); //then assertThat(result.result()).satisfies(invocationResult -> { diff --git a/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilter.java b/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilter.java index 499de57b1d8..d3d721778f5 100644 --- a/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilter.java +++ b/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilter.java @@ -27,8 +27,8 @@ public MraidFilterResult filterByPattern(String mraidScriptPattern, List responses, Map bidRejectionTrackers) { - List filteredResponses = new ArrayList<>(); - List analyticsResults = new ArrayList<>(); + final List filteredResponses = new ArrayList<>(); + final List analyticsResults = new ArrayList<>(); for (BidderResponse bidderResponse : responses) { final BidderSeatBid seatBid = bidderResponse.getSeatBid(); diff --git a/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolver.java b/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolver.java index 97a39633d7c..a2320077452 100644 --- a/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolver.java +++ b/extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolver.java @@ -18,7 +18,6 @@ public ModuleConfigResolver(ObjectMapper mapper, this.globalProperties = Objects.requireNonNull(globalProperties); } - public PbRichMediaFilterProperties resolve(ObjectNode accountConfigNode) { return readAccountConfig(accountConfigNode).orElse(globalProperties); } diff --git a/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilterTest.java b/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilterTest.java index 0198210d1ca..ad7eb512e77 100644 --- a/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilterTest.java +++ b/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilterTest.java @@ -37,7 +37,8 @@ public void filterShouldReturnOriginalBidsWhenNoBidsHaveMraidScriptInAdm() { "bidderB", bidRejectionTrackerB); // when - final MraidFilterResult filterResult = target.filterByPattern("mraid.js", List.of(responseA, responseB), givenTrackers); + final MraidFilterResult filterResult = target.filterByPattern( + "mraid.js", List.of(responseA, responseB), givenTrackers); // then assertThat(filterResult.getFilterResult()).containsExactly(responseA, responseB); @@ -106,8 +107,9 @@ public void filterShouldReturnFilteredBidsWhenBidsWithMraidScriptIsFilteredOut() verifyNoInteractions(bidRejectionTrackerA); verify(bidRejectionTrackerB) .rejectBids(List.of(givenInvalidBid2), BidRejectionReason.RESPONSE_REJECTED_INVALID_CREATIVE); - verify(bidRejectionTrackerC) - .rejectBids(List.of(givenInvalidBid1, givenInvalidBid2), BidRejectionReason.RESPONSE_REJECTED_INVALID_CREATIVE); + verify(bidRejectionTrackerC).rejectBids( + List.of(givenInvalidBid1, givenInvalidBid2), + BidRejectionReason.RESPONSE_REJECTED_INVALID_CREATIVE); verifyNoMoreInteractions(bidRejectionTrackerB, bidRejectionTrackerC); } diff --git a/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolverTest.java b/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolverTest.java index 6cf0be0612c..8dbb33aa35e 100644 --- a/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolverTest.java +++ b/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolverTest.java @@ -19,7 +19,6 @@ public class ModuleConfigResolverTest { private static final PbRichMediaFilterProperties ACCOUNT_PROPERTIES = PbRichMediaFilterProperties.of(true, ""); - private ModuleConfigResolver target; @BeforeEach diff --git a/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHookTest.java b/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHookTest.java index 2a87faec776..80f38ffdcc1 100644 --- a/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHookTest.java +++ b/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHookTest.java @@ -66,7 +66,8 @@ public class PbRichmediaFilterAllProcessedBidResponsesHookTest { @BeforeEach public void setUp() { - target = new PbRichmediaFilterAllProcessedBidResponsesHook(ObjectMapperProvider.mapper(), mraidFilter, configResolver); + target = new PbRichmediaFilterAllProcessedBidResponsesHook( + ObjectMapperProvider.mapper(), mraidFilter, configResolver); when(configResolver.resolve(any())).thenReturn(PbRichMediaFilterProperties.of(true, "pattern")); when(auctionInvocationContext.auctionContext()) .thenReturn(AuctionContext.builder().bidRejectionTrackers(BID_REJECTION_TRACKERS).build()); diff --git a/extra/pom.xml b/extra/pom.xml index 9c878e89e7c..48e81cbb6a5 100644 --- a/extra/pom.xml +++ b/extra/pom.xml @@ -29,6 +29,8 @@ ${maven-surefire-plugin.version} 0.8.12 0.44.0 + 3.6.0 + 10.17.0 3.2.3 @@ -273,6 +275,35 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle-plugin.version} + + + ${maven.multiModuleProjectDirectory}/checkstyle.xml + true + + true + false + true + + + + validate + + check + + + + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + org.apache.maven.plugins maven-release-plugin @@ -306,4 +337,21 @@ + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle-plugin.version} + + + + checkstyle-aggregate + + + + + + diff --git a/pom.xml b/pom.xml index b353eda0bce..a59414073b3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,6 @@ Dockerfile - 3.4.0 - 10.17.0 1.9.0 4.9.10 @@ -398,28 +396,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - ${checkstyle-plugin.version} - - - checkstyle.xml - UTF-8 - true - - true - false - true - - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - org.codehaus.gmavenplus gmavenplus-plugin @@ -455,18 +431,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - - validate - - checkstyle - - - - org.xolstice.maven.plugins protobuf-maven-plugin @@ -690,22 +654,6 @@ - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - checkstyle - - - - - - - diff --git a/src/main/java/com/iab/openrtb/request/Asset.java b/src/main/java/com/iab/openrtb/request/Asset.java index c60879c12bb..7be06cd7e03 100644 --- a/src/main/java/com/iab/openrtb/request/Asset.java +++ b/src/main/java/com/iab/openrtb/request/Asset.java @@ -8,7 +8,7 @@ @Value public class Asset { - public static final Asset EMPTY = com.iab.openrtb.request.Asset.builder().build(); + public static final Asset EMPTY = Asset.builder().build(); Integer id; diff --git a/src/main/java/com/iab/openrtb/request/Banner.java b/src/main/java/com/iab/openrtb/request/Banner.java index 0ec7796b394..b24584b110b 100644 --- a/src/main/java/com/iab/openrtb/request/Banner.java +++ b/src/main/java/com/iab/openrtb/request/Banner.java @@ -11,7 +11,7 @@ * “banner” may have very specific meaning in other contexts, here it can be * many things including a simple static image, an expandable ad unit, or even * in-banner video (refer to the {@link Video} object in Section 3.2.7 for the - * more generalized and full featured video ad units). An array of + * more generalized and full-featured video ad units). An array of * {@link Banner} objects can also appear within the {@link Video} to describe * optional companion ads defined in the VAST specification. *

The presence of a {@link Banner} as a subordinate of the {@link Imp} diff --git a/src/main/java/com/iab/openrtb/request/BidRequest.java b/src/main/java/com/iab/openrtb/request/BidRequest.java index f021cf5e1e9..79de78bb242 100644 --- a/src/main/java/com/iab/openrtb/request/BidRequest.java +++ b/src/main/java/com/iab/openrtb/request/BidRequest.java @@ -105,7 +105,7 @@ public class BidRequest { /** * Flag to indicate if Exchange can verify that the impressions offered - * represent all of the impressions available in context (e.g., all on the + * represent all the impressions available in context (e.g., all on the * web page, all video spots such as pre/mid/post roll) to support * road-blocking. 0 = no or unknown, 1 = yes, the impressions offered * represent all that are available. diff --git a/src/main/java/com/iab/openrtb/request/Channel.java b/src/main/java/com/iab/openrtb/request/Channel.java index a5a51c64055..84e0c7d2748 100644 --- a/src/main/java/com/iab/openrtb/request/Channel.java +++ b/src/main/java/com/iab/openrtb/request/Channel.java @@ -9,7 +9,7 @@ * {@link Channel} is defined as the entity that curates a content * library, or stream within a brand name for viewers. Examples are * specific view selectable ‘channels’ within linear and streaming - * television (MTV, HGTV, CNN, BBC One, etc) or a specific stream of + * television (MTV, HGTV, CNN, BBC One, etc.) or a specific stream of * audio content commonly called ‘stations.’ Name is a human-readable * field while domain and id can be used for reporting and targeting * purposes. See 7.6 for further examples. @@ -25,7 +25,7 @@ public class Channel { String id; /** - * Channel the content is on (e.g., a local channel like “WABC-TV") + * Channel the content is on (e.g., a local channel like "WABC-TV") */ String name; diff --git a/src/main/java/com/iab/openrtb/request/Content.java b/src/main/java/com/iab/openrtb/request/Content.java index 8ef947e810d..486630d8eed 100644 --- a/src/main/java/com/iab/openrtb/request/Content.java +++ b/src/main/java/com/iab/openrtb/request/Content.java @@ -9,7 +9,7 @@ /** * This object describes the content in which the impression will appear, which - * may be syndicated or non- syndicated content. This object may be useful when + * may be syndicated or non-syndicated content. This object may be useful when * syndicated content contains impressions and does not necessarily match the * publisher’s general content. The exchange might or might not have knowledge * of the page where the content is running, because of the syndication @@ -60,7 +60,7 @@ public class Content { String artist; /** - * Genre that best describes the content (e.g., rock, pop, etc). + * Genre that best describes the content (e.g., rock, pop, etc.). */ String genre; @@ -161,7 +161,7 @@ public class Content { String langb; /** - * Indicator of whether or not the content is embeddable (e.g., an + * Indicator of whether the content is embeddable (e.g., an * embeddable video player), where 0 = no, 1 = yes. */ Integer embeddable; diff --git a/src/main/java/com/iab/openrtb/request/Device.java b/src/main/java/com/iab/openrtb/request/Device.java index 453406e126a..848e1b01e66 100644 --- a/src/main/java/com/iab/openrtb/request/Device.java +++ b/src/main/java/com/iab/openrtb/request/Device.java @@ -10,7 +10,7 @@ * This object provides information pertaining to the device through which the * user is interacting. {@link Device} information includes its hardware, platform, * location, and carrier data. The device can refer to a mobile handset, - * a desktop computer, set top box, or other digital device. + * a desktop computer, set-top box, or other digital device. *

BEST PRACTICE: There are currently no prominent open source lists * for device makes, models, operating systems, or carriers. Exchanges typically * use commercial products or other proprietary lists for these attributes. @@ -18,7 +18,7 @@ * to publish lists of their device make, model, operating system, and carrier * values to bidders. *

BEST PRACTICE: Proper device IP detection in mobile is not - * straightforward. Typically it involves starting at the left of the + * straightforward. Typically, it involves starting at the left of the * {@code x-forwarded-for} header, skipping private carrier networks * (e.g., 10.x.x.x or 192.x.x.x), and possibly scanning for known carrier IP * ranges. Exchanges are urged to research and implement this feature carefully diff --git a/src/main/java/com/iab/openrtb/request/DurFloor.java b/src/main/java/com/iab/openrtb/request/DurFloor.java index 1c375372129..c03c5f657ee 100644 --- a/src/main/java/com/iab/openrtb/request/DurFloor.java +++ b/src/main/java/com/iab/openrtb/request/DurFloor.java @@ -28,7 +28,7 @@ public class DurFloor { /** * Minimum bid for a given impression opportunity, * if bidding with a creative in this duration range, expressed in CPM. - * For any creatives whose durations are outside of the defined min/max, + * For any creatives whose durations are outside the defined min/max, * the `bidfloor` at the `Imp` level will serve as the default floor. */ BigDecimal bidfloor; diff --git a/src/main/java/com/iab/openrtb/request/Imp.java b/src/main/java/com/iab/openrtb/request/Imp.java index 98392688e2c..a24e90d464e 100644 --- a/src/main/java/com/iab/openrtb/request/Imp.java +++ b/src/main/java/com/iab/openrtb/request/Imp.java @@ -29,7 +29,7 @@ public class Imp { /** * A unique identifier for this impression within the context of the bid - * request (typically, starts with 1 and increments. + * request (typically, starts with 1 and increments). *

(required) */ String id; diff --git a/src/main/java/com/iab/openrtb/request/Native.java b/src/main/java/com/iab/openrtb/request/Native.java index 2739b3ee2f4..0c11132b12d 100644 --- a/src/main/java/com/iab/openrtb/request/Native.java +++ b/src/main/java/com/iab/openrtb/request/Native.java @@ -34,7 +34,7 @@ public class Native { /** * Request payload complying with the Native Ad Specification. The root node * of the payload, “native”, was dropped in the Native Ad Specification 1.1. - *

For Native 1.0, this is a JSON-encoded string consisting of a unnamed + *

For Native 1.0, this is a JSON-encoded string consisting of an unnamed * root object with a single subordinate object named 'native', which is the * Native Markup Request object, section 4.1 of OpenRTB Native 1.0 specification. *

For Native 1.1 and higher, this is a JSON-encoded string consisting of diff --git a/src/main/java/com/iab/openrtb/request/Network.java b/src/main/java/com/iab/openrtb/request/Network.java index 7d67627ab7e..8d3e3350f92 100644 --- a/src/main/java/com/iab/openrtb/request/Network.java +++ b/src/main/java/com/iab/openrtb/request/Network.java @@ -25,7 +25,7 @@ public class Network { String id; /** - * Network the content is on (e.g., a TV network like “ABC") + * Network the content is on (e.g., a TV network like "ABC") */ String name; diff --git a/src/main/java/com/iab/openrtb/request/Qty.java b/src/main/java/com/iab/openrtb/request/Qty.java index 191fab718d1..64e882de199 100644 --- a/src/main/java/com/iab/openrtb/request/Qty.java +++ b/src/main/java/com/iab/openrtb/request/Qty.java @@ -23,7 +23,7 @@ public class Qty { BigDecimal multiplier; /** - * The source type of the quantity measurement, ie. publisher. + * The source type of the quantity measurement, i.e. publisher. */ Integer sourcetype; diff --git a/src/main/java/com/iab/openrtb/request/Regs.java b/src/main/java/com/iab/openrtb/request/Regs.java index 932ae34784a..ffee5dd3216 100644 --- a/src/main/java/com/iab/openrtb/request/Regs.java +++ b/src/main/java/com/iab/openrtb/request/Regs.java @@ -23,7 +23,7 @@ public class Regs { Integer coppa; /** - * Flag that indicates whether or not the request is subject to + * Flag that indicates whether the request is subject to * GDPR regulations 0 = No, 1 = Yes, omission indicates Unknown. * Refer to Section 7.5 for more information. */ diff --git a/src/main/java/com/iab/openrtb/request/Request.java b/src/main/java/com/iab/openrtb/request/Request.java index 6f631fc152a..09ddac68d34 100644 --- a/src/main/java/com/iab/openrtb/request/Request.java +++ b/src/main/java/com/iab/openrtb/request/Request.java @@ -44,7 +44,7 @@ public class Request { /** Set to '0' in case if supply source / impression supports returning an assets url. */ Integer aurlsupport; - /** Set to '0' in case if supply source / impression supports returning an dco url. */ + /** Set to '0' in case if supply source / impression supports returning a dco url. */ Integer durlsupport; /** Specifies types of events supported by tracking. */ diff --git a/src/main/java/com/iab/openrtb/request/Source.java b/src/main/java/com/iab/openrtb/request/Source.java index e4804fea972..142a55fc7c4 100644 --- a/src/main/java/com/iab/openrtb/request/Source.java +++ b/src/main/java/com/iab/openrtb/request/Source.java @@ -36,8 +36,8 @@ public class Source { String pchain; /** - * This object represents both the links in the supply chain as - * well as an indicator whether or not the supply chain is complete. + * This object represents both the links in the supply chain and + * an indicator whether the supply chain is complete. * Details via the {@link SupplyChain} object (section 3.2.25) */ SupplyChain schain; diff --git a/src/main/java/com/iab/openrtb/request/SupplyChainNode.java b/src/main/java/com/iab/openrtb/request/SupplyChainNode.java index 1896cc7efea..ead56a2cdae 100644 --- a/src/main/java/com/iab/openrtb/request/SupplyChainNode.java +++ b/src/main/java/com/iab/openrtb/request/SupplyChainNode.java @@ -14,7 +14,7 @@ public class SupplyChainNode { /** * The canonical domain name of the SSP, Exchange, Header - * Wrapper, etc system that bidders connect to. This may be + * Wrapper, etc. system that bidders connect to. This may be * the operational domain of the system, if that is different than * the parent corporate domain, to facilitate WHOIS and * reverse IP lookups to establish clear ownership of the diff --git a/src/main/java/com/iab/openrtb/request/ntv/ContextSubType.java b/src/main/java/com/iab/openrtb/request/ntv/ContextSubType.java index 82e9edb98e2..71392349d73 100644 --- a/src/main/java/com/iab/openrtb/request/ntv/ContextSubType.java +++ b/src/main/java/com/iab/openrtb/request/ntv/ContextSubType.java @@ -14,7 +14,7 @@ public enum ContextSubType { */ GENERAL(10), /** - * Primarily article content (which of course could include images, etc as part of the article) + * Primarily article content (which of course could include images, etc. as part of the article) */ ARTICLE(11), /** diff --git a/src/main/java/com/iab/openrtb/request/video/CacheConfig.java b/src/main/java/com/iab/openrtb/request/video/CacheConfig.java index f3c58da0dca..e02f683862b 100644 --- a/src/main/java/com/iab/openrtb/request/video/CacheConfig.java +++ b/src/main/java/com/iab/openrtb/request/video/CacheConfig.java @@ -1,12 +1,9 @@ package com.iab.openrtb.request.video; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheConfig { Integer ttl; } - diff --git a/src/main/java/com/iab/openrtb/request/video/IncludeBrandCategory.java b/src/main/java/com/iab/openrtb/request/video/IncludeBrandCategory.java index b0b8c28f56d..0b6a489694e 100644 --- a/src/main/java/com/iab/openrtb/request/video/IncludeBrandCategory.java +++ b/src/main/java/com/iab/openrtb/request/video/IncludeBrandCategory.java @@ -1,11 +1,9 @@ package com.iab.openrtb.request.video; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class IncludeBrandCategory { @JsonProperty("primaryadserver") @@ -16,4 +14,3 @@ public class IncludeBrandCategory { @JsonProperty("translatecategories") Boolean translateCategories; } - diff --git a/src/main/java/com/iab/openrtb/request/video/Pod.java b/src/main/java/com/iab/openrtb/request/video/Pod.java index a96e312f2ea..1f899dcbc18 100644 --- a/src/main/java/com/iab/openrtb/request/video/Pod.java +++ b/src/main/java/com/iab/openrtb/request/video/Pod.java @@ -1,11 +1,9 @@ package com.iab.openrtb.request.video; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class Pod { @JsonProperty("podid") @@ -17,4 +15,3 @@ public class Pod { @JsonProperty("configid") String configId; } - diff --git a/src/main/java/com/iab/openrtb/request/video/PodError.java b/src/main/java/com/iab/openrtb/request/video/PodError.java index a1219cfd595..2a1c1f8c09a 100644 --- a/src/main/java/com/iab/openrtb/request/video/PodError.java +++ b/src/main/java/com/iab/openrtb/request/video/PodError.java @@ -1,12 +1,10 @@ package com.iab.openrtb.request.video; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class PodError { Integer podId; @@ -15,4 +13,3 @@ public class PodError { List podErrors; } - diff --git a/src/main/java/com/iab/openrtb/request/video/Podconfig.java b/src/main/java/com/iab/openrtb/request/video/Podconfig.java index 35d5d52127f..229a939e4cc 100644 --- a/src/main/java/com/iab/openrtb/request/video/Podconfig.java +++ b/src/main/java/com/iab/openrtb/request/video/Podconfig.java @@ -18,4 +18,3 @@ public class Podconfig { List pods; } - diff --git a/src/main/java/com/iab/openrtb/response/Link.java b/src/main/java/com/iab/openrtb/response/Link.java index 8c8c3e576a7..57f740f00e9 100644 --- a/src/main/java/com/iab/openrtb/response/Link.java +++ b/src/main/java/com/iab/openrtb/response/Link.java @@ -1,7 +1,6 @@ package com.iab.openrtb.response; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; @@ -9,8 +8,7 @@ /** * Used for ‘call to action’ assets, or other links from the Native ad. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class Link { /** diff --git a/src/main/java/org/prebid/server/activity/infrastructure/creator/rule/PrivacyModulesRuleCreator.java b/src/main/java/org/prebid/server/activity/infrastructure/creator/rule/PrivacyModulesRuleCreator.java index 2550e2fc95f..cf25e716c5d 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/creator/rule/PrivacyModulesRuleCreator.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/creator/rule/PrivacyModulesRuleCreator.java @@ -5,9 +5,9 @@ import org.prebid.server.activity.infrastructure.creator.ActivityControllerCreationContext; import org.prebid.server.activity.infrastructure.creator.PrivacyModuleCreationContext; import org.prebid.server.activity.infrastructure.creator.privacy.PrivacyModuleCreator; -import org.prebid.server.activity.infrastructure.privacy.SkippedPrivacyModule; import org.prebid.server.activity.infrastructure.privacy.PrivacyModule; import org.prebid.server.activity.infrastructure.privacy.PrivacyModuleQualifier; +import org.prebid.server.activity.infrastructure.privacy.SkippedPrivacyModule; import org.prebid.server.activity.infrastructure.rule.AndRule; import org.prebid.server.activity.infrastructure.rule.Rule; import org.prebid.server.settings.model.activity.privacy.AccountPrivacyModuleConfig; diff --git a/src/main/java/org/prebid/server/activity/infrastructure/debug/ActivityInfrastructureDebug.java b/src/main/java/org/prebid/server/activity/infrastructure/debug/ActivityInfrastructureDebug.java index 6c7d083975d..f19b839aeec 100644 --- a/src/main/java/org/prebid/server/activity/infrastructure/debug/ActivityInfrastructureDebug.java +++ b/src/main/java/org/prebid/server/activity/infrastructure/debug/ActivityInfrastructureDebug.java @@ -3,8 +3,8 @@ import org.prebid.server.activity.Activity; import org.prebid.server.activity.ComponentType; import org.prebid.server.activity.infrastructure.payload.ActivityInvocationPayload; -import org.prebid.server.activity.infrastructure.privacy.SkippedPrivacyModule; import org.prebid.server.activity.infrastructure.privacy.PrivacyModuleQualifier; +import org.prebid.server.activity.infrastructure.privacy.SkippedPrivacyModule; import org.prebid.server.activity.infrastructure.rule.AndRule; import org.prebid.server.activity.infrastructure.rule.Rule; import org.prebid.server.json.JacksonMapper; diff --git a/src/main/java/org/prebid/server/analytics/model/VideoEvent.java b/src/main/java/org/prebid/server/analytics/model/VideoEvent.java index 0f2519f95df..f998d826678 100644 --- a/src/main/java/org/prebid/server/analytics/model/VideoEvent.java +++ b/src/main/java/org/prebid/server/analytics/model/VideoEvent.java @@ -25,4 +25,3 @@ public class VideoEvent { VideoResponse bidResponse; } - diff --git a/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java b/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java index 10db83bec8a..28e14a22deb 100644 --- a/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java +++ b/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java @@ -55,7 +55,7 @@ public class AnalyticsReporterDelegator { private static final Logger logger = LoggerFactory.getLogger(AnalyticsReporterDelegator.class); - private static final ConditionalLogger UNKNOWN_ADAPTERS_LOGGER = new ConditionalLogger(logger); + private static final ConditionalLogger unknownAdaptersLogger = new ConditionalLogger(logger); private static final Set ADAPTERS_PERMITTED_FOR_FULL_DATA = Collections.singleton("logAnalytics"); private final Vertx vertx; @@ -162,7 +162,7 @@ private void logUnknownAdapters(AuctionEvent auctionEvent) { if (CollectionUtils.isNotEmpty(unknownAdapterNames)) { final Site site = bidRequest.getSite(); final String refererUrl = site != null ? site.getPage() : null; - UNKNOWN_ADAPTERS_LOGGER.warn("Unknown adapters in ext.prebid.analytics[].adapter: %s, referrer: '%s'" + unknownAdaptersLogger.warn("Unknown adapters in ext.prebid.analytics[].adapter: %s, referrer: '%s'" .formatted(unknownAdapterNames, refererUrl), logSamplingRate); } } diff --git a/src/main/java/org/prebid/server/analytics/reporter/agma/EventBuffer.java b/src/main/java/org/prebid/server/analytics/reporter/agma/EventBuffer.java index d291fa0ba1c..e7b6dca1eae 100644 --- a/src/main/java/org/prebid/server/analytics/reporter/agma/EventBuffer.java +++ b/src/main/java/org/prebid/server/analytics/reporter/agma/EventBuffer.java @@ -12,7 +12,7 @@ public class EventBuffer { private List events = new ArrayList<>(); - private long byteSize = 0; + private long byteSize; private final long maxEvents; diff --git a/src/main/java/org/prebid/server/analytics/reporter/agma/model/AgmaAccountAnalyticsProperties.java b/src/main/java/org/prebid/server/analytics/reporter/agma/model/AgmaAccountAnalyticsProperties.java deleted file mode 100644 index 1d5a994dbe9..00000000000 --- a/src/main/java/org/prebid/server/analytics/reporter/agma/model/AgmaAccountAnalyticsProperties.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.prebid.server.analytics.reporter.agma.model; - -import lombok.Builder; -import lombok.Value; - -@Builder -@Value -public class AgmaAccountAnalyticsProperties { - - String code; - - String publisherId; - - String siteAppId; -} diff --git a/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/EventType.java b/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/EventType.java index 24fde84cc3f..3da1eb96961 100644 --- a/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/EventType.java +++ b/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/EventType.java @@ -4,4 +4,3 @@ public enum EventType { amp, auction, cookiesync, notification, setuid, video } - diff --git a/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/PubstackConfig.java b/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/PubstackConfig.java index 27562b9e40e..e36afbe4236 100644 --- a/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/PubstackConfig.java +++ b/src/main/java/org/prebid/server/analytics/reporter/pubstack/model/PubstackConfig.java @@ -1,13 +1,11 @@ package org.prebid.server.analytics.reporter.pubstack.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Map; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class PubstackConfig { @JsonProperty("scopeId") diff --git a/src/main/java/org/prebid/server/auction/BidResponseCreator.java b/src/main/java/org/prebid/server/auction/BidResponseCreator.java index 17dd8f8e79c..73dcc6b404a 100644 --- a/src/main/java/org/prebid/server/auction/BidResponseCreator.java +++ b/src/main/java/org/prebid/server/auction/BidResponseCreator.java @@ -561,11 +561,11 @@ private Integer resolveVastTtl(Bid bid, Imp imp, BidRequestCacheInfo cacheInfo, private Future> invokeProcessedBidderResponseHooks(List bidderResponses, AuctionContext auctionContext) { - return CompositeFuture.join(bidderResponses.stream() + return Future.join(bidderResponses.stream() .map(bidderResponse -> hookStageExecutor .executeProcessedBidderResponseStage(bidderResponse, auctionContext) .map(stageResult -> rejectBidderResponseOrProceed(stageResult, bidderResponse))) - .collect(Collectors.toCollection(ArrayList::new))) + .toList()) .map(CompositeFuture::list); } diff --git a/src/main/java/org/prebid/server/auction/CpmRange.java b/src/main/java/org/prebid/server/auction/CpmRange.java index 6f521953524..11ad6652438 100644 --- a/src/main/java/org/prebid/server/auction/CpmRange.java +++ b/src/main/java/org/prebid/server/auction/CpmRange.java @@ -29,7 +29,7 @@ public static String fromCpm(BigDecimal cpm, PriceGranularity priceGranularity) } /** - * Formats {@link BigDecimal} value with a given precision and return it's string representation. + * Formats {@link BigDecimal} value with a given precision and return its string representation. */ public static String format(BigDecimal value, Integer precision) { return numberFormat(ObjectUtils.defaultIfNull(precision, DEFAULT_PRECISION)).format(value); diff --git a/src/main/java/org/prebid/server/auction/ExchangeService.java b/src/main/java/org/prebid/server/auction/ExchangeService.java index 8d6a73a8b68..4ae191bcaad 100644 --- a/src/main/java/org/prebid/server/auction/ExchangeService.java +++ b/src/main/java/org/prebid/server/auction/ExchangeService.java @@ -254,7 +254,7 @@ private Future runAuction(AuctionContext receivedContext) { .map(receivedContext::with)) .map(context -> updateRequestMetric(context, uidsCookie, aliases, account, requestTypeMetric)) - .compose(context -> CompositeFuture.join( + .compose(context -> Future.join( context.getAuctionParticipations().stream() .map(auctionParticipation -> processAndRequestBids( context, @@ -262,7 +262,7 @@ private Future runAuction(AuctionContext receivedContext) { timeout, aliases) .map(auctionParticipation::with)) - .collect(Collectors.toCollection(ArrayList::new))) + .toList()) // send all the requests to the bidders and gathers results .map(CompositeFuture::list) .map(storedResponseProcessor::updateStoredBidResponse) @@ -1331,7 +1331,7 @@ private AuctionParticipation dropZeroNonDealBids(AuctionParticipation auctionPar if (isDebugEnabled) { debugWarnings.add( "Dropped bid '%s'. Does not contain a positive (or zero if there is a deal) 'price'" - .formatted(bid.getId())); + .formatted(bid.getId())); } } else { validBids.add(bidderBid); diff --git a/src/main/java/org/prebid/server/auction/HookDebugInfoEnricher.java b/src/main/java/org/prebid/server/auction/HookDebugInfoEnricher.java index ad8cd86410c..ca5a565402a 100644 --- a/src/main/java/org/prebid/server/auction/HookDebugInfoEnricher.java +++ b/src/main/java/org/prebid/server/auction/HookDebugInfoEnricher.java @@ -8,6 +8,7 @@ import org.prebid.server.hooks.execution.model.HookExecutionOutcome; import org.prebid.server.hooks.execution.model.Stage; import org.prebid.server.hooks.execution.model.StageExecutionOutcome; +import org.prebid.server.hooks.v1.analytics.Activity; import org.prebid.server.hooks.v1.analytics.AppliedTo; import org.prebid.server.hooks.v1.analytics.Result; import org.prebid.server.hooks.v1.analytics.Tags; @@ -203,9 +204,7 @@ private static ExtModulesTraceAnalyticsTags toTraceAnalyticsTags(Tags analyticsT .toList()); } - private static ExtModulesTraceAnalyticsActivity toTraceAnalyticsActivity( - org.prebid.server.hooks.v1.analytics.Activity activity) { - + private static ExtModulesTraceAnalyticsActivity toTraceAnalyticsActivity(Activity activity) { return ExtModulesTraceAnalyticsActivity.of( activity.name(), activity.status(), diff --git a/src/main/java/org/prebid/server/auction/ImplicitParametersExtractor.java b/src/main/java/org/prebid/server/auction/ImplicitParametersExtractor.java index 1ffdce56b45..eae090780c5 100644 --- a/src/main/java/org/prebid/server/auction/ImplicitParametersExtractor.java +++ b/src/main/java/org/prebid/server/auction/ImplicitParametersExtractor.java @@ -1,6 +1,7 @@ package org.prebid.server.auction; import de.malkusch.whoisServerList.publicSuffixList.PublicSuffixList; +import io.vertx.core.MultiMap; import org.apache.commons.lang3.StringUtils; import org.prebid.server.exception.PreBidException; import org.prebid.server.model.CaseInsensitiveMultiMap; @@ -65,7 +66,7 @@ public List ipFrom(CaseInsensitiveMultiMap headers, String host) { return ipFrom(headers::get, host); } - public List ipFrom(io.vertx.core.MultiMap headers, String host) { + public List ipFrom(MultiMap headers, String host) { return ipFrom(headers::get, host); } diff --git a/src/main/java/org/prebid/server/auction/InterstitialProcessor.java b/src/main/java/org/prebid/server/auction/InterstitialProcessor.java index af31064f99d..7aa83960199 100644 --- a/src/main/java/org/prebid/server/auction/InterstitialProcessor.java +++ b/src/main/java/org/prebid/server/auction/InterstitialProcessor.java @@ -93,6 +93,7 @@ private ExtDeviceInt getExtDeviceInt(Device device) { } private static class InterstitialSize { + private static final List INTERSTITIAL_SIZES = new ArrayList<>(); static { @@ -360,8 +361,12 @@ private static InterstitialSize interstitialSize(Integer w, Integer h) { return new InterstitialSize(w, h); } - private static List getNestedSizes(double minWidth, double minHeight, double maxWidth, - double maxHeight, int count) { + private static List getNestedSizes(double minWidth, + double minHeight, + double maxWidth, + double maxHeight, + int count) { + return INTERSTITIAL_SIZES.stream() .filter(size -> isNested(size, minWidth, minHeight, maxWidth, maxHeight)) .limit(count) diff --git a/src/main/java/org/prebid/server/auction/OrtbTypesResolver.java b/src/main/java/org/prebid/server/auction/OrtbTypesResolver.java index 07ac2ce7015..7f9825b7071 100644 --- a/src/main/java/org/prebid/server/auction/OrtbTypesResolver.java +++ b/src/main/java/org/prebid/server/auction/OrtbTypesResolver.java @@ -34,7 +34,7 @@ public class OrtbTypesResolver { private static final Logger logger = LoggerFactory.getLogger(OrtbTypesResolver.class); - private static final ConditionalLogger ORTB_TYPES_RESOLVING_LOGGER = + private static final ConditionalLogger ortbTypesResolverLogger = new ConditionalLogger("ortb_resolving_warnings", logger); private static final String USER = "user"; @@ -350,7 +350,7 @@ private void mergeFpdFieldsToOrtb2(JsonNode bidderConfig, String source) { private void logDeprecatedFpdConfig(String source) { final String messagePart = source != null ? " on " + source : StringUtils.EMPTY; - ORTB_TYPES_RESOLVING_LOGGER.warn("Usage of deprecated FPD config path" + messagePart, logSamplingRate); + ortbTypesResolverLogger.warn("Usage of deprecated FPD config path" + messagePart, logSamplingRate); } private JsonNode updatedOrtb2Node(JsonNode configFpd, String fpdField, JsonNode configOrtb, String ortbField) { @@ -376,7 +376,7 @@ private void processWarnings(List resolverWarnings, if (CollectionUtils.isNotEmpty(resolverWarnings)) { warnings.addAll(updateWithWarningPrefix(resolverWarnings)); - ORTB_TYPES_RESOLVING_LOGGER.warn( + ortbTypesResolverLogger.warn( "WARNINGS: %s. \n Referer = %s and %s = %s".formatted( String.join("\n", resolverWarnings), StringUtils.isNotBlank(referer) ? referer : UNKNOWN_REFERER, diff --git a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java index 2896e153adf..4fb92910ebf 100644 --- a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java +++ b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java @@ -271,7 +271,7 @@ private String truncateKey(String key) { /** * Helper for targeting keywords. *

- * Brings a convenient way for creating keywords regarding to bidder and winning bid flag. + * Brings a convenient way for creating keywords regarding bidder and winning bid flag. */ private static class KeywordMap { diff --git a/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java b/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java index e9a7b7818a1..823c29d5bd2 100644 --- a/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java +++ b/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java @@ -150,7 +150,7 @@ private Future> makeBidderToBidCategory(List> categoryBidContextsPromise = Promise.promise(); - final CompositeFuture compositeFuture = CompositeFuture.join(bidderResponses.stream() + final CompositeFuture compositeFuture = Future.join(bidderResponses.stream() .flatMap(bidderResponse -> makeFetchCategoryFutures( bidderResponse, primaryAdServer, publisher, timeout, withCategory, translateCategories)) .collect(Collectors.toList())); @@ -729,14 +729,6 @@ private static RejectedBid of(String bidId, String bidder, String errorMessage) @Builder(toBuilder = true) private static class CategoryBidContext { - public static CategoryBidContext of(BidderBid bidderBid, String bidder, String category) { - return CategoryBidContext.builder() - .bidderBid(bidderBid) - .bidder(bidder) - .category(category) - .build(); - } - BidderBid bidderBid; String bidder; @@ -750,6 +742,14 @@ public static CategoryBidContext of(BidderBid bidderBid, String bidder, String c BigDecimal price; boolean satisfiedPriority; + + public static CategoryBidContext of(BidderBid bidderBid, String bidder, String category) { + return CategoryBidContext.builder() + .bidderBid(bidderBid) + .bidder(bidder) + .category(category) + .build(); + } } @Value(staticConstructor = "of") diff --git a/src/main/java/org/prebid/server/auction/model/BidRejectionTracker.java b/src/main/java/org/prebid/server/auction/model/BidRejectionTracker.java index c482c04738f..3ac6e29087c 100644 --- a/src/main/java/org/prebid/server/auction/model/BidRejectionTracker.java +++ b/src/main/java/org/prebid/server/auction/model/BidRejectionTracker.java @@ -23,7 +23,7 @@ public class BidRejectionTracker { private static final Logger logger = LoggerFactory.getLogger(BidRejectionTracker.class); - private static final ConditionalLogger BID_REJECTIONS_LOGGER = + private static final ConditionalLogger bidRejectionsLogger = new ConditionalLogger("multiple-bid-rejections", logger); private static final String MULTIPLE_REJECTIONS_WARNING_TEMPLATE = @@ -60,7 +60,7 @@ private void succeed(Bid bid) { if (involvedImpIds.contains(impId)) { succeededBidsIds.computeIfAbsent(impId, key -> new HashSet<>()).add(bidId); if (rejectedBids.containsKey(impId)) { - BID_REJECTIONS_LOGGER.warn( + bidRejectionsLogger.warn( INCONSISTENT_RESPONSES_WARNING_TEMPLATE.formatted(bidder, impId), logSamplingRate); } @@ -85,7 +85,7 @@ public void rejectBid(BidderBid bidderBid, BidRejectionReason reason) { private void reject(String impId, BidderBid bid, BidRejectionReason reason) { if (involvedImpIds.contains(impId)) { if (rejectedBids.containsKey(impId)) { - BID_REJECTIONS_LOGGER.warn( + bidRejectionsLogger.warn( MULTIPLE_REJECTIONS_WARNING_TEMPLATE.formatted(bidder, impId), logSamplingRate); } @@ -96,7 +96,7 @@ private void reject(String impId, BidderBid bid, BidRejectionReason reason) { final Set succeededBids = succeededBidsIds.get(impId); final boolean removed = bidId == null || succeededBids.remove(bidId); if (removed && !succeededBids.isEmpty()) { - BID_REJECTIONS_LOGGER.warn( + bidRejectionsLogger.warn( INCONSISTENT_RESPONSES_WARNING_TEMPLATE.formatted(bidder, impId), logSamplingRate); } diff --git a/src/main/java/org/prebid/server/auction/model/BidderPrivacyResult.java b/src/main/java/org/prebid/server/auction/model/BidderPrivacyResult.java index 460ab32be11..68366064c01 100644 --- a/src/main/java/org/prebid/server/auction/model/BidderPrivacyResult.java +++ b/src/main/java/org/prebid/server/auction/model/BidderPrivacyResult.java @@ -19,4 +19,3 @@ public class BidderPrivacyResult { boolean blockedAnalyticsByTcf; } - diff --git a/src/main/java/org/prebid/server/auction/model/BidderResponse.java b/src/main/java/org/prebid/server/auction/model/BidderResponse.java index ddec8e38bff..dc74bb043b7 100644 --- a/src/main/java/org/prebid/server/auction/model/BidderResponse.java +++ b/src/main/java/org/prebid/server/auction/model/BidderResponse.java @@ -1,14 +1,12 @@ package org.prebid.server.auction.model; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.bidder.model.BidderSeatBid; /** * Structure to pass {@link BidderSeatBid} along with bidder name and extra tracking data generated during bidding */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class BidderResponse { String bidder; diff --git a/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java b/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java index 0de6072134d..fae362f4115 100644 --- a/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java +++ b/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java @@ -1,11 +1,9 @@ package org.prebid.server.auction.model; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.bidder.model.BidderSeatBidInfo; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class BidderResponseInfo { String bidder; diff --git a/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java b/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java index 4b3dfa736f3..8f72806ae92 100644 --- a/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java +++ b/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java @@ -2,14 +2,12 @@ import com.iab.openrtb.request.Imp; import com.iab.openrtb.response.SeatBid; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class StoredResponseResult { List requiredRequestImps; diff --git a/src/main/java/org/prebid/server/auction/model/Tuple2.java b/src/main/java/org/prebid/server/auction/model/Tuple2.java index 16d641f40c3..560f5dab4fa 100644 --- a/src/main/java/org/prebid/server/auction/model/Tuple2.java +++ b/src/main/java/org/prebid/server/auction/model/Tuple2.java @@ -1,10 +1,8 @@ package org.prebid.server.auction.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class Tuple2 { L left; diff --git a/src/main/java/org/prebid/server/auction/model/Tuple3.java b/src/main/java/org/prebid/server/auction/model/Tuple3.java deleted file mode 100644 index bb26c145dc3..00000000000 --- a/src/main/java/org/prebid/server/auction/model/Tuple3.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.prebid.server.auction.model; - -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class Tuple3 { - - L left; - - M middle; - - R right; -} diff --git a/src/main/java/org/prebid/server/auction/model/WithPodErrors.java b/src/main/java/org/prebid/server/auction/model/WithPodErrors.java index 6238637afd2..aa6582ff39c 100644 --- a/src/main/java/org/prebid/server/auction/model/WithPodErrors.java +++ b/src/main/java/org/prebid/server/auction/model/WithPodErrors.java @@ -1,13 +1,11 @@ package org.prebid.server.auction.model; import com.iab.openrtb.request.video.PodError; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class WithPodErrors { T data; diff --git a/src/main/java/org/prebid/server/auction/model/debug/BidderDebugContext.java b/src/main/java/org/prebid/server/auction/model/debug/BidderDebugContext.java deleted file mode 100644 index f3d2e07dd1a..00000000000 --- a/src/main/java/org/prebid/server/auction/model/debug/BidderDebugContext.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.prebid.server.auction.model.debug; - -import lombok.Value; - -@Value(staticConstructor = "of") -public class BidderDebugContext { - - boolean debugEnabled; - - boolean shouldReturnAllBidStatuses; -} diff --git a/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java index fe366d54cbc..6d2ac3ee72d 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java @@ -132,7 +132,7 @@ public AmpRequestFactory(Ortb2RequestFactory ortb2RequestFactory, * Creates {@link AuctionContext} based on {@link RoutingContext}. */ public Future fromRequest(RoutingContext routingContext, long startTime) { - final String body = routingContext.getBodyAsString(); + final String body = routingContext.body().asString(); final AuctionContext initialAuctionContext = ortb2RequestFactory.createAuctionContext( Endpoint.openrtb2_amp, MetricName.amp); @@ -731,7 +731,7 @@ private ExtRequest extRequest(BidRequest bidRequest, } /** - * Creates updated with default values bidrequest.ext.targeting {@link ExtRequestTargeting} if at least one of it's + * Creates updated with default values bidrequest.ext.targeting {@link ExtRequestTargeting} if at least one of its * child properties is missed or entire targeting does not exist. */ private ExtRequestTargeting createTargetingWithDefaults(ExtRequestPrebid prebid, Account account) { diff --git a/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java index 0eb24dface1..1edf2fbed39 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java @@ -157,7 +157,7 @@ public Future enrichAuctionContext(AuctionContext initialContext } private String extractAndValidateBody(RoutingContext routingContext) { - final String body = routingContext.getBodyAsString(); + final String body = routingContext.body().asString(); if (body == null) { throw new InvalidRequestException("Incoming request has no body"); } diff --git a/src/main/java/org/prebid/server/auction/requestfactory/Ortb2ImplicitParametersResolver.java b/src/main/java/org/prebid/server/auction/requestfactory/Ortb2ImplicitParametersResolver.java index 5446da183ad..90c049db606 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/Ortb2ImplicitParametersResolver.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/Ortb2ImplicitParametersResolver.java @@ -369,7 +369,7 @@ private static Integer resolveLmtForIos14Minor0And1(Device device) { final String ifa = device.getIfa(); final Integer lmt = device.getLmt(); - if (StringUtils.isEmpty(ifa) || ifa.equals("00000000-0000-0000-0000-000000000000")) { + if (StringUtils.isEmpty(ifa) || "00000000-0000-0000-0000-000000000000".equals(ifa)) { return !Objects.equals(lmt, 1) ? 1 : null; } diff --git a/src/main/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactory.java index c9ec70e8116..5a122d5a64e 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactory.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactory.java @@ -88,8 +88,8 @@ public class Ortb2RequestFactory { private static final Logger logger = LoggerFactory.getLogger(Ortb2RequestFactory.class); - private static final ConditionalLogger EMPTY_ACCOUNT_LOGGER = new ConditionalLogger("empty_account", logger); - private static final ConditionalLogger UNKNOWN_ACCOUNT_LOGGER = new ConditionalLogger("unknown_account", logger); + private static final ConditionalLogger emptyAccountLogger = new ConditionalLogger("empty_account", logger); + private static final ConditionalLogger unknownAccountLogger = new ConditionalLogger("unknown_account", logger); private final int timeoutAdjustmentFactor; private final double logSamplingRate; @@ -472,7 +472,7 @@ private String validateIfAccountBlocklisted(String accountId) { private Future loadAccount(Timeout timeout, HttpRequestContext httpRequest, String accountId) { if (StringUtils.isBlank(accountId)) { - EMPTY_ACCOUNT_LOGGER.warn(accountErrorMessage("Account not specified", httpRequest), logSamplingRate); + emptyAccountLogger.warn(accountErrorMessage("Account not specified", httpRequest), logSamplingRate); } return applicationSettings.getAccountById(accountId, timeout) @@ -528,7 +528,7 @@ private Future wrapFailure(Throwable exception, String accountId, HttpR if (exception instanceof UnauthorizedAccountException) { return Future.failedFuture(exception); } else if (exception instanceof PreBidException) { - UNKNOWN_ACCOUNT_LOGGER.warn(accountErrorMessage(exception.getMessage(), httpRequest), 100); + unknownAccountLogger.warn(accountErrorMessage(exception.getMessage(), httpRequest), 100); } else { metrics.updateAccountRequestRejectedByFailedFetch(accountId); logger.warn("Error occurred while fetching account: {}", exception.getMessage()); diff --git a/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java index 4493fb9601e..2e41fd97a35 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java @@ -166,7 +166,7 @@ private WithPodErrors removeEmptyEids(WithPodErrors requ } private String extractAndValidateBody(RoutingContext routingContext) { - final String body = routingContext.getBodyAsString(); + final String body = routingContext.body().asString(); if (body == null) { throw new InvalidRequestException("Incoming request has no body"); } diff --git a/src/main/java/org/prebid/server/bidder/BidderCatalog.java b/src/main/java/org/prebid/server/bidder/BidderCatalog.java index fd2cb0dd930..d8eb543780b 100644 --- a/src/main/java/org/prebid/server/bidder/BidderCatalog.java +++ b/src/main/java/org/prebid/server/bidder/BidderCatalog.java @@ -136,7 +136,7 @@ public boolean isDebugAllowed(String name) { /** * Returns an {@link BidderInfo} registered by the given name or null if there is none. *

- * Therefore this method should be called only for names that previously passed validity check + * Therefore, this method should be called only for names that previously passed validity check * through calling {@link #isValidName(String)}. */ public BidderInfo bidderInfoByName(String name) { @@ -149,7 +149,7 @@ public BidderInfo bidderInfoByName(String name) { /** * Returns an VendorId registered by the given name or null if there is none. *

- * Therefore this method should be called only for names that previously passed validity check + * Therefore, this method should be called only for names that previously passed validity check * through calling {@link #isValidName(String)}. */ public Integer vendorIdByName(String name) { @@ -217,7 +217,7 @@ public Set usersyncReadyBidders() { /** * Returns an {@link Bidder} registered by the given name or null if there is none. *

- * Therefore this method should be called only for names that previously passed validity check + * Therefore, this method should be called only for names that previously passed validity check * through calling {@link #isValidName(String)}. */ public Bidder bidderByName(String name) { diff --git a/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java b/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java index 4872c6fd991..3e37eb685ca 100644 --- a/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java +++ b/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java @@ -48,7 +48,7 @@ MultiMap enrichHeaders( BidderAliases aliases, BidRequest bidRequest) { - // some bidders has headers on class level, so we create copy to not affect them + // some bidders have headers on class level, so we create copy to not affect them final MultiMap bidderRequestHeadersCopy = copyMultiMap(bidderRequestHeaders); addOriginalRequestHeaders(bidderRequestHeadersCopy, originalRequestHeaders); diff --git a/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java b/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java index d3b9d452eac..f2aa98f0a37 100644 --- a/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java +++ b/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java @@ -4,7 +4,6 @@ import io.netty.channel.ConnectTimeoutException; import io.netty.handler.codec.http.HttpHeaderValues; import io.netty.handler.codec.http.HttpResponseStatus; -import io.vertx.core.CompositeFuture; import io.vertx.core.Future; import io.vertx.core.MultiMap; import org.apache.commons.collections4.CollectionUtils; @@ -131,8 +130,8 @@ public Future requestBids(Bidder bidder, .map(httpCall -> processHttpCall(bidder, bidRequest, resultBuilder, httpCall))) .toList(); - return CompositeFuture.any( - CompositeFuture.join(new ArrayList<>(httpRequestFutures)), + return Future.any( + Future.join(httpRequestFutures), completionTracker.future()) .map(ignored -> resultBuilder.toBidderSeatBid(debugEnabled)) .onSuccess(seatBid -> bidRejectionTracker.restoreFromRejection(seatBid.getBids())); @@ -322,7 +321,7 @@ private static CompositeBidderResponse makeBids(Bidder bidder, /** * Replaces body of {@link HttpResponse} with empty JSON object if response HTTP status code is equal to 204. *

- * Note: this will safe making bids by bidders from JSON parsing error. + * Note: this will save making bids by bidders from JSON parsing error. */ private static BidderCall toHttpCallWithSafeResponseBody(BidderCall httpCall) { final HttpResponse response = httpCall.getResponse(); diff --git a/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java b/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java index 1d56b5e8bcb..d8c6d0b615c 100644 --- a/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java +++ b/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java @@ -2,14 +2,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AdgenerationResponse { String locationid; diff --git a/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java b/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java index 29ee5177d40..4c72fd97760 100644 --- a/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java +++ b/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java @@ -127,7 +127,7 @@ public Result> makeBids(BidderCall httpCall, BidRequ } final Bid bid = optionalBid.get(); - final AdheseOriginData originData = toObjectOfType(bid.getExt().get("adhese"), AdheseOriginData.class); + final AdheseOriginData originData = toAdheseOriginData(bid.getExt().get("adhese")); final Bid modifiedBid = bid.toBuilder() .ext(mapper.mapper().valueToTree(originData)) // unwrap from "adhese" .build(); @@ -151,9 +151,9 @@ private static Optional getBid(BidResponse bidResponse) { .findFirst(); } - private T toObjectOfType(JsonNode jsonNode, Class clazz) { + private AdheseOriginData toAdheseOriginData(JsonNode jsonNode) { try { - return mapper.mapper().treeToValue(jsonNode, clazz); + return mapper.mapper().treeToValue(jsonNode, AdheseOriginData.class); } catch (JsonProcessingException e) { throw new PreBidException(e.getMessage(), e); } diff --git a/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java b/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java index 2719b6d8f54..10ad9caac4a 100644 --- a/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java +++ b/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.adhese.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AdheseOriginData { String priority; diff --git a/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java b/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java index 44c3eaf45ab..c50b89b3417 100644 --- a/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java +++ b/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java @@ -218,31 +218,31 @@ private static BidRequest createBidRequest(List imps, public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - return Result.withValues(extractBids(httpCall.getRequest().getPayload(), bidResponse)); + return Result.withValues(extractBids(bidResponse)); } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - private static List extractBids(BidRequest bidRequest, BidResponse bidResponse) { + private static List extractBids(BidResponse bidResponse) { if (bidResponse == null || bidResponse.getSeatbid() == null) { return Collections.emptyList(); } if (bidResponse.getSeatbid().size() != 1) { throw new PreBidException("Invalid SeatBids count: " + bidResponse.getSeatbid().size()); } - return bidsFromResponse(bidRequest, bidResponse); + return bidsFromResponse(bidResponse); } - private static List bidsFromResponse(BidRequest bidRequest, BidResponse bidResponse) { + private static List bidsFromResponse(BidResponse bidResponse) { return bidResponse.getSeatbid().stream() .map(SeatBid::getBid) .flatMap(Collection::stream) - .map(bid -> makeBidderBid(bid, bidRequest.getImp(), bidResponse.getCur())) + .map(bid -> makeBidderBid(bid, bidResponse.getCur())) .toList(); } - private static BidderBid makeBidderBid(Bid bid, List imps, String currency) { + private static BidderBid makeBidderBid(Bid bid, String currency) { final Optional mfSuffix = getMfSuffix(bid.getImpid()); final Bid updatedBid = mfSuffix.map(suffix -> removeMfSuffixFromImpId(bid, suffix)).orElse(bid); diff --git a/src/main/java/org/prebid/server/bidder/adocean/AdoceanBidder.java b/src/main/java/org/prebid/server/bidder/adocean/AdoceanBidder.java index 29c0a385d69..63ad320ca4e 100644 --- a/src/main/java/org/prebid/server/bidder/adocean/AdoceanBidder.java +++ b/src/main/java/org/prebid/server/bidder/adocean/AdoceanBidder.java @@ -123,14 +123,14 @@ private boolean addRequestAndCheckIfDuplicates(List> httpReque final List queryParams = uriBuilder.getQueryParams(); final String masterId = queryParams.stream() - .filter(param -> param.getName().equals("id")) + .filter(param -> "id".equals(param.getName())) .findFirst() .map(NameValuePair::getValue) .orElse(null); if (masterId != null && masterId.equals(extImpAdocean.getMasterId())) { final boolean isExistingSlaveId = queryParams.stream() - .filter(param -> param.getName().equals("aid")) + .filter(param -> "aid".equals(param.getName())) .map(param -> param.getValue().split(":")[0]) .anyMatch(slaveId -> slaveId.equals(extImpAdocean.getSlaveId())); if (isExistingSlaveId) { @@ -306,7 +306,7 @@ public Result> makeBids(BidderCall httpCall, BidRequest bi } final Map auctionIds = params != null ? params.stream() - .filter(param -> param.getName().equals("aid")) + .filter(param -> "aid".equals(param.getName())) .map(param -> param.getValue().split(":")) .collect(Collectors.toMap(name -> name[0], value -> value[1])) : null; @@ -319,7 +319,7 @@ public Result> makeBids(BidderCall httpCall, BidRequest bi } final List bidderBids = adoceanResponses.stream() - .filter(adoceanResponse -> !adoceanResponse.getError().equals("true")) + .filter(adoceanResponse -> !"true".equals(adoceanResponse.getError())) .filter(adoceanResponse -> StringUtils.isNotBlank(MapUtils.getString(auctionIds, adoceanResponse.getId()))) .map(adoceanResponse -> BidderBid.of(createBid(auctionIds, adoceanResponse), BidType.banner, diff --git a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java index ba9df1a3034..d773617f068 100644 --- a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java +++ b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.adoppler.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AdopplerResponseAdsExt { AdopplerResponseVideoAdsExt video; diff --git a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java index 7165870d695..090ad5faaed 100644 --- a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java +++ b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.adoppler.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AdopplerResponseExt { AdopplerResponseAdsExt ads; diff --git a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java index 8ab0c5bee59..db64e1447e4 100644 --- a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java +++ b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.adoppler.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AdopplerResponseVideoAdsExt { Integer duration; diff --git a/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java b/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java index a7bb6b85609..0880a2d667c 100644 --- a/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java +++ b/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java @@ -8,7 +8,7 @@ import java.util.List; @Builder(toBuilder = true) -@Value(staticConstructor = "of") +@Value public class AdQueryDataResponse { @JsonProperty("requestId") diff --git a/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryResponse.java b/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryResponse.java index 0f97f113d7d..ca8fc5dbb81 100644 --- a/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryResponse.java +++ b/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryResponse.java @@ -7,4 +7,3 @@ public class AdQueryResponse { AdQueryDataResponse data; } - diff --git a/src/main/java/org/prebid/server/bidder/advangelists/AdvangelistsBidder.java b/src/main/java/org/prebid/server/bidder/advangelists/AdvangelistsBidder.java index 0075573bbc8..5b9d825be63 100644 --- a/src/main/java/org/prebid/server/bidder/advangelists/AdvangelistsBidder.java +++ b/src/main/java/org/prebid/server/bidder/advangelists/AdvangelistsBidder.java @@ -233,4 +233,3 @@ private static BidType getBidType(String impId, List imps) { return BidType.banner; } } - diff --git a/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java b/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java index 1cd75e187bd..33f9025d415 100644 --- a/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java +++ b/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.aja.proto; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAja { @JsonProperty("asi") diff --git a/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java b/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java index b2b02f4b3bb..301f1fec17d 100644 --- a/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java +++ b/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java @@ -50,8 +50,6 @@ public class AlgorixBidder implements Bidder { private static final String URL_SID_MACRO = "{{SID}}"; private static final String URL_TOKEN_MACRO = "{{TOKEN}}"; - private static final int FIRST_INDEX = 0; - private final String endpointUrl; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/bidder/amx/AmxBidder.java b/src/main/java/org/prebid/server/bidder/amx/AmxBidder.java index 2d587b37ab6..f9d309a3495 100644 --- a/src/main/java/org/prebid/server/bidder/amx/AmxBidder.java +++ b/src/main/java/org/prebid/server/bidder/amx/AmxBidder.java @@ -233,4 +233,3 @@ private ObjectNode resolveBidExtPrebid(String demandSource, List aDomain return bidExtPrebidCasted.set("meta", mapper.mapper().valueToTree(extBidPrebidMeta)); } } - diff --git a/src/main/java/org/prebid/server/bidder/appnexus/AppnexusBidder.java b/src/main/java/org/prebid/server/bidder/appnexus/AppnexusBidder.java index e559d0c8412..06a37460655 100644 --- a/src/main/java/org/prebid/server/bidder/appnexus/AppnexusBidder.java +++ b/src/main/java/org/prebid/server/bidder/appnexus/AppnexusBidder.java @@ -26,11 +26,11 @@ import org.prebid.server.bidder.appnexus.proto.AppnexusBidExtAppnexus; import org.prebid.server.bidder.appnexus.proto.AppnexusBidExtCreative; import org.prebid.server.bidder.appnexus.proto.AppnexusBidExtVideo; +import org.prebid.server.bidder.appnexus.proto.AppnexusExtImp; import org.prebid.server.bidder.appnexus.proto.AppnexusImpExt; import org.prebid.server.bidder.appnexus.proto.AppnexusImpExtAppnexus; import org.prebid.server.bidder.appnexus.proto.AppnexusKeyVal; import org.prebid.server.bidder.appnexus.proto.AppnexusReqExtAppnexus; -import org.prebid.server.bidder.appnexus.proto.AppnexusExtImp; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderCall; import org.prebid.server.bidder.model.BidderError; diff --git a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java index d1d515c506e..971850daeda 100644 --- a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java +++ b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.appnexus.proto; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AppnexusBidExtCreative { AppnexusBidExtVideo video; diff --git a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java index b27703a2d84..bbfb38e5883 100644 --- a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java +++ b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.appnexus.proto; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AppnexusBidExtVideo { Integer duration; diff --git a/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java b/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java index 7440b4cd7d1..8b7d2634291 100644 --- a/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java +++ b/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java @@ -1,9 +1,7 @@ package org.prebid.server.bidder.audiencenetwork.proto; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor @Value public class AudienceNetworkAdMarkup { diff --git a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java index 3c740531147..32484c75e90 100644 --- a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java +++ b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.avocet.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AvocetBidExtension { Integer duration; diff --git a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java index 72a5cc4cf7c..75d5a91835d 100644 --- a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java +++ b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.avocet.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class AvocetResponseExt { AvocetBidExtension avocet; diff --git a/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java b/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java index d5f2a867f8c..265ce948214 100644 --- a/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java +++ b/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java @@ -47,9 +47,8 @@ public Result>> makeHttpRequests(BidRequest request final List> httpRequests = new ArrayList<>(); for (Imp imp : request.getImp()) { - final ExtImpAxis extImpAxis; try { - extImpAxis = parseImpExt(imp); + validateImpExt(imp); } catch (PreBidException e) { continue; } @@ -59,9 +58,9 @@ public Result>> makeHttpRequests(BidRequest request return Result.withValues(httpRequests); } - private ExtImpAxis parseImpExt(Imp imp) { + private void validateImpExt(Imp imp) { try { - return mapper.mapper().convertValue(imp.getExt(), ADMAN_EXT_TYPE_REFERENCE).getBidder(); + mapper.mapper().convertValue(imp.getExt(), ADMAN_EXT_TYPE_REFERENCE); } catch (IllegalArgumentException e) { throw new PreBidException(e.getMessage()); } @@ -132,4 +131,3 @@ private BidType getBidType(String impId, List imps) { throw new PreBidException("Failed to find impression \"%s\"".formatted(impId)); } } - diff --git a/src/main/java/org/prebid/server/bidder/axonix/AxonixBidder.java b/src/main/java/org/prebid/server/bidder/axonix/AxonixBidder.java index 7bbc9cb1463..e7bbf291e38 100644 --- a/src/main/java/org/prebid/server/bidder/axonix/AxonixBidder.java +++ b/src/main/java/org/prebid/server/bidder/axonix/AxonixBidder.java @@ -120,4 +120,3 @@ private static BidType getMediaType(String impId, List imps) { return BidType.banner; } } - diff --git a/src/main/java/org/prebid/server/bidder/beachfront/BeachfrontBidder.java b/src/main/java/org/prebid/server/bidder/beachfront/BeachfrontBidder.java index f9bdfa88e78..79011887eb9 100644 --- a/src/main/java/org/prebid/server/bidder/beachfront/BeachfrontBidder.java +++ b/src/main/java/org/prebid/server/bidder/beachfront/BeachfrontBidder.java @@ -339,7 +339,7 @@ private List getVideoRequests(BidRequest bidRequest, .appId(appId); final String responseType; - if (videoResponseType != null && videoResponseType.equals(NURL_VIDEO_TYPE)) { + if (NURL_VIDEO_TYPE.equals(videoResponseType)) { requestBuilder.isPrebid(true); responseType = NURL_VIDEO_TYPE; } else { @@ -364,7 +364,7 @@ private List getVideoRequests(BidRequest bidRequest, if (devicetype == null || devicetype == 0) { deviceBuilder.devicetype(bidRequest.getSite() != null ? 2 : 1); } - if (StringUtils.isBlank(device.getIp()) && responseType.equals(ADM_VIDEO_TYPE)) { + if (StringUtils.isBlank(device.getIp()) && ADM_VIDEO_TYPE.equals(responseType)) { deviceBuilder.ip(FAKE_IP); } diff --git a/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSize.java b/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSize.java index c60ae7ce809..004b140448f 100644 --- a/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSize.java +++ b/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSize.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.beachfront.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class BeachfrontSize { Integer w; diff --git a/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSlot.java b/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSlot.java index 899b8315fd3..178542d294f 100644 --- a/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSlot.java +++ b/src/main/java/org/prebid/server/bidder/beachfront/model/BeachfrontSlot.java @@ -1,13 +1,11 @@ package org.prebid.server.bidder.beachfront.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class BeachfrontSlot { String slot; diff --git a/src/main/java/org/prebid/server/bidder/dxkulture/DxKultureBidder.java b/src/main/java/org/prebid/server/bidder/dxkulture/DxKultureBidder.java index 77ead1a4994..ad3c146795d 100644 --- a/src/main/java/org/prebid/server/bidder/dxkulture/DxKultureBidder.java +++ b/src/main/java/org/prebid/server/bidder/dxkulture/DxKultureBidder.java @@ -124,14 +124,12 @@ public Result> makeBids(BidderCall httpCall, BidRequ } final List errors = new ArrayList<>(); - final List bids = extractBids(httpCall.getRequest().getPayload(), bidResponse, errors); + final List bids = extractBids(bidResponse, errors); return Result.of(bids, errors); } - private static List extractBids(BidRequest bidRequest, - BidResponse bidResponse, - List errors) { + private static List extractBids(BidResponse bidResponse, List errors) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Collections.emptyList(); } @@ -142,12 +140,12 @@ private static List extractBids(BidRequest bidRequest, .filter(Objects::nonNull) .flatMap(Collection::stream) .filter(Objects::nonNull) - .map(bid -> makeBidderBid(bid, bidRequest.getImp(), bidResponse.getCur(), errors)) + .map(bid -> makeBidderBid(bid, bidResponse.getCur(), errors)) .filter(Objects::nonNull) .toList(); } - private static BidderBid makeBidderBid(Bid bid, List imps, String currency, List errors) { + private static BidderBid makeBidderBid(Bid bid, String currency, List errors) { try { return BidderBid.of(bid, resolveBidType(bid), currency); } catch (PreBidException e) { diff --git a/src/main/java/org/prebid/server/bidder/eplanning/model/CleanStepName.java b/src/main/java/org/prebid/server/bidder/eplanning/model/CleanStepName.java index 110fb78e302..988727a5198 100644 --- a/src/main/java/org/prebid/server/bidder/eplanning/model/CleanStepName.java +++ b/src/main/java/org/prebid/server/bidder/eplanning/model/CleanStepName.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.eplanning.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CleanStepName { String expression; diff --git a/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponse.java b/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponse.java index 569606a43c2..d4d2c52de43 100644 --- a/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponse.java +++ b/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponse.java @@ -1,13 +1,11 @@ package org.prebid.server.bidder.eplanning.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class HbResponse { @JsonProperty("sp") diff --git a/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponseSpace.java b/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponseSpace.java index d40f4fe0565..06e42089cd8 100644 --- a/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponseSpace.java +++ b/src/main/java/org/prebid/server/bidder/eplanning/model/HbResponseSpace.java @@ -1,13 +1,11 @@ package org.prebid.server.bidder.eplanning.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class HbResponseSpace { @JsonProperty("k") diff --git a/src/main/java/org/prebid/server/bidder/epsilon/EpsilonBidder.java b/src/main/java/org/prebid/server/bidder/epsilon/EpsilonBidder.java index 77ec518e216..bc4625ba905 100644 --- a/src/main/java/org/prebid/server/bidder/epsilon/EpsilonBidder.java +++ b/src/main/java/org/prebid/server/bidder/epsilon/EpsilonBidder.java @@ -104,7 +104,6 @@ private BidRequest createOutgoingRequest(BidRequest bidRequest) { final String siteId = extImp.getSiteId(); final Site requestSite = bidRequest.getSite(); final App requestApp = bidRequest.getApp(); - final List cur = bidRequest.getCur(); return bidRequest.toBuilder() .site(updateSite(requestSite, siteId)) .app(requestSite == null ? updateApp(requestApp, siteId) : requestApp) diff --git a/src/main/java/org/prebid/server/bidder/gamma/GammaBidder.java b/src/main/java/org/prebid/server/bidder/gamma/GammaBidder.java index c92786904f0..f2b65b90db7 100644 --- a/src/main/java/org/prebid/server/bidder/gamma/GammaBidder.java +++ b/src/main/java/org/prebid/server/bidder/gamma/GammaBidder.java @@ -271,4 +271,3 @@ private static Bid convertBid(GammaBid gammaBid, BidType bidType) { return bid; } } - diff --git a/src/main/java/org/prebid/server/bidder/grid/model/request/ExtImp.java b/src/main/java/org/prebid/server/bidder/grid/model/request/ExtImp.java index 93be9084d49..86dc3b4f2eb 100644 --- a/src/main/java/org/prebid/server/bidder/grid/model/request/ExtImp.java +++ b/src/main/java/org/prebid/server/bidder/grid/model/request/ExtImp.java @@ -22,4 +22,3 @@ public class ExtImp { ObjectNode context; } - diff --git a/src/main/java/org/prebid/server/bidder/grid/model/request/KeywordSegment.java b/src/main/java/org/prebid/server/bidder/grid/model/request/KeywordSegment.java index aee2d845311..0d9f6d28d82 100644 --- a/src/main/java/org/prebid/server/bidder/grid/model/request/KeywordSegment.java +++ b/src/main/java/org/prebid/server/bidder/grid/model/request/KeywordSegment.java @@ -9,4 +9,3 @@ public class KeywordSegment { String value; } - diff --git a/src/main/java/org/prebid/server/bidder/gumgum/GumgumBidder.java b/src/main/java/org/prebid/server/bidder/gumgum/GumgumBidder.java index cecb9e3c473..dbbca22ccfe 100644 --- a/src/main/java/org/prebid/server/bidder/gumgum/GumgumBidder.java +++ b/src/main/java/org/prebid/server/bidder/gumgum/GumgumBidder.java @@ -13,7 +13,6 @@ import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.prebid.server.bidder.Bidder; @@ -36,7 +35,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -178,14 +176,6 @@ private Video resolveVideo(Video video, String irisId) { return video.toBuilder().ext(videoExt).build(); } - private static boolean anyOfNull(Integer... numbers) { - return Arrays.stream(ArrayUtils.nullToEmpty(numbers)).anyMatch(GumgumBidder::isNullOrZero); - } - - private static boolean isNullOrZero(Integer number) { - return number == null || number == 0; - } - private static Site modifySite(Site requestSite, String zone, BigInteger pubId) { if (requestSite == null) { return null; @@ -251,4 +241,3 @@ private static String resolveAdm(String bidAdm, BigDecimal price) { return StringUtils.isNotBlank(bidAdm) ? bidAdm.replace("${AUCTION_PRICE}", String.valueOf(price)) : bidAdm; } } - diff --git a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java index 1c4ad601fce..ebc2b56987e 100644 --- a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java +++ b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java @@ -175,9 +175,9 @@ private Regs makeRegs(com.iab.openrtb.request.Regs regs) { .orElseGet(() -> Regs.of(null)); } - private Geo makeGeo(com.iab.openrtb.request.Device device) { + private Geo makeGeo(Device device) { return Optional.ofNullable(device) - .map(com.iab.openrtb.request.Device::getGeo) + .map(Device::getGeo) .map(geo -> Geo.of(geo.getLon(), geo.getLat(), geo.getAccuracy(), geo.getLastfix())) .orElse(null); } diff --git a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiNetworkBuilder.java b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiNetworkBuilder.java index 2ffc3ae0866..907a789c1a7 100644 --- a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiNetworkBuilder.java +++ b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiNetworkBuilder.java @@ -1,5 +1,6 @@ package org.prebid.server.bidder.huaweiads; +import com.iab.openrtb.request.Device; import org.apache.commons.lang3.StringUtils; import org.prebid.server.bidder.huaweiads.model.request.CellInfo; import org.prebid.server.bidder.huaweiads.model.request.Network; @@ -11,7 +12,7 @@ public class HuaweiNetworkBuilder { private static final int DEFAULT_UNKNOWN_NETWORK_TYPE = 0; - public Network build(com.iab.openrtb.request.Device device) { + public Network build(Device device) { if (device == null) { return null; } diff --git a/src/main/java/org/prebid/server/bidder/huaweiads/model/response/MonitorEventType.java b/src/main/java/org/prebid/server/bidder/huaweiads/model/response/MonitorEventType.java index e74273a7046..63308a8674e 100644 --- a/src/main/java/org/prebid/server/bidder/huaweiads/model/response/MonitorEventType.java +++ b/src/main/java/org/prebid/server/bidder/huaweiads/model/response/MonitorEventType.java @@ -45,4 +45,3 @@ private static Map stringToEventTypeMap() { Map.entry("win", WIN)); } } - diff --git a/src/main/java/org/prebid/server/bidder/improvedigital/proto/ImprovedigitalBidExt.java b/src/main/java/org/prebid/server/bidder/improvedigital/proto/ImprovedigitalBidExt.java index 478c2409e0b..e603a254edc 100644 --- a/src/main/java/org/prebid/server/bidder/improvedigital/proto/ImprovedigitalBidExt.java +++ b/src/main/java/org/prebid/server/bidder/improvedigital/proto/ImprovedigitalBidExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.improvedigital.proto; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ImprovedigitalBidExt { ImprovedigitalBidExtImprovedigital improvedigital; diff --git a/src/main/java/org/prebid/server/bidder/ix/model/response/NativeV11Wrapper.java b/src/main/java/org/prebid/server/bidder/ix/model/response/NativeV11Wrapper.java index f4c64f411d8..7444120b2ee 100644 --- a/src/main/java/org/prebid/server/bidder/ix/model/response/NativeV11Wrapper.java +++ b/src/main/java/org/prebid/server/bidder/ix/model/response/NativeV11Wrapper.java @@ -2,14 +2,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.iab.openrtb.response.Response; -import lombok.AllArgsConstructor; import lombok.Value; /** * Native 1.2 to 1.1 tracker compatibility handling */ -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class NativeV11Wrapper { @JsonProperty("native") diff --git a/src/main/java/org/prebid/server/bidder/mabidder/response/Meta.java b/src/main/java/org/prebid/server/bidder/mabidder/response/Meta.java index 9ba8b024ae1..7434b83c4ce 100644 --- a/src/main/java/org/prebid/server/bidder/mabidder/response/Meta.java +++ b/src/main/java/org/prebid/server/bidder/mabidder/response/Meta.java @@ -12,4 +12,3 @@ public class Meta { List adDomains; } - diff --git a/src/main/java/org/prebid/server/bidder/mgid/MgidBidder.java b/src/main/java/org/prebid/server/bidder/mgid/MgidBidder.java index 180b99d39ff..637a122bad2 100644 --- a/src/main/java/org/prebid/server/bidder/mgid/MgidBidder.java +++ b/src/main/java/org/prebid/server/bidder/mgid/MgidBidder.java @@ -104,7 +104,7 @@ private static String getCur(ExtImpMgid impMgid) { } private static String currencyValueOrNull(String value) { - return StringUtils.isNotBlank(value) && !value.equals("USD") ? value : null; + return StringUtils.isNotBlank(value) && !"USD".equals(value) ? value : null; } private static BigDecimal getBidFloor(ExtImpMgid impMgid) { @@ -169,4 +169,3 @@ private ExtBidMgid getBidExt(Bid bid) { } } } - diff --git a/src/main/java/org/prebid/server/bidder/mgid/model/ExtBidMgid.java b/src/main/java/org/prebid/server/bidder/mgid/model/ExtBidMgid.java index bcc9f57c099..48563ed6ab9 100644 --- a/src/main/java/org/prebid/server/bidder/mgid/model/ExtBidMgid.java +++ b/src/main/java/org/prebid/server/bidder/mgid/model/ExtBidMgid.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.mgid.model; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.proto.openrtb.ext.response.BidType; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtBidMgid { BidType crtype; diff --git a/src/main/java/org/prebid/server/bidder/mgidx/MgidxBidder.java b/src/main/java/org/prebid/server/bidder/mgidx/MgidxBidder.java index bb01db86928..c5b6663315a 100644 --- a/src/main/java/org/prebid/server/bidder/mgidx/MgidxBidder.java +++ b/src/main/java/org/prebid/server/bidder/mgidx/MgidxBidder.java @@ -108,14 +108,14 @@ private HttpRequest makeHttpRequest(BidRequest request, Imp imp) { public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - final List bids = extractBids(httpCall.getRequest().getPayload(), bidResponse); + final List bids = extractBids(bidResponse); return Result.withValues(bids); } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - private List extractBids(BidRequest bidRequest, BidResponse bidResponse) { + private List extractBids(BidResponse bidResponse) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Collections.emptyList(); } diff --git a/src/main/java/org/prebid/server/bidder/mobilefuse/MobilefuseBidder.java b/src/main/java/org/prebid/server/bidder/mobilefuse/MobilefuseBidder.java index c0e4dc9e292..5806faace29 100644 --- a/src/main/java/org/prebid/server/bidder/mobilefuse/MobilefuseBidder.java +++ b/src/main/java/org/prebid/server/bidder/mobilefuse/MobilefuseBidder.java @@ -77,7 +77,7 @@ private Imp modifyImp(Imp imp) { final ExtImpMobilefuse impExt = parseImpExt(imp); final ObjectNode skadn = parseSkadn(imp.getExt()); return imp.toBuilder() - .tagid(Objects.toString(impExt.getPlacementId(), "0")) + .tagid(Objects.toString(impExt != null ? impExt.getPlacementId() : null, "0")) .ext(skadn != null ? mapper.mapper().createObjectNode().set(SKADN_PROPERTY_NAME, skadn) : null) .build(); } diff --git a/src/main/java/org/prebid/server/bidder/model/BidderCall.java b/src/main/java/org/prebid/server/bidder/model/BidderCall.java index 4254801a6e4..a62a6c466c5 100644 --- a/src/main/java/org/prebid/server/bidder/model/BidderCall.java +++ b/src/main/java/org/prebid/server/bidder/model/BidderCall.java @@ -5,7 +5,7 @@ import lombok.Value; /** - * Packages together the fields needed to make an http request. + * Packages together the fields needed to make a http request. */ @Value @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/src/main/java/org/prebid/server/bidder/model/BidderCallType.java b/src/main/java/org/prebid/server/bidder/model/BidderCallType.java index 8b5b5b0603c..72a77b1fca1 100644 --- a/src/main/java/org/prebid/server/bidder/model/BidderCallType.java +++ b/src/main/java/org/prebid/server/bidder/model/BidderCallType.java @@ -10,4 +10,3 @@ public enum BidderCallType { @JsonProperty("stored-bid-response-call") STORED_BID_RESPONSE } - diff --git a/src/main/java/org/prebid/server/bidder/model/BidderError.java b/src/main/java/org/prebid/server/bidder/model/BidderError.java index 0873570a6d3..9475a13e1de 100644 --- a/src/main/java/org/prebid/server/bidder/model/BidderError.java +++ b/src/main/java/org/prebid/server/bidder/model/BidderError.java @@ -77,9 +77,9 @@ public enum Type { /** * Covers the case where a bidder failed to generate any http requests to get bids, but did not generate any - * error messages. This should not happen in practice and will signal that an bidder is poorly coded. - * If there was something wrong with a request such that an bidder could not generate a bid, then it should - * generate an error explaining the deficiency. Otherwise it will be extremely difficult to debug the reason + * error messages. This should not happen in practice and will signal that a bidder is poorly coded. + * If there was something wrong with a request such that a bidder could not generate a bid, then it should + * generate an error explaining the deficiency. Otherwise, it will be extremely difficult to debug the reason * why a bidder is not bidding. */ failed_to_request_bids(4), diff --git a/src/main/java/org/prebid/server/bidder/model/HttpRequest.java b/src/main/java/org/prebid/server/bidder/model/HttpRequest.java index d8ae76eeae9..872675e88d3 100644 --- a/src/main/java/org/prebid/server/bidder/model/HttpRequest.java +++ b/src/main/java/org/prebid/server/bidder/model/HttpRequest.java @@ -8,7 +8,7 @@ import java.util.Set; /** - * Packages together the fields needed to make an http request. + * Packages together the fields needed to make a http request. */ @Builder(toBuilder = true) @Value diff --git a/src/main/java/org/prebid/server/bidder/model/HttpResponse.java b/src/main/java/org/prebid/server/bidder/model/HttpResponse.java index 3635b9c87c6..b502429cb7b 100644 --- a/src/main/java/org/prebid/server/bidder/model/HttpResponse.java +++ b/src/main/java/org/prebid/server/bidder/model/HttpResponse.java @@ -1,14 +1,12 @@ package org.prebid.server.bidder.model; import io.vertx.core.MultiMap; -import lombok.AllArgsConstructor; import lombok.Value; /** * Packages together information from the server's http response. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class HttpResponse { int statusCode; diff --git a/src/main/java/org/prebid/server/bidder/model/ImpWithExt.java b/src/main/java/org/prebid/server/bidder/model/ImpWithExt.java deleted file mode 100644 index f62f435375c..00000000000 --- a/src/main/java/org/prebid/server/bidder/model/ImpWithExt.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.prebid.server.bidder.model; - -import com.iab.openrtb.request.Imp; -import lombok.Value; - -@Value(staticConstructor = "of") -public class ImpWithExt { - - Imp imp; - - T impExt; -} diff --git a/src/main/java/org/prebid/server/bidder/model/Result.java b/src/main/java/org/prebid/server/bidder/model/Result.java index 1f1ae2ef216..a5ce54ecb75 100644 --- a/src/main/java/org/prebid/server/bidder/model/Result.java +++ b/src/main/java/org/prebid/server/bidder/model/Result.java @@ -1,6 +1,5 @@ package org.prebid.server.bidder.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Collections; @@ -9,8 +8,7 @@ /** * Defines generic result that might bear error alongside. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class Result { T value; diff --git a/src/main/java/org/prebid/server/bidder/nextmillennium/NextMillenniumBidder.java b/src/main/java/org/prebid/server/bidder/nextmillennium/NextMillenniumBidder.java index 84c3f68e8bb..426e287190e 100644 --- a/src/main/java/org/prebid/server/bidder/nextmillennium/NextMillenniumBidder.java +++ b/src/main/java/org/prebid/server/bidder/nextmillennium/NextMillenniumBidder.java @@ -91,7 +91,7 @@ private BidRequest updateBidRequest(BidRequest bidRequest, ExtImpNextMillennium .storedrequest(storedRequest) .build(); - final ExtRequestPrebid extRequestPrebid = Optional.ofNullable(bidRequest) + final ExtRequestPrebid extRequestPrebid = Optional.of(bidRequest) .map(BidRequest::getExt) .map(ExtRequest::getPrebid) .map(prebid -> prebid.toBuilder().storedrequest(storedRequest).build()) diff --git a/src/main/java/org/prebid/server/bidder/openx/proto/OpenxRequestExt.java b/src/main/java/org/prebid/server/bidder/openx/proto/OpenxRequestExt.java index 680c60ecda3..ebaa9594f91 100644 --- a/src/main/java/org/prebid/server/bidder/openx/proto/OpenxRequestExt.java +++ b/src/main/java/org/prebid/server/bidder/openx/proto/OpenxRequestExt.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.openx.proto; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class OpenxRequestExt { @JsonProperty("delDomain") diff --git a/src/main/java/org/prebid/server/bidder/openx/proto/OpenxVideoExt.java b/src/main/java/org/prebid/server/bidder/openx/proto/OpenxVideoExt.java index fe2e6afcf7f..390020eca71 100644 --- a/src/main/java/org/prebid/server/bidder/openx/proto/OpenxVideoExt.java +++ b/src/main/java/org/prebid/server/bidder/openx/proto/OpenxVideoExt.java @@ -1,12 +1,8 @@ package org.prebid.server.bidder.openx.proto; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value -@Builder +@Value(staticConstructor = "of") public class OpenxVideoExt { Integer rewarded; diff --git a/src/main/java/org/prebid/server/bidder/operaads/OperaadsBidder.java b/src/main/java/org/prebid/server/bidder/operaads/OperaadsBidder.java index b3ce9f10a17..ab93ea6d4fb 100644 --- a/src/main/java/org/prebid/server/bidder/operaads/OperaadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/operaads/OperaadsBidder.java @@ -243,4 +243,3 @@ private BidType parseBidType(String bidType) { } } } - diff --git a/src/main/java/org/prebid/server/bidder/oraki/OrakiBidder.java b/src/main/java/org/prebid/server/bidder/oraki/OrakiBidder.java index b7e9ff64afa..26bfecbe1a1 100644 --- a/src/main/java/org/prebid/server/bidder/oraki/OrakiBidder.java +++ b/src/main/java/org/prebid/server/bidder/oraki/OrakiBidder.java @@ -135,4 +135,3 @@ private static BidType getBidType(Bid bid) { }; } } - diff --git a/src/main/java/org/prebid/server/bidder/ownadx/OwnAdxBidder.java b/src/main/java/org/prebid/server/bidder/ownadx/OwnAdxBidder.java index 59258985635..226d956c8e1 100644 --- a/src/main/java/org/prebid/server/bidder/ownadx/OwnAdxBidder.java +++ b/src/main/java/org/prebid/server/bidder/ownadx/OwnAdxBidder.java @@ -102,20 +102,17 @@ private static MultiMap makeHeaders() { public final Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - return Result.withValues(extractBids(httpCall.getRequest().getPayload(), bidResponse)); + return Result.withValues(extractBids(bidResponse)); } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - private static List extractBids(BidRequest bidRequest, BidResponse bidResponse) { + private static List extractBids(BidResponse bidResponse) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Collections.emptyList(); } - return bidsFromResponse(bidRequest, bidResponse); - } - private static List bidsFromResponse(BidRequest bidRequest, BidResponse bidResponse) { return bidResponse.getSeatbid().stream() .filter(Objects::nonNull) .map(SeatBid::getBid) diff --git a/src/main/java/org/prebid/server/bidder/pangle/model/BidExt.java b/src/main/java/org/prebid/server/bidder/pangle/model/BidExt.java index ded899b2091..d2701ca3f51 100644 --- a/src/main/java/org/prebid/server/bidder/pangle/model/BidExt.java +++ b/src/main/java/org/prebid/server/bidder/pangle/model/BidExt.java @@ -1,13 +1,9 @@ package org.prebid.server.bidder.pangle.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Builder(toBuilder = true) -@Value +@Value(staticConstructor = "of") public class BidExt { @JsonProperty("adtype") diff --git a/src/main/java/org/prebid/server/bidder/pangle/model/NetworkIds.java b/src/main/java/org/prebid/server/bidder/pangle/model/NetworkIds.java index ae59d88b9f4..6f80493eb38 100644 --- a/src/main/java/org/prebid/server/bidder/pangle/model/NetworkIds.java +++ b/src/main/java/org/prebid/server/bidder/pangle/model/NetworkIds.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.pangle.model; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class NetworkIds { String appid; diff --git a/src/main/java/org/prebid/server/bidder/pangle/model/PangleBidExt.java b/src/main/java/org/prebid/server/bidder/pangle/model/PangleBidExt.java index c85dd19b087..d40bd00abd2 100644 --- a/src/main/java/org/prebid/server/bidder/pangle/model/PangleBidExt.java +++ b/src/main/java/org/prebid/server/bidder/pangle/model/PangleBidExt.java @@ -1,12 +1,8 @@ package org.prebid.server.bidder.pangle.model; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Builder(toBuilder = true) -@Value +@Value(staticConstructor = "of") public class PangleBidExt { BidExt pangle; diff --git a/src/main/java/org/prebid/server/bidder/pangle/model/WrappedImpExtBidder.java b/src/main/java/org/prebid/server/bidder/pangle/model/WrappedImpExtBidder.java index 10db06f4819..7b570484b4c 100644 --- a/src/main/java/org/prebid/server/bidder/pangle/model/WrappedImpExtBidder.java +++ b/src/main/java/org/prebid/server/bidder/pangle/model/WrappedImpExtBidder.java @@ -1,13 +1,11 @@ package org.prebid.server.bidder.pangle.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Value; import org.prebid.server.proto.openrtb.ext.request.ExtImpPrebid; import org.prebid.server.proto.openrtb.ext.request.pangle.ExtImpPangle; -@AllArgsConstructor(staticName = "of") @Builder(toBuilder = true) @Value public class WrappedImpExtBidder { diff --git a/src/main/java/org/prebid/server/bidder/playdigo/PlaydigoBidder.java b/src/main/java/org/prebid/server/bidder/playdigo/PlaydigoBidder.java index 0744bb83d56..eec8b56f980 100644 --- a/src/main/java/org/prebid/server/bidder/playdigo/PlaydigoBidder.java +++ b/src/main/java/org/prebid/server/bidder/playdigo/PlaydigoBidder.java @@ -111,14 +111,14 @@ private HttpRequest makeHttpRequest(BidRequest request, Imp imp) { public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - final List bids = extractBids(httpCall.getRequest().getPayload(), bidResponse); + final List bids = extractBids(bidResponse); return Result.withValues(bids); } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - private List extractBids(BidRequest bidRequest, BidResponse bidResponse) { + private List extractBids(BidResponse bidResponse) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Collections.emptyList(); } diff --git a/src/main/java/org/prebid/server/bidder/pubmatic/model/request/PubmaticExtDataAdServer.java b/src/main/java/org/prebid/server/bidder/pubmatic/model/request/PubmaticExtDataAdServer.java index b112cbe9e95..b1068e1e171 100644 --- a/src/main/java/org/prebid/server/bidder/pubmatic/model/request/PubmaticExtDataAdServer.java +++ b/src/main/java/org/prebid/server/bidder/pubmatic/model/request/PubmaticExtDataAdServer.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.pubmatic.model.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class PubmaticExtDataAdServer { String name; diff --git a/src/main/java/org/prebid/server/bidder/pubmatic/model/response/PubmaticBidExt.java b/src/main/java/org/prebid/server/bidder/pubmatic/model/response/PubmaticBidExt.java index f41bac7da89..3aa8db2a2f5 100644 --- a/src/main/java/org/prebid/server/bidder/pubmatic/model/response/PubmaticBidExt.java +++ b/src/main/java/org/prebid/server/bidder/pubmatic/model/response/PubmaticBidExt.java @@ -2,11 +2,9 @@ import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class PubmaticBidExt { @JsonProperty("BidType") diff --git a/src/main/java/org/prebid/server/bidder/pubmatic/model/response/VideoCreativeInfo.java b/src/main/java/org/prebid/server/bidder/pubmatic/model/response/VideoCreativeInfo.java index 7b2254200e9..4f961fb5e29 100644 --- a/src/main/java/org/prebid/server/bidder/pubmatic/model/response/VideoCreativeInfo.java +++ b/src/main/java/org/prebid/server/bidder/pubmatic/model/response/VideoCreativeInfo.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.pubmatic.model.response; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class VideoCreativeInfo { Integer duration; diff --git a/src/main/java/org/prebid/server/bidder/revcontent/RevcontentBidder.java b/src/main/java/org/prebid/server/bidder/revcontent/RevcontentBidder.java index b0b960caa7c..789ceb99681 100644 --- a/src/main/java/org/prebid/server/bidder/revcontent/RevcontentBidder.java +++ b/src/main/java/org/prebid/server/bidder/revcontent/RevcontentBidder.java @@ -90,4 +90,3 @@ private static BidType resolveBidType(Bid bid) { : BidType.xNative; } } - diff --git a/src/main/java/org/prebid/server/bidder/rise/RiseBidder.java b/src/main/java/org/prebid/server/bidder/rise/RiseBidder.java index 11967f78e85..d51423e83af 100644 --- a/src/main/java/org/prebid/server/bidder/rise/RiseBidder.java +++ b/src/main/java/org/prebid/server/bidder/rise/RiseBidder.java @@ -92,14 +92,12 @@ public Result> makeBids(BidderCall httpCall, BidRequ } final List errors = new ArrayList<>(); - final List bids = extractBids(httpCall.getRequest().getPayload(), bidResponse, errors); + final List bids = extractBids(bidResponse, errors); return Result.of(bids, errors); } - private static List extractBids(BidRequest bidRequest, - BidResponse bidResponse, - List errors) { + private static List extractBids(BidResponse bidResponse, List errors) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Collections.emptyList(); } @@ -110,12 +108,12 @@ private static List extractBids(BidRequest bidRequest, .filter(Objects::nonNull) .flatMap(Collection::stream) .filter(Objects::nonNull) - .map(bid -> makeBidderBid(bid, bidRequest.getImp(), bidResponse.getCur(), errors)) + .map(bid -> makeBidderBid(bid, bidResponse.getCur(), errors)) .filter(Objects::nonNull) .toList(); } - private static BidderBid makeBidderBid(Bid bid, List imps, String currency, List errors) { + private static BidderBid makeBidderBid(Bid bid, String currency, List errors) { try { return BidderBid.of(bid, resolveBidType(bid), currency); } catch (PreBidException e) { diff --git a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java b/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java index d06ed082525..ad63bb5fe0f 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java @@ -132,7 +132,7 @@ public class RubiconBidder implements Bidder { private static final Logger logger = LoggerFactory.getLogger(RubiconBidder.class); - private static final ConditionalLogger MISSING_VIDEO_SIZE_LOGGER = + private static final ConditionalLogger missingVideoSizeLogger = new ConditionalLogger("missing_video_size", logger); private static final String TK_XINT_QUERY_PARAMETER = "tk_xint"; @@ -1004,7 +1004,7 @@ private Integer resolveSizeId(RubiconVideoParams rubiconVideoParams, Imp imp, St private static void validateVideoSizeId(Integer resolvedSizeId, String referer, String impId) { // log only 1% of cases to monitor how often video impressions does not have size id if (resolvedSizeId == null) { - MISSING_VIDEO_SIZE_LOGGER.warn( + missingVideoSizeLogger.warn( "RP adapter: video request with no size_id. Referrer URL = %s, impId = %s" .formatted(referer, impId), 0.01d); diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconAppExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconAppExt.java index 64460e5a725..905527302b9 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconAppExt.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconAppExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconAppExt { RubiconSiteExtRp rp; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExt.java index 146d302d7b1..95625d80fd7 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExt.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconBannerExt { RubiconBannerExtRp rp; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExtRp.java index 0acbe640328..6aaadbb26f0 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExtRp.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconBannerExtRp.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconBannerExtRp { String mime; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExt.java index bfc6c1c6f2b..2d3ea5de017 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExt.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconDeviceExt { RubiconDeviceExtRp rp; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExtRp.java index 35ddea95331..6cfcb37b934 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExtRp.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconDeviceExtRp.java @@ -1,12 +1,10 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconDeviceExtRp { BigDecimal pixelratio; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBidders.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBidders.java index 786ca0f2a1d..d7fa100c490 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBidders.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBidders.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconExtPrebidBidders { RubiconExtPrebidBiddersBidder bidder; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidder.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidder.java index 6d4886cedf6..f2988ffe165 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidder.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconExtPrebidBiddersBidder.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.rubicon.proto.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconExtPrebidBiddersBidder { String integration; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpTrack.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpTrack.java index 8902cf6aefd..0ff71bc5aaa 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpTrack.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconImpExtRpTrack.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconImpExtRpTrack { String mint; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExt.java index af3026a696d..507a0354b8c 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExt.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconPubExt { RubiconPubExtRp rp; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExtRp.java index d1b92192638..274ff2c4576 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExtRp.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconPubExtRp.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconPubExtRp { Integer accountId; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExtRp.java index 7cda21ef7ef..7c8c7f88d33 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExtRp.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconSiteExtRp.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.rubicon.proto.request; import com.fasterxml.jackson.databind.JsonNode; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconSiteExtRp { Integer siteId; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargeting.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargeting.java index ece72cb4198..ee8ff245729 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargeting.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargeting.java @@ -1,12 +1,10 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconTargeting { String key; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExt.java index f1f1878d721..23fcfc62e86 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExt.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconTargetingExt { RubiconTargetingExtRp rp; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExtRp.java index 65bcf0d58e0..75835a959c3 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExtRp.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconTargetingExtRp.java @@ -1,12 +1,10 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconTargetingExtRp { List targeting; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExt.java index 1d545488b4e..fe85f28ad09 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExt.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconVideoExt { Integer skip; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExtRp.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExtRp.java index 88b81e54932..602dd9f5409 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExtRp.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoExtRp.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.rubicon.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class RubiconVideoExtRp { Integer sizeId; diff --git a/src/main/java/org/prebid/server/bidder/smaato/SmaatoBidder.java b/src/main/java/org/prebid/server/bidder/smaato/SmaatoBidder.java index 7387617488a..874c116c0d3 100644 --- a/src/main/java/org/prebid/server/bidder/smaato/SmaatoBidder.java +++ b/src/main/java/org/prebid/server/bidder/smaato/SmaatoBidder.java @@ -438,7 +438,7 @@ private String extractAdmBanner(String adm, List curls) { final StringBuilder clickEvent = new StringBuilder(); curls.forEach(url -> clickEvent.append( "fetch(decodeURIComponent('%s'.replace(/\\+/g, ' ')), {cache: 'no-cache'});" - .formatted(HttpUtil.encodeUrl(StringUtils.stripToEmpty(url))))); + .formatted(HttpUtil.encodeUrl(StringUtils.stripToEmpty(url))))); return "

%s
".formatted(clickEvent, adm); } diff --git a/src/main/java/org/prebid/server/bidder/smartrtb/model/SmartrtbResponseExt.java b/src/main/java/org/prebid/server/bidder/smartrtb/model/SmartrtbResponseExt.java index b31fd6d012b..40c14ce85cf 100644 --- a/src/main/java/org/prebid/server/bidder/smartrtb/model/SmartrtbResponseExt.java +++ b/src/main/java/org/prebid/server/bidder/smartrtb/model/SmartrtbResponseExt.java @@ -1,10 +1,8 @@ package org.prebid.server.bidder.smartrtb.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class SmartrtbResponseExt { String format; diff --git a/src/main/java/org/prebid/server/bidder/smartyads/SmartyAdsBidder.java b/src/main/java/org/prebid/server/bidder/smartyads/SmartyAdsBidder.java index f605e564a49..9b466c5f296 100644 --- a/src/main/java/org/prebid/server/bidder/smartyads/SmartyAdsBidder.java +++ b/src/main/java/org/prebid/server/bidder/smartyads/SmartyAdsBidder.java @@ -37,7 +37,6 @@ public class SmartyAdsBidder implements Bidder { private static final String URL_HOST_MACRO = "{{Host}}"; private static final String URL_SOURCE_ID_MACRO = "{{SourceId}}"; private static final String URL_ACCOUNT_ID_MACRO = "{{AccountID}}"; - private static final int FIRST_SEAT_BID_INDEX = 0; private final String endpointUrl; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/bidder/sonobi/SonobiBidder.java b/src/main/java/org/prebid/server/bidder/sonobi/SonobiBidder.java index 2582e8a5eea..7185d339495 100644 --- a/src/main/java/org/prebid/server/bidder/sonobi/SonobiBidder.java +++ b/src/main/java/org/prebid/server/bidder/sonobi/SonobiBidder.java @@ -144,7 +144,7 @@ private static BidType resolveBidType(String impId, List imps) throws PreBi if (imp.getBanner() == null && imp.getVideo() != null) { return BidType.video; } - if (imp.getBanner() == null && imp.getVideo() == null && imp.getXNative() != null) { + if (imp.getBanner() == null && imp.getXNative() != null) { return BidType.xNative; } return BidType.banner; diff --git a/src/main/java/org/prebid/server/bidder/stroeercore/model/StroeerCoreBid.java b/src/main/java/org/prebid/server/bidder/stroeercore/model/StroeerCoreBid.java index e44b85f445e..84a875b2b80 100644 --- a/src/main/java/org/prebid/server/bidder/stroeercore/model/StroeerCoreBid.java +++ b/src/main/java/org/prebid/server/bidder/stroeercore/model/StroeerCoreBid.java @@ -30,4 +30,3 @@ public class StroeerCoreBid { ObjectNode dsa; } - diff --git a/src/main/java/org/prebid/server/bidder/teads/TeadsBidder.java b/src/main/java/org/prebid/server/bidder/teads/TeadsBidder.java index 05a9b72a51e..1e4e9804e11 100644 --- a/src/main/java/org/prebid/server/bidder/teads/TeadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/teads/TeadsBidder.java @@ -170,4 +170,3 @@ private ExtBidPrebid parseExtBidPrebidMeta(Bid bid) { } } - diff --git a/src/main/java/org/prebid/server/bidder/telaria/model/TelariaRequestExt.java b/src/main/java/org/prebid/server/bidder/telaria/model/TelariaRequestExt.java index 9841702cf4e..dec3c36c5f7 100644 --- a/src/main/java/org/prebid/server/bidder/telaria/model/TelariaRequestExt.java +++ b/src/main/java/org/prebid/server/bidder/telaria/model/TelariaRequestExt.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.telaria.model; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class TelariaRequestExt { ObjectNode extra; diff --git a/src/main/java/org/prebid/server/bidder/thetradedesk/TheTradeDeskBidder.java b/src/main/java/org/prebid/server/bidder/thetradedesk/TheTradeDeskBidder.java index c9a8366f9ac..94913a36213 100644 --- a/src/main/java/org/prebid/server/bidder/thetradedesk/TheTradeDeskBidder.java +++ b/src/main/java/org/prebid/server/bidder/thetradedesk/TheTradeDeskBidder.java @@ -76,10 +76,10 @@ public Result>> makeHttpRequests(BidRequest request for (Imp imp : request.getImp()) { try { final ExtImpTheTradeDesk extImp = parseImpExt(imp); - publisherId = publisherId == null - ? StringUtils.isNotBlank(extImp.getPublisherId()) - ? extImp.getPublisherId() - : publisherId + + final String extImpPublisherId = extImp.getPublisherId(); + publisherId = publisherId == null && StringUtils.isNotBlank(extImpPublisherId) + ? extImpPublisherId : publisherId; modifiedImps.add(modifyImp(imp)); diff --git a/src/main/java/org/prebid/server/bidder/tpmn/TpmnBidder.java b/src/main/java/org/prebid/server/bidder/tpmn/TpmnBidder.java index 956e49646eb..4544fda8cf4 100644 --- a/src/main/java/org/prebid/server/bidder/tpmn/TpmnBidder.java +++ b/src/main/java/org/prebid/server/bidder/tpmn/TpmnBidder.java @@ -107,14 +107,12 @@ public Result> makeBids(BidderCall httpCall, BidRequ } final List errors = new ArrayList<>(); - final List bids = extractBids(httpCall.getRequest().getPayload(), bidResponse, errors); + final List bids = extractBids(bidResponse, errors); return Result.of(bids, errors); } - private static List extractBids(BidRequest bidRequest, - BidResponse bidResponse, - List errors) { + private static List extractBids(BidResponse bidResponse, List errors) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Collections.emptyList(); } @@ -125,12 +123,12 @@ private static List extractBids(BidRequest bidRequest, .filter(Objects::nonNull) .flatMap(Collection::stream) .filter(Objects::nonNull) - .map(bid -> makeBidderBid(bid, bidRequest.getImp(), bidResponse.getCur(), errors)) + .map(bid -> makeBidderBid(bid, bidResponse.getCur(), errors)) .filter(Objects::nonNull) .toList(); } - private static BidderBid makeBidderBid(Bid bid, List imps, String currency, List errors) { + private static BidderBid makeBidderBid(Bid bid, String currency, List errors) { try { return BidderBid.of(bid, resolveBidType(bid), currency); } catch (PreBidException e) { @@ -153,4 +151,3 @@ private static BidType resolveBidType(Bid bid) throws PreBidException { }; } } - diff --git a/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftInnerExt.java b/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftInnerExt.java index 0da2cde0c3a..bcdb7f5440c 100644 --- a/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftInnerExt.java +++ b/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftInnerExt.java @@ -1,12 +1,9 @@ package org.prebid.server.bidder.triplelift.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class TripleliftInnerExt { Integer format; } - diff --git a/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftResponseExt.java b/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftResponseExt.java index cb2397b5c86..01a0a7e4297 100644 --- a/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftResponseExt.java +++ b/src/main/java/org/prebid/server/bidder/triplelift/model/TripleliftResponseExt.java @@ -1,12 +1,9 @@ package org.prebid.server.bidder.triplelift.model; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class TripleliftResponseExt { TripleliftInnerExt tripleliftPb; } - diff --git a/src/main/java/org/prebid/server/bidder/undertone/UndertoneBidder.java b/src/main/java/org/prebid/server/bidder/undertone/UndertoneBidder.java index 2ba1663a87e..f350abec72c 100644 --- a/src/main/java/org/prebid/server/bidder/undertone/UndertoneBidder.java +++ b/src/main/java/org/prebid/server/bidder/undertone/UndertoneBidder.java @@ -222,4 +222,3 @@ private BidType getBidType(Bid bid, Map idImpMap) { } } - diff --git a/src/main/java/org/prebid/server/bidder/unicorn/UnicornBidder.java b/src/main/java/org/prebid/server/bidder/unicorn/UnicornBidder.java index 110786c683a..9648ff08a40 100644 --- a/src/main/java/org/prebid/server/bidder/unicorn/UnicornBidder.java +++ b/src/main/java/org/prebid/server/bidder/unicorn/UnicornBidder.java @@ -102,9 +102,9 @@ private Imp modifyImp(Imp imp) { : null; final UnicornImpExt resolvedUnicornImpExt = resolvedPlacementId != null - ? unicornImpExt.toBuilder() - .bidder(extImpBidder.toBuilder().placementId(resolvedPlacementId).build()) - .build() + ? UnicornImpExt.of( + unicornImpExt.getContext(), + extImpBidder.toBuilder().placementId(resolvedPlacementId).build()) : null; return imp.toBuilder() diff --git a/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExt.java b/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExt.java index b4f534d1aad..98915424847 100644 --- a/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExt.java +++ b/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExt.java @@ -1,13 +1,9 @@ package org.prebid.server.bidder.unicorn.model; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Value; import org.prebid.server.proto.openrtb.ext.request.unicorn.ExtImpUnicorn; -@AllArgsConstructor(staticName = "of") -@Value -@Builder(toBuilder = true) +@Value(staticConstructor = "of") public class UnicornImpExt { UnicornImpExtContext context; diff --git a/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExtContext.java b/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExtContext.java index 05e6f9c36a6..25a8a67d9d6 100644 --- a/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExtContext.java +++ b/src/main/java/org/prebid/server/bidder/unicorn/model/UnicornImpExtContext.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.unicorn.model; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class UnicornImpExtContext { ObjectNode data; diff --git a/src/main/java/org/prebid/server/bidder/visx/model/VisxResponse.java b/src/main/java/org/prebid/server/bidder/visx/model/VisxResponse.java index 7cf12c9b1ac..0022d773875 100644 --- a/src/main/java/org/prebid/server/bidder/visx/model/VisxResponse.java +++ b/src/main/java/org/prebid/server/bidder/visx/model/VisxResponse.java @@ -1,12 +1,10 @@ package org.prebid.server.bidder.visx.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class VisxResponse { List seatbid; diff --git a/src/main/java/org/prebid/server/bidder/visx/model/VisxSeatBid.java b/src/main/java/org/prebid/server/bidder/visx/model/VisxSeatBid.java index 7d7d156d185..3e6eaeeeb3e 100644 --- a/src/main/java/org/prebid/server/bidder/visx/model/VisxSeatBid.java +++ b/src/main/java/org/prebid/server/bidder/visx/model/VisxSeatBid.java @@ -1,12 +1,10 @@ package org.prebid.server.bidder.visx.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class VisxSeatBid { List bid; diff --git a/src/main/java/org/prebid/server/bidder/vrtcal/VrtcalBidder.java b/src/main/java/org/prebid/server/bidder/vrtcal/VrtcalBidder.java index d1973e4465d..aa23176ea97 100644 --- a/src/main/java/org/prebid/server/bidder/vrtcal/VrtcalBidder.java +++ b/src/main/java/org/prebid/server/bidder/vrtcal/VrtcalBidder.java @@ -94,4 +94,3 @@ private static BidType getBidMediaType(Bid bid) { }; } } - diff --git a/src/main/java/org/prebid/server/bidder/yieldlab/model/YieldlabBid.java b/src/main/java/org/prebid/server/bidder/yieldlab/model/YieldlabBid.java index 335a4fd9672..a864733f232 100644 --- a/src/main/java/org/prebid/server/bidder/yieldlab/model/YieldlabBid.java +++ b/src/main/java/org/prebid/server/bidder/yieldlab/model/YieldlabBid.java @@ -1,12 +1,10 @@ package org.prebid.server.bidder.yieldlab.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.proto.openrtb.ext.response.ExtBidDsa; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class YieldlabBid { Long id; diff --git a/src/main/java/org/prebid/server/bidder/yieldmo/YieldmoBidder.java b/src/main/java/org/prebid/server/bidder/yieldmo/YieldmoBidder.java index 872457921ee..a927bb15f56 100644 --- a/src/main/java/org/prebid/server/bidder/yieldmo/YieldmoBidder.java +++ b/src/main/java/org/prebid/server/bidder/yieldmo/YieldmoBidder.java @@ -17,9 +17,9 @@ import org.prebid.server.bidder.model.HttpRequest; import org.prebid.server.bidder.model.Price; import org.prebid.server.bidder.model.Result; -import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.bidder.yieldmo.proto.YieldmoBidExt; import org.prebid.server.bidder.yieldmo.proto.YieldmoImpExt; +import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.exception.PreBidException; import org.prebid.server.json.DecodeException; import org.prebid.server.json.JacksonMapper; @@ -49,8 +49,8 @@ public class YieldmoBidder implements Bidder { private final JacksonMapper mapper; public YieldmoBidder(String endpointUrl, - CurrencyConversionService currencyConversionService, - JacksonMapper mapper) { + CurrencyConversionService currencyConversionService, + JacksonMapper mapper) { this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); this.currencyConversionService = Objects.requireNonNull(currencyConversionService); this.mapper = Objects.requireNonNull(mapper); @@ -91,16 +91,16 @@ private Imp modifyImp(Imp imp, BidRequest bidRequest, ExtImpYieldmo ext) { Price bidFloorPrice = Price.of(imp.getBidfloorcur(), imp.getBidfloor()); bidFloorPrice = BidderUtil.isValidPrice(bidFloorPrice) - ? convertBidFloor(bidFloorPrice, imp.getId(), bidRequest) : bidFloorPrice; + ? convertBidFloor(bidFloorPrice, bidRequest) : bidFloorPrice; return imp.toBuilder() - .bidfloor(bidFloorPrice.getValue()) - .bidfloorcur(bidFloorPrice.getCurrency()) - .ext(mapper.mapper().valueToTree(modifiedExt)) - .build(); + .bidfloor(bidFloorPrice.getValue()) + .bidfloorcur(bidFloorPrice.getCurrency()) + .ext(mapper.mapper().valueToTree(modifiedExt)) + .build(); } - private Price convertBidFloor(Price bidFloorPrice, String impId, BidRequest bidRequest) { + private Price convertBidFloor(Price bidFloorPrice, BidRequest bidRequest) { final String bidFloorCur = bidFloorPrice.getCurrency(); try { final BigDecimal convertedPrice = currencyConversionService diff --git a/src/main/java/org/prebid/server/bidder/yieldmo/proto/YieldmoBidExt.java b/src/main/java/org/prebid/server/bidder/yieldmo/proto/YieldmoBidExt.java index 54742a92d24..ca7365c5388 100644 --- a/src/main/java/org/prebid/server/bidder/yieldmo/proto/YieldmoBidExt.java +++ b/src/main/java/org/prebid/server/bidder/yieldmo/proto/YieldmoBidExt.java @@ -12,4 +12,3 @@ public class YieldmoBidExt { @JsonProperty("mediatype") String mediaType; } - diff --git a/src/main/java/org/prebid/server/cache/model/CacheBid.java b/src/main/java/org/prebid/server/cache/model/CacheBid.java index 0cac7158597..d6e2414e65d 100644 --- a/src/main/java/org/prebid/server/cache/model/CacheBid.java +++ b/src/main/java/org/prebid/server/cache/model/CacheBid.java @@ -1,16 +1,14 @@ package org.prebid.server.cache.model; import com.iab.openrtb.response.Bid; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.auction.model.BidInfo; import org.prebid.server.cache.CoreCacheService; /** - * Holds the information about cache TTL for particular {@link Bid} to be send to {@link CoreCacheService}. + * Holds the information about cache TTL for particular {@link Bid} to be sent to {@link CoreCacheService}. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheBid { BidInfo bidInfo; diff --git a/src/main/java/org/prebid/server/cache/model/CacheHttpRequest.java b/src/main/java/org/prebid/server/cache/model/CacheHttpRequest.java index 36d2127810d..aad8728949e 100644 --- a/src/main/java/org/prebid/server/cache/model/CacheHttpRequest.java +++ b/src/main/java/org/prebid/server/cache/model/CacheHttpRequest.java @@ -1,13 +1,11 @@ package org.prebid.server.cache.model; -import lombok.AllArgsConstructor; import lombok.Value; /** * Holds HTTP request info. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheHttpRequest { String uri; diff --git a/src/main/java/org/prebid/server/cache/model/CacheHttpResponse.java b/src/main/java/org/prebid/server/cache/model/CacheHttpResponse.java index cb260d31e79..60ccea28fdb 100644 --- a/src/main/java/org/prebid/server/cache/model/CacheHttpResponse.java +++ b/src/main/java/org/prebid/server/cache/model/CacheHttpResponse.java @@ -1,14 +1,11 @@ package org.prebid.server.cache.model; -import lombok.AllArgsConstructor; import lombok.Value; /** * Holds HTTP response info. */ - -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheHttpResponse { int statusCode; diff --git a/src/main/java/org/prebid/server/cache/model/CacheInfo.java b/src/main/java/org/prebid/server/cache/model/CacheInfo.java index 5bfefcc1f97..13623b91208 100644 --- a/src/main/java/org/prebid/server/cache/model/CacheInfo.java +++ b/src/main/java/org/prebid/server/cache/model/CacheInfo.java @@ -1,13 +1,11 @@ package org.prebid.server.cache.model; -import lombok.AllArgsConstructor; import lombok.Value; /** * Used to determine cache IDs targeting keywords should be in response */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheInfo { private static final CacheInfo EMPTY = CacheInfo.of(null, null, null, null); diff --git a/src/main/java/org/prebid/server/cache/model/CacheServiceResult.java b/src/main/java/org/prebid/server/cache/model/CacheServiceResult.java index e40d088faa0..4ffd3799692 100644 --- a/src/main/java/org/prebid/server/cache/model/CacheServiceResult.java +++ b/src/main/java/org/prebid/server/cache/model/CacheServiceResult.java @@ -1,7 +1,6 @@ package org.prebid.server.cache.model; import com.iab.openrtb.response.Bid; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Collections; @@ -10,8 +9,7 @@ /** * Holds the result of bids caching. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheServiceResult { private static final CacheServiceResult EMPTY = CacheServiceResult.of(null, null, Collections.emptyMap()); diff --git a/src/main/java/org/prebid/server/cache/model/CacheTtl.java b/src/main/java/org/prebid/server/cache/model/CacheTtl.java index e3f28c68f80..ee4df9f7cea 100644 --- a/src/main/java/org/prebid/server/cache/model/CacheTtl.java +++ b/src/main/java/org/prebid/server/cache/model/CacheTtl.java @@ -1,6 +1,5 @@ package org.prebid.server.cache.model; -import lombok.AllArgsConstructor; import lombok.Value; /** @@ -8,17 +7,10 @@ *

* Used for representing configuration. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheTtl { - private static final CacheTtl EMPTY = CacheTtl.of(null, null); - Integer bannerCacheTtl; Integer videoCacheTtl; - - public static CacheTtl empty() { - return EMPTY; - } } diff --git a/src/main/java/org/prebid/server/cache/model/DebugHttpCall.java b/src/main/java/org/prebid/server/cache/model/DebugHttpCall.java index f995fa19ca9..19f0a3440b4 100644 --- a/src/main/java/org/prebid/server/cache/model/DebugHttpCall.java +++ b/src/main/java/org/prebid/server/cache/model/DebugHttpCall.java @@ -13,8 +13,6 @@ @Builder public class DebugHttpCall { - private static final DebugHttpCall EMPTY = DebugHttpCall.builder().build(); - String endpoint; String requestUri; @@ -28,8 +26,4 @@ public class DebugHttpCall { Map> requestHeaders; Integer responseTimeMillis; - - public static DebugHttpCall empty() { - return EMPTY; - } } diff --git a/src/main/java/org/prebid/server/cookie/model/BiddersContext.java b/src/main/java/org/prebid/server/cookie/model/BiddersContext.java index ef24f1b9085..98a90604adc 100644 --- a/src/main/java/org/prebid/server/cookie/model/BiddersContext.java +++ b/src/main/java/org/prebid/server/cookie/model/BiddersContext.java @@ -15,7 +15,7 @@ @Accessors(fluent = true) @Builder(toBuilder = true) -@Value(staticConstructor = "of") +@Value public class BiddersContext { @Builder.Default diff --git a/src/main/java/org/prebid/server/cookie/model/UidWithExpiry.java b/src/main/java/org/prebid/server/cookie/model/UidWithExpiry.java index a518bcbb7bc..b93e9930030 100644 --- a/src/main/java/org/prebid/server/cookie/model/UidWithExpiry.java +++ b/src/main/java/org/prebid/server/cookie/model/UidWithExpiry.java @@ -1,6 +1,5 @@ package org.prebid.server.cookie.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.time.Clock; @@ -11,7 +10,6 @@ /** * Bundles the UID with an Expiration date. After the expiration, the UID is no longer valid. */ -@AllArgsConstructor @Value public class UidWithExpiry { diff --git a/src/main/java/org/prebid/server/currency/CurrencyConversionService.java b/src/main/java/org/prebid/server/currency/CurrencyConversionService.java index 5adba78d6e8..efcaf4ad7c2 100644 --- a/src/main/java/org/prebid/server/currency/CurrencyConversionService.java +++ b/src/main/java/org/prebid/server/currency/CurrencyConversionService.java @@ -322,7 +322,7 @@ private static BigDecimal findIntermediateConversionRate(Map final BigDecimal directCurrencyRateIntermediate = directCurrencyRates.get(sharedCurrency); final BigDecimal reverseCurrencyRateIntermediate = reverseCurrencyRates.get(sharedCurrency); conversionRate = directCurrencyRateIntermediate.divide(reverseCurrencyRateIntermediate, - // chose largest precision among intermediate rates + // chose the largest precision among intermediate rates getRatePrecision(directCurrencyRateIntermediate, reverseCurrencyRateIntermediate), RoundingMode.HALF_EVEN); } diff --git a/src/main/java/org/prebid/server/currency/proto/CurrencyConversionRates.java b/src/main/java/org/prebid/server/currency/proto/CurrencyConversionRates.java index 464fd87a188..832f142dc87 100644 --- a/src/main/java/org/prebid/server/currency/proto/CurrencyConversionRates.java +++ b/src/main/java/org/prebid/server/currency/proto/CurrencyConversionRates.java @@ -1,7 +1,6 @@ package org.prebid.server.currency.proto; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; @@ -10,8 +9,7 @@ /** * Represents Currency Server response containing currency conversion rates for specific date. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CurrencyConversionRates { @JsonProperty("dataAsOf") diff --git a/src/main/java/org/prebid/server/events/EventUtil.java b/src/main/java/org/prebid/server/events/EventUtil.java index 864892e6725..140d3fd91a8 100644 --- a/src/main/java/org/prebid/server/events/EventUtil.java +++ b/src/main/java/org/prebid/server/events/EventUtil.java @@ -67,7 +67,7 @@ public static void validateBidId(RoutingContext routingContext) { public static void validateFormat(RoutingContext routingContext) { final String format = routingContext.request().params().get(FORMAT_PARAMETER); - if (StringUtils.isNotEmpty(format) && !format.equals(BLANK_FORMAT) && !format.equals(IMAGE_FORMAT)) { + if (StringUtils.isNotEmpty(format) && !BLANK_FORMAT.equals(format) && !IMAGE_FORMAT.equals(format)) { throw new IllegalArgumentException( "Format '%s' query parameter is invalid. Possible values are %s and %s, but was %s" .formatted(FORMAT_PARAMETER, BLANK_FORMAT, IMAGE_FORMAT, format)); @@ -76,8 +76,8 @@ public static void validateFormat(RoutingContext routingContext) { public static void validateAnalytics(RoutingContext routingContext) { final String analytics = routingContext.request().params().get(ANALYTICS_PARAMETER); - if (StringUtils.isNotEmpty(analytics) && !analytics.equals(ENABLED_ANALYTICS) - && !analytics.equals(DISABLED_ANALYTICS)) { + if (StringUtils.isNotEmpty(analytics) && !ENABLED_ANALYTICS.equals(analytics) + && !DISABLED_ANALYTICS.equals(analytics)) { throw new IllegalArgumentException( "Analytics '%s' query parameter is invalid. Possible values are %s and %s, but was %s" .formatted(ANALYTICS_PARAMETER, ENABLED_ANALYTICS, DISABLED_ANALYTICS, analytics)); @@ -116,7 +116,7 @@ public static EventRequest from(RoutingContext routingContext) { final MultiMap queryParams = routingContext.request().params(); final String typeAsString = queryParams.get(TYPE_PARAMETER); - final EventRequest.Type type = typeAsString.equals(WIN_TYPE) ? EventRequest.Type.win : EventRequest.Type.imp; + final EventRequest.Type type = WIN_TYPE.equals(typeAsString) ? EventRequest.Type.win : EventRequest.Type.imp; final EventRequest.Format format = Objects.equals(queryParams.get(FORMAT_PARAMETER), IMAGE_FORMAT) ? EventRequest.Format.image : EventRequest.Format.blank; diff --git a/src/main/java/org/prebid/server/execution/file/syncer/RemoteFileSyncer.java b/src/main/java/org/prebid/server/execution/file/syncer/RemoteFileSyncer.java index 8deb838646f..e4f8c81ec46 100644 --- a/src/main/java/org/prebid/server/execution/file/syncer/RemoteFileSyncer.java +++ b/src/main/java/org/prebid/server/execution/file/syncer/RemoteFileSyncer.java @@ -26,7 +26,7 @@ import java.util.Objects; import java.util.function.Function; -@Deprecated +@Deprecated(forRemoval = true) public class RemoteFileSyncer { private static final Logger logger = LoggerFactory.getLogger(RemoteFileSyncer.class); @@ -168,7 +168,7 @@ private Future validateResponse(HttpClientResponse response) private Future isLengthChanged(HttpClientResponse response) { final String contentLengthParameter = response.getHeader(HttpHeaders.CONTENT_LENGTH); - return StringUtils.isNumeric(contentLengthParameter) && !contentLengthParameter.equals("0") + return StringUtils.isNumeric(contentLengthParameter) && !"0".equals(contentLengthParameter) ? fileSystem.props(saveFilePath).map(props -> props.size() != Long.parseLong(contentLengthParameter)) : Future.failedFuture("ContentLength is invalid: " + contentLengthParameter); } diff --git a/src/main/java/org/prebid/server/execution/retry/FixedIntervalRetryPolicy.java b/src/main/java/org/prebid/server/execution/retry/FixedIntervalRetryPolicy.java index 7f000e49005..856867e984f 100644 --- a/src/main/java/org/prebid/server/execution/retry/FixedIntervalRetryPolicy.java +++ b/src/main/java/org/prebid/server/execution/retry/FixedIntervalRetryPolicy.java @@ -30,4 +30,3 @@ public RetryPolicy next() { : NonRetryable.instance(); } } - diff --git a/src/main/java/org/prebid/server/floors/BasicPriceFloorProcessor.java b/src/main/java/org/prebid/server/floors/BasicPriceFloorProcessor.java index 91559480537..d492981f568 100644 --- a/src/main/java/org/prebid/server/floors/BasicPriceFloorProcessor.java +++ b/src/main/java/org/prebid/server/floors/BasicPriceFloorProcessor.java @@ -135,7 +135,7 @@ private PriceFloorRules resolveFloors(Account account, BidRequest bidRequest, Li if (requestFloors != null) { try { - final Optional priceFloorsConfig = Optional.ofNullable(account) + final Optional priceFloorsConfig = Optional.of(account) .map(Account::getAuction) .map(AccountAuctionConfig::getPriceFloors); @@ -163,7 +163,7 @@ private PriceFloorRules resolveFloors(Account account, BidRequest bidRequest, Li } private static boolean shouldUseDynamicData(Account account, FetchResult fetchResult) { - final boolean isUsingDynamicDataAllowed = Optional.ofNullable(account) + final boolean isUsingDynamicDataAllowed = Optional.of(account) .map(Account::getAuction) .map(AccountAuctionConfig::getPriceFloors) .map(AccountPriceFloorsConfig::getUseDynamicData) diff --git a/src/main/java/org/prebid/server/floors/NoSignalBidderPriceFloorAdjuster.java b/src/main/java/org/prebid/server/floors/NoSignalBidderPriceFloorAdjuster.java index 07c05134877..ba36e705ba1 100644 --- a/src/main/java/org/prebid/server/floors/NoSignalBidderPriceFloorAdjuster.java +++ b/src/main/java/org/prebid/server/floors/NoSignalBidderPriceFloorAdjuster.java @@ -51,7 +51,7 @@ public Price adjustForImp(Imp imp, .map(PriceFloorRules::getData) .map(PriceFloorData::getModelGroups) .filter(CollectionUtils::isNotEmpty) - .map(modelGroups -> modelGroups.get(0)) + .map(List::getFirst) .map(PriceFloorModelGroup::getNoFloorSignalBidders) .or(() -> optionalFloors .map(PriceFloorRules::getData) diff --git a/src/main/java/org/prebid/server/floors/model/PriceFloorResult.java b/src/main/java/org/prebid/server/floors/model/PriceFloorResult.java index fdb9ff44c97..f0c498a095b 100644 --- a/src/main/java/org/prebid/server/floors/model/PriceFloorResult.java +++ b/src/main/java/org/prebid/server/floors/model/PriceFloorResult.java @@ -14,8 +14,4 @@ public class PriceFloorResult { BigDecimal floorValue; String currency; - - public static PriceFloorResult empty() { - return PriceFloorResult.of(null, null, null, null); - } } diff --git a/src/main/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationService.java b/src/main/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationService.java index 268de61b246..f0fc0be3574 100755 --- a/src/main/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationService.java +++ b/src/main/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationService.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; /** - * Wrapper for geo location service with circuit breaker. + * Wrapper for geolocation service with circuit breaker. */ public class CircuitBreakerSecuredGeoLocationService implements GeoLocationService { diff --git a/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java b/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java index 5afa9311cba..8f883a3c393 100644 --- a/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java +++ b/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java @@ -42,7 +42,7 @@ public Future setDataPath(String dataFilePath) { TarArchiveEntry currentEntry; boolean hasDatabaseFile = false; - while ((currentEntry = tarInput.getNextTarEntry()) != null) { + while ((currentEntry = tarInput.getNextEntry()) != null) { if (currentEntry.getName().contains(DATABASE_FILE_NAME)) { hasDatabaseFile = true; break; diff --git a/src/main/java/org/prebid/server/handler/CookieSyncHandler.java b/src/main/java/org/prebid/server/handler/CookieSyncHandler.java index 3ac0f44069c..cf332416092 100644 --- a/src/main/java/org/prebid/server/handler/CookieSyncHandler.java +++ b/src/main/java/org/prebid/server/handler/CookieSyncHandler.java @@ -52,7 +52,7 @@ public class CookieSyncHandler implements ApplicationResource { private static final Logger logger = LoggerFactory.getLogger(CookieSyncHandler.class); - private static final ConditionalLogger BAD_REQUEST_LOGGER = new ConditionalLogger(logger); + private static final ConditionalLogger badRequestLogger = new ConditionalLogger(logger); private final long defaultTimeout; private final double logSamplingRate; @@ -146,7 +146,7 @@ private Future cookieSyncContext(RoutingContext routingContex } private CookieSyncRequest parseRequest(RoutingContext routingContext) { - final Buffer body = routingContext.getBody(); + final Buffer body = routingContext.body().buffer(); if (body == null) { throw new InvalidCookieSyncRequestException("Request has no body"); } @@ -238,7 +238,7 @@ private void respondWithError(Throwable error, RoutingContext routingContext) { body = "Invalid request format: " + message; metrics.updateUserSyncBadRequestMetric(); - BAD_REQUEST_LOGGER.info(message, logSamplingRate); + badRequestLogger.info(message, logSamplingRate); } case UnauthorizedUidsException unauthorizedUidsException -> { status = HttpResponseStatus.UNAUTHORIZED; @@ -250,7 +250,7 @@ private void respondWithError(Throwable error, RoutingContext routingContext) { status = HttpResponseStatus.BAD_REQUEST; body = "Invalid account configuration: " + message; - BAD_REQUEST_LOGGER.info(message, logSamplingRate); + badRequestLogger.info(message, logSamplingRate); } default -> { status = HttpResponseStatus.INTERNAL_SERVER_ERROR; diff --git a/src/main/java/org/prebid/server/handler/GetuidsHandler.java b/src/main/java/org/prebid/server/handler/GetuidsHandler.java index 705c5f94e27..ec6f15e127b 100644 --- a/src/main/java/org/prebid/server/handler/GetuidsHandler.java +++ b/src/main/java/org/prebid/server/handler/GetuidsHandler.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import io.vertx.core.http.HttpMethod; import io.vertx.ext.web.RoutingContext; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.cookie.UidsCookie; import org.prebid.server.cookie.UidsCookieService; @@ -52,8 +51,7 @@ private Map uidsFrom(RoutingContext routingContext) { uidEntry -> uidEntry.getValue().getUid())); } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class BuyerUids { @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/org/prebid/server/handler/VtrackHandler.java b/src/main/java/org/prebid/server/handler/VtrackHandler.java index 3d1243264d9..f8b67b50d8c 100644 --- a/src/main/java/org/prebid/server/handler/VtrackHandler.java +++ b/src/main/java/org/prebid/server/handler/VtrackHandler.java @@ -111,7 +111,7 @@ private static String accountId(RoutingContext routingContext) { } private List vtrackPuts(RoutingContext routingContext) { - final Buffer body = routingContext.getBody(); + final Buffer body = routingContext.body().buffer(); if (body == null || body.length() == 0) { throw new IllegalArgumentException("Incoming request has no body"); } diff --git a/src/main/java/org/prebid/server/handler/admin/CurrencyRatesHandler.java b/src/main/java/org/prebid/server/handler/admin/CurrencyRatesHandler.java index c57e61b9b71..277d2b792de 100644 --- a/src/main/java/org/prebid/server/handler/admin/CurrencyRatesHandler.java +++ b/src/main/java/org/prebid/server/handler/admin/CurrencyRatesHandler.java @@ -5,7 +5,6 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.json.JacksonMapper; @@ -77,8 +76,7 @@ private void respondWith(RoutingContext routingContext, HttpResponseStatus statu .end(body)); } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class Response { boolean active; diff --git a/src/main/java/org/prebid/server/handler/admin/SettingsCacheNotificationHandler.java b/src/main/java/org/prebid/server/handler/admin/SettingsCacheNotificationHandler.java index d237a542ed7..9b89009a962 100644 --- a/src/main/java/org/prebid/server/handler/admin/SettingsCacheNotificationHandler.java +++ b/src/main/java/org/prebid/server/handler/admin/SettingsCacheNotificationHandler.java @@ -46,7 +46,7 @@ public void handle(RoutingContext routingContext) { * Propagates updating settings cache. */ private void doSave(RoutingContext routingContext) { - final Buffer body = routingContext.getBody(); + final Buffer body = routingContext.body().buffer(); if (body == null) { respondWithBadRequest(routingContext, "Missing update data."); return; @@ -68,7 +68,7 @@ private void doSave(RoutingContext routingContext) { * Propagates invalidating settings cache. */ private void doInvalidate(RoutingContext routingContext) { - final Buffer body = routingContext.getBody(); + final Buffer body = routingContext.body().buffer(); if (body == null) { respondWithBadRequest(routingContext, "Missing invalidation data."); return; diff --git a/src/main/java/org/prebid/server/handler/admin/VersionHandler.java b/src/main/java/org/prebid/server/handler/admin/VersionHandler.java index 1c48f79a74a..a5382ac5b08 100644 --- a/src/main/java/org/prebid/server/handler/admin/VersionHandler.java +++ b/src/main/java/org/prebid/server/handler/admin/VersionHandler.java @@ -4,7 +4,6 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import lombok.AllArgsConstructor; import lombok.Value; import org.apache.commons.lang3.StringUtils; import org.prebid.server.json.JacksonMapper; @@ -56,8 +55,7 @@ public void handle(RoutingContext routingContext) { } } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class RevisionResponse { String revision; diff --git a/src/main/java/org/prebid/server/handler/openrtb2/RawResponseContext.java b/src/main/java/org/prebid/server/handler/openrtb2/RawResponseContext.java index 5fe80a55c1d..d12d3fcd3b5 100644 --- a/src/main/java/org/prebid/server/handler/openrtb2/RawResponseContext.java +++ b/src/main/java/org/prebid/server/handler/openrtb2/RawResponseContext.java @@ -5,7 +5,7 @@ import lombok.Value; import org.prebid.server.auction.model.AuctionContext; -@Value(staticConstructor = "of") +@Value @Builder(toBuilder = true) public class RawResponseContext { @@ -14,5 +14,4 @@ public class RawResponseContext { String responseBody; MultiMap responseHeaders; - } diff --git a/src/main/java/org/prebid/server/health/model/StatusResponse.java b/src/main/java/org/prebid/server/health/model/StatusResponse.java index 7daca0ea241..e7a6b5d6f08 100644 --- a/src/main/java/org/prebid/server/health/model/StatusResponse.java +++ b/src/main/java/org/prebid/server/health/model/StatusResponse.java @@ -1,12 +1,10 @@ package org.prebid.server.health.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.time.ZonedDateTime; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class StatusResponse { String status; diff --git a/src/main/java/org/prebid/server/hooks/execution/model/StageWithHookTypeImpl.java b/src/main/java/org/prebid/server/hooks/execution/model/StageWithHookTypeImpl.java index 1f4f7a7f521..2765a950c53 100644 --- a/src/main/java/org/prebid/server/hooks/execution/model/StageWithHookTypeImpl.java +++ b/src/main/java/org/prebid/server/hooks/execution/model/StageWithHookTypeImpl.java @@ -1,17 +1,15 @@ package org.prebid.server.hooks.execution.model; -import lombok.AllArgsConstructor; -import lombok.Getter; +import lombok.Value; import lombok.experimental.Accessors; import org.prebid.server.hooks.v1.Hook; import org.prebid.server.hooks.v1.InvocationContext; -@AllArgsConstructor -@Getter @Accessors(fluent = true) +@Value class StageWithHookTypeImpl> implements StageWithHookType { - private final Stage stage; + Stage stage; - private final Class hookType; + Class hookType; } diff --git a/src/main/java/org/prebid/server/log/HttpInteractionLogger.java b/src/main/java/org/prebid/server/log/HttpInteractionLogger.java index cc89b9cb57b..2ca42da4a45 100644 --- a/src/main/java/org/prebid/server/log/HttpInteractionLogger.java +++ b/src/main/java/org/prebid/server/log/HttpInteractionLogger.java @@ -47,7 +47,7 @@ public void maybeLogOpenrtb2Auction(AuctionContext auctionContext, logger.info( "Requested URL: \"{}\", request body: \"{}\", response status: \"{}\", response body: \"{}\"", routingContext.request().uri(), - toOneLineString(routingContext.getBodyAsString()), + toOneLineString(routingContext.body().asString()), statusCode, responseBody); diff --git a/src/main/java/org/prebid/server/log/LoggerControlKnob.java b/src/main/java/org/prebid/server/log/LoggerControlKnob.java index 3f3c0932ffa..3c74cd36b15 100644 --- a/src/main/java/org/prebid/server/log/LoggerControlKnob.java +++ b/src/main/java/org/prebid/server/log/LoggerControlKnob.java @@ -19,7 +19,7 @@ public class LoggerControlKnob { private final Level originalLevel; private final Lock lock = new ReentrantLock(); - private Long restoreTimerId = null; + private Long restoreTimerId; public LoggerControlKnob(Vertx vertx) { this.vertx = Objects.requireNonNull(vertx); diff --git a/src/main/java/org/prebid/server/metric/AlertsAccountConfigMetric.java b/src/main/java/org/prebid/server/metric/AlertsAccountConfigMetric.java index 4522b8e1bdf..a59aaa95306 100644 --- a/src/main/java/org/prebid/server/metric/AlertsAccountConfigMetric.java +++ b/src/main/java/org/prebid/server/metric/AlertsAccountConfigMetric.java @@ -14,4 +14,3 @@ private static Function nameCreator(String prefix, String ac return metricName -> "%s.account_config.%s.%s".formatted(prefix, account, metricName); } } - diff --git a/src/main/java/org/prebid/server/metric/CookieSyncMetrics.java b/src/main/java/org/prebid/server/metric/CookieSyncMetrics.java index 6d3120343e8..eb4b58a9336 100644 --- a/src/main/java/org/prebid/server/metric/CookieSyncMetrics.java +++ b/src/main/java/org/prebid/server/metric/CookieSyncMetrics.java @@ -49,4 +49,3 @@ private static Function nameCreator(String prefix) { } } } - diff --git a/src/main/java/org/prebid/server/metric/Metrics.java b/src/main/java/org/prebid/server/metric/Metrics.java index 0fb0145f313..00295decad3 100644 --- a/src/main/java/org/prebid/server/metric/Metrics.java +++ b/src/main/java/org/prebid/server/metric/Metrics.java @@ -703,6 +703,26 @@ public void updateCacheCreativeTtl(String accountId, Integer creativeTtl, Metric forAccount(accountId).cache().creativeTtl().updateHistogram(creativeType, creativeTtl); } + public void updateRequestsActivityDisallowedCount(Activity activity) { + requests().activities().forActivity(activity).incCounter(MetricName.disallowed_count); + } + + public void updateAccountActivityDisallowedCount(String account, Activity activity) { + forAccount(account).activities().forActivity(activity).incCounter(MetricName.disallowed_count); + } + + public void updateAdapterActivityDisallowedCount(String adapter, Activity activity) { + forAdapter(adapter).activities().forActivity(activity).incCounter(MetricName.disallowed_count); + } + + public void updateRequestsActivityProcessedRulesCount() { + requests().activities().incCounter(MetricName.processed_rules_count); + } + + public void updateAccountActivityProcessedRulesCount(String account) { + forAccount(account).activities().incCounter(MetricName.processed_rules_count); + } + private static class HookMetricMapper { private static final EnumMap STATUS_TO_METRIC = @@ -730,24 +750,4 @@ static MetricName fromAction(ExecutionAction action) { return ACTION_TO_METRIC.getOrDefault(action, MetricName.unknown); } } - - public void updateRequestsActivityDisallowedCount(Activity activity) { - requests().activities().forActivity(activity).incCounter(MetricName.disallowed_count); - } - - public void updateAccountActivityDisallowedCount(String account, Activity activity) { - forAccount(account).activities().forActivity(activity).incCounter(MetricName.disallowed_count); - } - - public void updateAdapterActivityDisallowedCount(String adapter, Activity activity) { - forAdapter(adapter).activities().forActivity(activity).incCounter(MetricName.disallowed_count); - } - - public void updateRequestsActivityProcessedRulesCount() { - requests().activities().incCounter(MetricName.processed_rules_count); - } - - public void updateAccountActivityProcessedRulesCount(String account) { - forAccount(account).activities().incCounter(MetricName.processed_rules_count); - } } diff --git a/src/main/java/org/prebid/server/model/CaseInsensitiveMultiMap.java b/src/main/java/org/prebid/server/model/CaseInsensitiveMultiMap.java index b44590db397..5f2a4c61897 100644 --- a/src/main/java/org/prebid/server/model/CaseInsensitiveMultiMap.java +++ b/src/main/java/org/prebid/server/model/CaseInsensitiveMultiMap.java @@ -11,7 +11,7 @@ public class CaseInsensitiveMultiMap { private static final CaseInsensitiveMultiMap EMPTY = builder().build(); - private final io.vertx.core.MultiMap delegate; + private final MultiMap delegate; private CaseInsensitiveMultiMap(MultiMap delegate) { this.delegate = delegate; @@ -85,10 +85,10 @@ public int hashCode() { public static class Builder { - private final io.vertx.core.MultiMap delegate; + private final MultiMap delegate; public Builder() { - this.delegate = io.vertx.core.MultiMap.caseInsensitiveMultiMap(); + this.delegate = MultiMap.caseInsensitiveMultiMap(); } public CaseInsensitiveMultiMap build() { diff --git a/src/main/java/org/prebid/server/privacy/PrivacyExtractor.java b/src/main/java/org/prebid/server/privacy/PrivacyExtractor.java index bae5cf4370b..aa97f3d164e 100644 --- a/src/main/java/org/prebid/server/privacy/PrivacyExtractor.java +++ b/src/main/java/org/prebid/server/privacy/PrivacyExtractor.java @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Objects; /** * GDPR-aware utilities @@ -110,10 +111,10 @@ public Privacy toValidPrivacy(String gdpr, final String validGdpr = ObjectUtils.notEqual(gdpr, "1") && ObjectUtils.notEqual(gdpr, "0") ? DEFAULT_GDPR_VALUE : gdpr; - final String validConsent = StringUtils.defaultString(consent, DEFAULT_CONSENT_VALUE); + final String validConsent = Objects.toString(consent, DEFAULT_CONSENT_VALUE); final Ccpa validCcpa = usPrivacy == null ? DEFAULT_CCPA_VALUE : toValidCcpa(usPrivacy, errors); final Integer validCoppa = coppa == null ? DEFAULT_COPPA_VALUE : coppa; - final String validGpp = StringUtils.defaultString(gpp, DEFAULT_GPP_VALUE); + final String validGpp = Objects.toString(gpp, DEFAULT_GPP_VALUE); final List validGppSid = ListUtils.defaultIfNull(gppSid, DEFAULT_GPP_SID_VALUE); return Privacy.builder() diff --git a/src/main/java/org/prebid/server/privacy/gdpr/TcfDefinerService.java b/src/main/java/org/prebid/server/privacy/gdpr/TcfDefinerService.java index 5c994ec590f..0d86272d378 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/TcfDefinerService.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/TcfDefinerService.java @@ -44,15 +44,15 @@ public class TcfDefinerService { private static final Logger logger = LoggerFactory.getLogger(TcfDefinerService.class); - private static final ConditionalLogger AMP_CORRUPT_CONSENT_LOGGER = + private static final ConditionalLogger ampCorruptConsentLogger = new ConditionalLogger("amp_corrupt_consent", logger); - private static final ConditionalLogger APP_CORRUPT_CONSENT_LOGGER = + private static final ConditionalLogger appCorruptConsentLogger = new ConditionalLogger("app_corrupt_consent", logger); - private static final ConditionalLogger SITE_CORRUPT_CONSENT_LOGGER = + private static final ConditionalLogger siteCorruptConsentLogger = new ConditionalLogger("site_corrupt_consent", logger); - private static final ConditionalLogger DOOH_CORRUPT_CONSENT_LOGGER = + private static final ConditionalLogger doohCorruptConsentLogger = new ConditionalLogger("dooh_corrupt_consent", logger); - private static final ConditionalLogger UNDEFINED_CORRUPT_CONSENT_LOGGER = + private static final ConditionalLogger undefinedCorruptConsentLogger = new ConditionalLogger("undefined_corrupt_consent", logger); private static final String GDPR_ENABLED = "1"; @@ -369,7 +369,7 @@ private TCStringParsingResult toValidResult(String consentString, TCStringParsin final String message = "Unknown tcfPolicyVersion %s, defaulting to gvlSpecificationVersion=3" .formatted(tcfPolicyVersion); - UNDEFINED_CORRUPT_CONSENT_LOGGER.warn(message, samplingRate); + undefinedCorruptConsentLogger.warn(message, samplingRate); warnings.add(message); } @@ -390,20 +390,20 @@ private static void logWarn(String consent, String message, RequestLogInfo reque if (requestLogInfo == null || requestLogInfo.getRequestType() == null) { final String exceptionMessage = "Parsing consent string:\"%s\" failed for undefined type with exception %s" .formatted(consent, message); - UNDEFINED_CORRUPT_CONSENT_LOGGER.info(exceptionMessage, 100); + undefinedCorruptConsentLogger.info(exceptionMessage, 100); return; } switch (requestLogInfo.getRequestType()) { - case amp -> AMP_CORRUPT_CONSENT_LOGGER.info( + case amp -> ampCorruptConsentLogger.info( logMessage(consent, MetricName.amp.toString(), requestLogInfo, message), 100); - case openrtb2app -> APP_CORRUPT_CONSENT_LOGGER.info( + case openrtb2app -> appCorruptConsentLogger.info( logMessage(consent, MetricName.openrtb2app.toString(), requestLogInfo, message), 100); - case openrtb2dooh -> DOOH_CORRUPT_CONSENT_LOGGER.info( + case openrtb2dooh -> doohCorruptConsentLogger.info( logMessage(consent, MetricName.openrtb2dooh.toString(), requestLogInfo, message), 100); - case openrtb2web -> SITE_CORRUPT_CONSENT_LOGGER.info( + case openrtb2web -> siteCorruptConsentLogger.info( logMessage(consent, MetricName.openrtb2web.toString(), requestLogInfo, message), 100); - default -> UNDEFINED_CORRUPT_CONSENT_LOGGER.info( + default -> undefinedCorruptConsentLogger.info( logMessage(consent, "video or sync or setuid", requestLogInfo, message), 100); } } diff --git a/src/main/java/org/prebid/server/privacy/gdpr/model/VendorPermission.java b/src/main/java/org/prebid/server/privacy/gdpr/model/VendorPermission.java index 3686d2128b3..0eca0ed1105 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/model/VendorPermission.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/model/VendorPermission.java @@ -27,4 +27,3 @@ public void consentNaturallyWith(PurposeCode purposeCode) { naturallyConsentedPurposes.add(purposeCode); } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose01Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose01Strategy.java index d09d864ac3f..226c1910d24 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose01Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose01Strategy.java @@ -29,4 +29,3 @@ public PurposeCode getPurpose() { return PurposeCode.ONE; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose02Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose02Strategy.java index e85d912f3b8..8fad704d62a 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose02Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose02Strategy.java @@ -30,4 +30,3 @@ public PurposeCode getPurpose() { return PurposeCode.TWO; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose03Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose03Strategy.java index 4f93951e49c..b6251b75af5 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose03Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose03Strategy.java @@ -29,4 +29,3 @@ public PurposeCode getPurpose() { return PurposeCode.THREE; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose04Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose04Strategy.java index b6e14d87a79..5c2cf863b46 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose04Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose04Strategy.java @@ -33,4 +33,3 @@ public PurposeCode getPurpose() { return PurposeCode.FOUR; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose05Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose05Strategy.java index f4258c88068..30913072c83 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose05Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose05Strategy.java @@ -29,4 +29,3 @@ public PurposeCode getPurpose() { return PurposeCode.FIVE; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose06Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose06Strategy.java index e79bc1b0893..50945cc7b87 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose06Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose06Strategy.java @@ -29,4 +29,3 @@ public PurposeCode getPurpose() { return PurposeCode.SIX; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose07Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose07Strategy.java index 0cd4b1784cb..8e388c043c9 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose07Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose07Strategy.java @@ -31,4 +31,3 @@ public PurposeCode getPurpose() { } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose08Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose08Strategy.java index 1c101aa753b..8c084fa9d48 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose08Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose08Strategy.java @@ -29,4 +29,3 @@ public PurposeCode getPurpose() { return PurposeCode.EIGHT; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose09Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose09Strategy.java index 7e77e9dc24e..3a2704b595b 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose09Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose09Strategy.java @@ -29,4 +29,3 @@ public PurposeCode getPurpose() { return PurposeCode.NINE; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose10Strategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose10Strategy.java index 06a42c090fa..458cd187bd4 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose10Strategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/Purpose10Strategy.java @@ -29,4 +29,3 @@ public PurposeCode getPurpose() { return PurposeCode.TEN; } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/PurposeStrategy.java b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/PurposeStrategy.java index 322f7c4fc7a..e9e83a3ed9c 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/PurposeStrategy.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/tcfstrategies/purpose/PurposeStrategy.java @@ -47,7 +47,7 @@ public void allow(VendorPermission vendorPermission) { /** * This method represents allowance of permission that purpose should provide after full enforcement - * (can downgrade to basic if GVL failed) despite of host company or account configuration. + * (can downgrade to basic if GVL failed) despite host company or account configuration. */ protected abstract void allowNaturally(PrivacyEnforcementAction privacyEnforcementAction); @@ -136,4 +136,3 @@ private Stream allowedByFullTypeStrategy( getPurpose(), vendorConsent, vendorForPurpose, excludedVendors, isEnforceVendors); } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/VendorListService.java b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/VendorListService.java index 671bdb39170..51c9b3e9252 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/VendorListService.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/VendorListService.java @@ -9,7 +9,6 @@ import io.vertx.core.file.FileProps; import io.vertx.core.file.FileSystem; import io.vertx.core.file.FileSystemException; -import lombok.AllArgsConstructor; import lombok.Value; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -396,8 +395,7 @@ private void stopUsingFallbackForVersion(int version) { versionsToFallback.remove(version); } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class VendorListResult { int version; diff --git a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Vendor.java b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Vendor.java index c2bf0a12964..6bb2be9dddb 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Vendor.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Vendor.java @@ -45,4 +45,3 @@ public static Vendor empty(Integer id) { .build(); } } - diff --git a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/VendorList.java b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/VendorList.java index d6451bae6b7..d3ec53137dc 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/VendorList.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/VendorList.java @@ -1,14 +1,12 @@ package org.prebid.server.privacy.gdpr.vendorlist.proto; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Date; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class VendorList { @JsonProperty("vendorListVersion") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/ExtIncludeBrandCategory.java b/src/main/java/org/prebid/server/proto/openrtb/ext/ExtIncludeBrandCategory.java index 0c61a578986..bc004442fff 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/ExtIncludeBrandCategory.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/ExtIncludeBrandCategory.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.ext.prebid.targeting.includebrandcategory */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtIncludeBrandCategory { @JsonProperty("primaryadserver") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebid.java b/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebid.java index eeece7320bd..9b656fc180c 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebid.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebid.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.bidder.Bidder; import org.prebid.server.proto.openrtb.ext.request.ExtImpAuctionEnvironment; @@ -12,8 +11,7 @@ *

* Can be used by {@link Bidder}s to unmarshal any request.imp[i].ext. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtPrebid { P prebid; @@ -24,7 +22,7 @@ public class ExtPrebid { * Each bidder should specify their corresponding ExtImp{Bidder} class as a type argument when unmarshaling * extension using this class. *

- * Bidder implementations may safely assume that this extension has been validated by their parameters schema. + * Bidder implementations may safely assume that this extension has been validated by their parameters' schema. */ B bidder; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebidBidders.java b/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebidBidders.java index a11559c2a52..6c0a25ebdfe 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebidBidders.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/ExtPrebidBidders.java @@ -1,15 +1,13 @@ package org.prebid.server.proto.openrtb.ext; import com.fasterxml.jackson.databind.JsonNode; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.bidder.Bidder; /** * Can be used by {@link Bidder}s to unmarshal any request.ext.prebid.bidders. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtPrebidBidders { /** @@ -17,4 +15,3 @@ public class ExtPrebidBidders { */ JsonNode bidder; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ConsentedProvidersSettings.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ConsentedProvidersSettings.java index dc739edc03b..1b30a856323 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ConsentedProvidersSettings.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ConsentedProvidersSettings.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ConsentedProvidersSettings { String consentedProviders; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtAppPrebid.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtAppPrebid.java index 398176dbe4e..280cbdd867e 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtAppPrebid.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtAppPrebid.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; /** @@ -8,8 +7,7 @@ * We are only enforcing that these two properties be strings if they are provided. * They are optional with no current constraints on value. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtAppPrebid { String source; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtBidderConfigOrtb.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtBidderConfigOrtb.java index 59a6ecc08f7..d8dcf51e4aa 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtBidderConfigOrtb.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtBidderConfigOrtb.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtBidderConfigOrtb { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeal.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeal.java index 642720c3306..ca958582dea 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeal.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeal.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].deals[].ext.line */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtDeal { ExtDealLine line; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealLine.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealLine.java index fd8d263832a..ed1a488285f 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealLine.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealLine.java @@ -2,13 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.iab.openrtb.request.Format; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtDealLine { @JsonProperty("lineitemid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealTier.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealTier.java index b661c51c9e7..fd15c95f988 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealTier.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDealTier.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.prebid.bidder.dealTier */ -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtDealTier { String prefix; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeviceInt.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeviceInt.java index 28fe4c88267..d1204f084b9 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeviceInt.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDeviceInt.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * ExtDevice defines the contract for bidrequest.device.ext.prebid.interstitial */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtDeviceInt { @JsonProperty("minwidthperc") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDevicePrebid.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDevicePrebid.java index 4135b662adc..86435bf99ee 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDevicePrebid.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDevicePrebid.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; /** * ExtDevice defines the contract for bidrequest.device.ext.prebid */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtDevicePrebid { ExtDeviceInt interstitial; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDooh.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDooh.java index 35131966308..4fc7575efd1 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDooh.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtDooh.java @@ -1,14 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; import org.prebid.server.proto.openrtb.ext.FlexibleExtension; -import java.util.Objects; - /** * Defines the contract for bidrequest.dooh.ext */ @@ -17,16 +14,8 @@ @ToString(callSuper = true) public class ExtDooh extends FlexibleExtension { - private static final ExtDooh EMPTY = ExtDooh.of(null); - /** * Defines the contract for bidrequest.dooh.ext.data. */ ObjectNode data; - - @JsonIgnore - public boolean isEmpty() { - return Objects.equals(this, EMPTY); - } - } diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtMediaTypePriceGranularity.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtMediaTypePriceGranularity.java index 6b5c5d0601e..b931c326116 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtMediaTypePriceGranularity.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtMediaTypePriceGranularity.java @@ -2,15 +2,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Value; /** * Defines the contract for bidrequest.ext.prebid.targeting.mediatypepricegranularity */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtMediaTypePriceGranularity { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtOptions.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtOptions.java index bdde8c4ab90..54a65a3a419 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtOptions.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtOptions.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * ExtRegs defines the contract for ext.prebid.options */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtOptions { @JsonProperty("echovideoattrs") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPriceGranularity.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPriceGranularity.java index ff83f3d86ba..6c148e28c01 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPriceGranularity.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPriceGranularity.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.auction.PriceGranularity; @@ -10,8 +9,7 @@ * Defines the contract for bidrequest.ext.prebid.targeting.pricegranularity and * bidrequest.ext.prebid.targeting.mediatypepricegranularity.banner|video|native */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtPriceGranularity { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPublisherPrebid.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPublisherPrebid.java index abbba8f2039..642e27883a2 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPublisherPrebid.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtPublisherPrebid.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.app|site.publisher.prebid */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtPublisherPrebid { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestCurrency.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestCurrency.java index 320d638fc42..6ece0cf3667 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestCurrency.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestCurrency.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; @@ -9,8 +8,7 @@ /** * Defines the contract for bidrequest.ext.prebid.currency */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestCurrency { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidAmp.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidAmp.java index 38ef6b3d25e..7a9c95973cc 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidAmp.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidAmp.java @@ -15,4 +15,3 @@ public class ExtRequestPrebidAmp { */ Map data; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidBidderConfig.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidBidderConfig.java index 466197694ff..3bb16185e25 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidBidderConfig.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidBidderConfig.java @@ -1,12 +1,10 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestPrebidBidderConfig { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCache.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCache.java index 026684ae2c1..a3a842ee456 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCache.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCache.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.ext.prebid.cache */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestPrebidCache { public static final ExtRequestPrebidCache EMPTY = new ExtRequestPrebidCache(null, null, null); diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheBids.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheBids.java index 2d4a5b2ff2d..2e07762a23d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheBids.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheBids.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestPrebidCacheBids { Integer ttlseconds; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheVastxml.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheVastxml.java index 842ec98429d..cccb422648e 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheVastxml.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidCacheVastxml.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestPrebidCacheVastxml { Integer ttlseconds; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidData.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidData.java index 990ad7c2ad8..535ff40ae6a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidData.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidData.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; @@ -10,8 +9,7 @@ /** * Defines the contract for bidrequest.ext.prebid.data */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestPrebidData { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidDataEidPermissions.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidDataEidPermissions.java index 8ad5b5b2ffb..82b2e6007a1 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidDataEidPermissions.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidDataEidPermissions.java @@ -22,4 +22,3 @@ public class ExtRequestPrebidDataEidPermissions { @JsonFormat(without = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) List bidders; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidSchain.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidSchain.java index 5eb237bcd72..edfd5b8f918 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidSchain.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebidSchain.java @@ -21,4 +21,3 @@ public class ExtRequestPrebidSchain { */ SupplyChain schain; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtSource.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtSource.java index 4388d90273a..8f205fc85b0 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtSource.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtSource.java @@ -13,4 +13,3 @@ public class ExtSource extends FlexibleExtension { SupplyChain schain; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredAuctionResponse.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredAuctionResponse.java index e8f83afcccb..e692b23cb27 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredAuctionResponse.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredAuctionResponse.java @@ -2,13 +2,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.iab.openrtb.response.SeatBid; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtStoredAuctionResponse { String id; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredBidResponse.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredBidResponse.java index a496ae4d4b8..553f5de5481 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredBidResponse.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredBidResponse.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtStoredBidResponse { String bidder; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredRequest.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredRequest.java index 2a9ec41cd3c..af5cacc0ed1 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredRequest.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtStoredRequest.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for ext.prebid.storedrequest */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtStoredRequest { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserPrebid.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserPrebid.java index f15b73ab8af..e2eae8f1d52 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserPrebid.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserPrebid.java @@ -1,15 +1,13 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Map; /** - * Defines the the contract for bidrequest.user.ext.prebid + * Defines the contract for bidrequest.user.ext.prebid */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtUserPrebid { Map buyeruids; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserTime.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserTime.java index 87ea86f8520..00fff5c4db4 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserTime.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUserTime.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtUserTime { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/aceex/ExtImpAceex.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/aceex/ExtImpAceex.java index fb26ec0a898..aebf8beb180 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/aceex/ExtImpAceex.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/aceex/ExtImpAceex.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.aceex; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpAceex { @JsonProperty("accountid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/acuity/ExtImpAcuityads.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/acuity/ExtImpAcuityads.java index 76c6c369114..3056042416d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/acuity/ExtImpAcuityads.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/acuity/ExtImpAcuityads.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.acuity; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAcuityads { String host; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adelement/ExtImpAdelement.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adelement/ExtImpAdelement.java index 827e7892c54..d17b5882672 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adelement/ExtImpAdelement.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adelement/ExtImpAdelement.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.adelement; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpAdelement { @JsonProperty("supply_id") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adgeneration/ExtImpAdgeneration.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adgeneration/ExtImpAdgeneration.java index 8646b462dfd..5bc6e76dd6f 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adgeneration/ExtImpAdgeneration.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adgeneration/ExtImpAdgeneration.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.adgeneration; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdgeneration { String id; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adhese/ExtImpAdhese.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adhese/ExtImpAdhese.java index e21e859bc67..1375a984aee 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adhese/ExtImpAdhese.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adhese/ExtImpAdhese.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.adhese; import com.fasterxml.jackson.databind.JsonNode; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.adhese */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdhese { String account; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adkernel/ExtImpAdkernel.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adkernel/ExtImpAdkernel.java index c3f990c8195..442db44032a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adkernel/ExtImpAdkernel.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adkernel/ExtImpAdkernel.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.adkernel; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdkernel { @JsonProperty("zoneId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adocean/ExtImpAdocean.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adocean/ExtImpAdocean.java index 4a1eb21f565..aa364d222ae 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adocean/ExtImpAdocean.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adocean/ExtImpAdocean.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.adocean; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.adocean */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdocean { @JsonProperty("emitterPrefix") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adoppler/ExtImpAdoppler.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adoppler/ExtImpAdoppler.java index b839645945b..a727c59b34b 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adoppler/ExtImpAdoppler.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adoppler/ExtImpAdoppler.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.adoppler; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdoppler { String adunit; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adot/ExtImpAdot.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adot/ExtImpAdot.java index 6e37becb9d9..f0696753d20 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adot/ExtImpAdot.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adot/ExtImpAdot.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.adot; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.adot */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdot { Boolean parallax; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adpone/ExtImpAdpone.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adpone/ExtImpAdpone.java index c109a798080..f8086455825 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adpone/ExtImpAdpone.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adpone/ExtImpAdpone.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.adpone; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; @Value -@AllArgsConstructor public class ExtImpAdpone { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adprime/ExtImpAdprime.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adprime/ExtImpAdprime.java index 8a5c2947648..91582df3529 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adprime/ExtImpAdprime.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adprime/ExtImpAdprime.java @@ -1,7 +1,6 @@ package org.prebid.server.proto.openrtb.ext.request.adprime; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; @@ -9,8 +8,7 @@ /** * Defines the contract for bidRequest.imp[i].ext.adprime */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdprime { @JsonProperty("TagID") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/advangelists/ExtImpAdvangelists.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/advangelists/ExtImpAdvangelists.java index 8591c2703c6..352762c8e08 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/advangelists/ExtImpAdvangelists.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/advangelists/ExtImpAdvangelists.java @@ -1,17 +1,14 @@ package org.prebid.server.proto.openrtb.ext.request.advangelists; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.advangelists */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdvangelists { String pubid; String placement; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adview/ExtImpAdview.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adview/ExtImpAdview.java index 886d3e5f18f..a1239b3aea0 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adview/ExtImpAdview.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adview/ExtImpAdview.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.adview; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpAdview { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adxcg/ExtImpAdxcg.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adxcg/ExtImpAdxcg.java index 79542d3184e..4d205b12229 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adxcg/ExtImpAdxcg.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adxcg/ExtImpAdxcg.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.adxcg; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.adxcg */ -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpAdxcg { String adzoneid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adyoulike/ExtImpAdyoulike.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adyoulike/ExtImpAdyoulike.java index 19f4172942a..4d64b1f191d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/adyoulike/ExtImpAdyoulike.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/adyoulike/ExtImpAdyoulike.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.adyoulike; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.adyoulike */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAdyoulike { String placement; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/algorix/ExtImpAlgorix.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/algorix/ExtImpAlgorix.java index 082bd748712..f666b99f289 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/algorix/ExtImpAlgorix.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/algorix/ExtImpAlgorix.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.algorix; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Algorix Ext Imp */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAlgorix { String sid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/amx/ExtImpAmx.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/amx/ExtImpAmx.java index 1ad50749816..f3206a5e01c 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/amx/ExtImpAmx.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/amx/ExtImpAmx.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.amx; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpAmx { @JsonProperty("tagId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/axis/ExtImpAxis.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/axis/ExtImpAxis.java index 7791f7210c1..8750a0b2eb8 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/axis/ExtImpAxis.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/axis/ExtImpAxis.java @@ -9,4 +9,3 @@ public class ExtImpAxis { String token; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/axonix/ExtImpAxonix.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/axonix/ExtImpAxonix.java index 7ec0fbaf095..104fb2a6085 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/axonix/ExtImpAxonix.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/axonix/ExtImpAxonix.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.axonix; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpAxonix { @JsonProperty("supplyId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfront.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfront.java index d9c924a824e..1d1b9e369aa 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfront.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfront.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.beachfront; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpBeachfront { @JsonProperty("appId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfrontAppIds.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfrontAppIds.java index 6ec6d7e2f5a..fe4e4887b5a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfrontAppIds.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/beachfront/ExtImpBeachfrontAppIds.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.beachfront; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpBeachfrontAppIds { String video; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/beintoo/ExtImpBeintoo.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/beintoo/ExtImpBeintoo.java index 6480370c041..0aebfc01482 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/beintoo/ExtImpBeintoo.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/beintoo/ExtImpBeintoo.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.beintoo; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpBeintoo { @JsonProperty("tagid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidmyadz/ExtImpBidmyadz.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidmyadz/ExtImpBidmyadz.java index 8f6bf79a71d..bd87438c8f3 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidmyadz/ExtImpBidmyadz.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidmyadz/ExtImpBidmyadz.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.bidmyadz; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpBidmyadz { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidscube/ExtImpBidscube.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidscube/ExtImpBidscube.java index 8cf58c3865c..875e26f145f 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidscube/ExtImpBidscube.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidscube/ExtImpBidscube.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.bidscube; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpBidscube { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/bmtm/ExtImpBmtm.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bmtm/ExtImpBmtm.java index eb6866b287f..12cc86cf1ca 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/bmtm/ExtImpBmtm.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bmtm/ExtImpBmtm.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.bmtm; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpBmtm { String placementId; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ccx/ExtImpCcx.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ccx/ExtImpCcx.java deleted file mode 100644 index 61a756c2932..00000000000 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ccx/ExtImpCcx.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.prebid.server.proto.openrtb.ext.request.ccx; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Value; - -@Value(staticConstructor = "of") -public class ExtImpCcx { - - @JsonProperty("placementId") - Integer placementId; -} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/concert/ExtImpConcert.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/concert/ExtImpConcert.java index b90732b55fb..b543c6b44e5 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/concert/ExtImpConcert.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/concert/ExtImpConcert.java @@ -7,7 +7,7 @@ import java.util.List; @Builder -@Value(staticConstructor = "of") +@Value public class ExtImpConcert { @JsonProperty("partnerId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/connectad/ExtImpConnectAd.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/connectad/ExtImpConnectAd.java index a88bbc2194d..a75c4846f64 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/connectad/ExtImpConnectAd.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/connectad/ExtImpConnectAd.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.connectad; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpConnectAd { @JsonProperty("networkId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/consumable/ExtImpConsumable.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/consumable/ExtImpConsumable.java index e9590dc2b17..696aefcde28 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/consumable/ExtImpConsumable.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/consumable/ExtImpConsumable.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.consumable; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.consumable */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpConsumable { @JsonProperty("networkId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/copper6ssp/ImpExtCopper6Ssp.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/copper6ssp/ImpExtCopper6Ssp.java index 1c2c057878a..858deb6f05f 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/copper6ssp/ImpExtCopper6Ssp.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/copper6ssp/ImpExtCopper6Ssp.java @@ -12,4 +12,3 @@ public class ImpExtCopper6Ssp { @JsonProperty("endpointId") String endpointId; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/cpmstar/ExtImpCpmStar.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/cpmstar/ExtImpCpmStar.java index 0aa8d990c2e..1954ac05a03 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/cpmstar/ExtImpCpmStar.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/cpmstar/ExtImpCpmStar.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.cpmstar; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpCpmStar { @JsonProperty("placementId") @@ -14,4 +12,3 @@ public class ExtImpCpmStar { @JsonProperty("subpoolId") Integer subPoolId; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/datablocks/ExtImpDatablocks.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/datablocks/ExtImpDatablocks.java index 9e33a4f7d81..19eedd5b3a1 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/datablocks/ExtImpDatablocks.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/datablocks/ExtImpDatablocks.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.datablocks; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.datablocks */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpDatablocks { @JsonProperty("sourceId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/decenterads/ExtImpDecenterads.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/decenterads/ExtImpDecenterads.java index d009f9b014e..00152f7ac18 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/decenterads/ExtImpDecenterads.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/decenterads/ExtImpDecenterads.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.decenterads; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.decenterads */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpDecenterads { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/deepintent/ExtImpDeepintent.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/deepintent/ExtImpDeepintent.java index 235c5e6c7f5..618f7dd2bef 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/deepintent/ExtImpDeepintent.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/deepintent/ExtImpDeepintent.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.deepintent; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpDeepintent { @JsonProperty("tagId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/emxdigital/ExtImpEmxDigital.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/emxdigital/ExtImpEmxDigital.java index d93597928b4..d96d0650b2b 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/emxdigital/ExtImpEmxDigital.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/emxdigital/ExtImpEmxDigital.java @@ -1,17 +1,14 @@ package org.prebid.server.proto.openrtb.ext.request.emxdigital; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.emx_digital */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpEmxDigital { String tagid; String bidfloor; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/eplanning/ExtImpEplanning.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/eplanning/ExtImpEplanning.java index 6e012ef909b..2fb09d0f9dc 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/eplanning/ExtImpEplanning.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/eplanning/ExtImpEplanning.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.eplanning; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.eplanning */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpEplanning { @JsonProperty("ci") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamma/ExtImpGamma.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamma/ExtImpGamma.java index 7f42cb2d828..cce179a8f0a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamma/ExtImpGamma.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamma/ExtImpGamma.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.gamma; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.gamma */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpGamma { String id; @@ -16,4 +14,3 @@ public class ExtImpGamma { String wid; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamoshi/ExtImpGamoshi.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamoshi/ExtImpGamoshi.java index a03fb7d6298..e0b961953b5 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamoshi/ExtImpGamoshi.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gamoshi/ExtImpGamoshi.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.gamoshi; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpGamoshi { @JsonProperty("supplyPartnerId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgum.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgum.java index 6f0803c9a6e..21f5cffd118 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgum.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgum.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.gumgum; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigInteger; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpGumgum { String zone; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumBanner.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumBanner.java index 857125e2847..a4eacbd9046 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumBanner.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumBanner.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.gumgum; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpGumgumBanner { Long slot; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumVideo.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumVideo.java index a0880109568..06bcfb14b4e 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumVideo.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/gumgum/ExtImpGumgumVideo.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.gumgum; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpGumgumVideo { @JsonProperty("irisid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtImpImds.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtImpImds.java index 1cf9158cd79..8d6d36297b4 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtImpImds.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtImpImds.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.imds; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.imds */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpImds { @JsonProperty("seatId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtRequestImds.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtRequestImds.java index 55d7875e7e2..86df035084d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtRequestImds.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/imds/ExtRequestImds.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.imds; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.ext */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestImds { @JsonProperty("seatId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/improvedigital/ExtImpImprovedigital.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/improvedigital/ExtImpImprovedigital.java index 150f947ee60..ff1a4e04160 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/improvedigital/ExtImpImprovedigital.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/improvedigital/ExtImpImprovedigital.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.improvedigital; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpImprovedigital { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/inmobi/ExtImpInmobi.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/inmobi/ExtImpInmobi.java index 8bc8b52c619..e2024710797 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/inmobi/ExtImpInmobi.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/inmobi/ExtImpInmobi.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.inmobi; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpInmobi { String plc; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/interactiveoffers/ExtImpInteractiveoffers.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/interactiveoffers/ExtImpInteractiveoffers.java index fc3427f745e..4e41693876c 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/interactiveoffers/ExtImpInteractiveoffers.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/interactiveoffers/ExtImpInteractiveoffers.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.interactiveoffers; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.interactiveoffers */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpInteractiveoffers { @JsonProperty("partnerId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/ExtImpInvibes.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/ExtImpInvibes.java index 1de204b5755..88a0267e71a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/ExtImpInvibes.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/ExtImpInvibes.java @@ -1,12 +1,10 @@ package org.prebid.server.proto.openrtb.ext.request.invibes; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.proto.openrtb.ext.request.invibes.model.InvibesDebug; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpInvibes { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/model/InvibesDebug.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/model/InvibesDebug.java index f3df563e03f..33df812b551 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/model/InvibesDebug.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/invibes/model/InvibesDebug.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.invibes.model; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class InvibesDebug { @JsonProperty("testBvid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ix/ExtImpIx.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ix/ExtImpIx.java index 12508ccbb1c..09d49e9406a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ix/ExtImpIx.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ix/ExtImpIx.java @@ -2,13 +2,11 @@ import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpIx { @JsonProperty("siteId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/jixie/ExtImpJixie.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/jixie/ExtImpJixie.java index ee9d29f28e7..e5526aefd8a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/jixie/ExtImpJixie.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/jixie/ExtImpJixie.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.jixie; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpJixie { String unit; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/kayzen/ExtImpKayzen.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/kayzen/ExtImpKayzen.java index 05cc2efe58f..6c203dc008d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/kayzen/ExtImpKayzen.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/kayzen/ExtImpKayzen.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.kayzen; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpKayzen { String zone; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/kidoz/ExtImpKidoz.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/kidoz/ExtImpKidoz.java index 8bc93217482..03b47a9bcfe 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/kidoz/ExtImpKidoz.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/kidoz/ExtImpKidoz.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.kidoz; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpKidoz { String accessToken; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/lockerdome/ExtImpLockerdome.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/lockerdome/ExtImpLockerdome.java index b9598677939..24c010c1ae5 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/lockerdome/ExtImpLockerdome.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/lockerdome/ExtImpLockerdome.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.lockerdome; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.lockerdome */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpLockerdome { @JsonProperty("adUnitId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/lunamedia/ExtImpLunamedia.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/lunamedia/ExtImpLunamedia.java index 5e6938c57a1..21b71ff98e6 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/lunamedia/ExtImpLunamedia.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/lunamedia/ExtImpLunamedia.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.lunamedia; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.lunamedia */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpLunamedia { String pubid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/madvertise/ExtImpMadvertise.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/madvertise/ExtImpMadvertise.java index 8ca5fc64015..946378c9350 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/madvertise/ExtImpMadvertise.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/madvertise/ExtImpMadvertise.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.madvertise; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpMadvertise { @JsonProperty("zoneId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobfoxpb/ExtImpMobfoxpb.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobfoxpb/ExtImpMobfoxpb.java index b19f6fa5fc8..0e1d423712f 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobfoxpb/ExtImpMobfoxpb.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobfoxpb/ExtImpMobfoxpb.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.mobfoxpb; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.mobfoxpb */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpMobfoxpb { @JsonProperty("TagID") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobilefuse/ExtImpMobilefuse.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobilefuse/ExtImpMobilefuse.java index 8fd14c9a887..a56f03baa2d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobilefuse/ExtImpMobilefuse.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/mobilefuse/ExtImpMobilefuse.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.mobilefuse; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.mobilefuse */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpMobilefuse { @JsonProperty("placement_id") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/onetag/ExtImpOnetag.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/onetag/ExtImpOnetag.java index 18cb4dd8ae2..92b592a46a3 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/onetag/ExtImpOnetag.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/onetag/ExtImpOnetag.java @@ -2,11 +2,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpOnetag { @JsonProperty("pubId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/openweb/ExtImpOpenweb.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/openweb/ExtImpOpenweb.java index a55ffea8b83..0b528f92984 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/openweb/ExtImpOpenweb.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/openweb/ExtImpOpenweb.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.openweb; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpOpenweb { Integer aid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/operaads/ExtImpOperaads.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/operaads/ExtImpOperaads.java index 4380a5eda8a..c713ae17ae7 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/operaads/ExtImpOperaads.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/operaads/ExtImpOperaads.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.operaads; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpOperaads { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/orbidder/ExtImpOrbidder.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/orbidder/ExtImpOrbidder.java index a22df1038c0..a25e67b28b9 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/orbidder/ExtImpOrbidder.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/orbidder/ExtImpOrbidder.java @@ -1,12 +1,10 @@ package org.prebid.server.proto.openrtb.ext.request.orbidder; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpOrbidder { String accountId; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrain.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrain.java index a7d771bd1be..04f00bb4f3a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrain.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrain.java @@ -1,12 +1,10 @@ package org.prebid.server.proto.openrtb.ext.request.outbrains; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpOutbrain { ExtImpOutbrainPublisher publisher; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrainPublisher.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrainPublisher.java index ba613cc8ff4..05261f9fb38 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrainPublisher.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/outbrains/ExtImpOutbrainPublisher.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.outbrains; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpOutbrainPublisher { String id; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pangle/ExtImpPangle.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pangle/ExtImpPangle.java index 8746d804644..2650654f848 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pangle/ExtImpPangle.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pangle/ExtImpPangle.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.pangle; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpPangle { String token; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubmatic/ExtImpPubmaticKeyVal.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubmatic/ExtImpPubmaticKeyVal.java index 56bf9b9b488..c04587cd433 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubmatic/ExtImpPubmaticKeyVal.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubmatic/ExtImpPubmaticKeyVal.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.request.pubmatic; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; @@ -8,8 +7,7 @@ /** * Defines the contract for bidrequest.imp[i].ext.pubmatic.keywords[i] */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpPubmaticKeyVal { String key; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubnative/ExtImpPubnative.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubnative/ExtImpPubnative.java index fe99f0c207b..9fa8bab85fa 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubnative/ExtImpPubnative.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pubnative/ExtImpPubnative.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.pubnative; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.pubnative */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpPubnative { Integer zoneId; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pulsepoint/ExtImpPulsepoint.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pulsepoint/ExtImpPulsepoint.java index 85625367548..7691faefbc6 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/pulsepoint/ExtImpPulsepoint.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/pulsepoint/ExtImpPulsepoint.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.pulsepoint; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpPulsepoint { @JsonProperty("cp") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/relevantdigital/ExtImpRelevantDigital.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/relevantdigital/ExtImpRelevantDigital.java index ce4840ab050..b62462aea4d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/relevantdigital/ExtImpRelevantDigital.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/relevantdigital/ExtImpRelevantDigital.java @@ -4,7 +4,7 @@ import lombok.Builder; import lombok.Value; -@Value(staticConstructor = "of") +@Value @Builder public class ExtImpRelevantDigital { diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/sharethrough/ExtImpSharethrough.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/sharethrough/ExtImpSharethrough.java index 5a6330711fe..abab2ee4e84 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/sharethrough/ExtImpSharethrough.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/sharethrough/ExtImpSharethrough.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.request.sharethrough; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; @@ -8,8 +7,7 @@ /** * Defines the contract for bidRequest.imp[i].ext.sharethrough */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpSharethrough { String pkey; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smaato/ExtImpSmaato.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smaato/ExtImpSmaato.java index 9f6ef557196..b60ef96a563 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smaato/ExtImpSmaato.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smaato/ExtImpSmaato.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.smaato; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpSmaato { @JsonProperty("publisherId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartadserver/ExtImpSmartadserver.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartadserver/ExtImpSmartadserver.java index 674ef8733b3..0d2e3c25487 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartadserver/ExtImpSmartadserver.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartadserver/ExtImpSmartadserver.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.smartadserver; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.smartadserver */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpSmartadserver { @JsonProperty("siteId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smarthub/ExtImpSmarthub.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smarthub/ExtImpSmarthub.java index 068c64ca4bb..058688502a8 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smarthub/ExtImpSmarthub.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smarthub/ExtImpSmarthub.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.smarthub; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpSmarthub { @JsonProperty("partnerName") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtImpSmartrtb.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtImpSmartrtb.java index 27b5bb48f00..4f1cf5f15b2 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtImpSmartrtb.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtImpSmartrtb.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.smartrtb; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpSmartrtb { String pubId; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtRequestSmartrtb.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtRequestSmartrtb.java index 5452f1bef92..b38895aad9a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtRequestSmartrtb.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartrtb/ExtRequestSmartrtb.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.smartrtb; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtRequestSmartrtb { String pubId; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartyads/ExtImpSmartyAds.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartyads/ExtImpSmartyAds.java index 2fa7b02cd85..d49fff0be81 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartyads/ExtImpSmartyAds.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/smartyads/ExtImpSmartyAds.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.smartyads; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpSmartyAds { @JsonProperty("accountid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrn/ExtImpSovrn.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrn/ExtImpSovrn.java index f9370eb9e74..8177d46ae8a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrn/ExtImpSovrn.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrn/ExtImpSovrn.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.request.sovrn; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpSovrn { String tagid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrnxsp/ExtImpSovrnXsp.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrnxsp/ExtImpSovrnXsp.java index 909b0ec179a..cacaf90fb0d 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrnxsp/ExtImpSovrnXsp.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/sovrnxsp/ExtImpSovrnXsp.java @@ -5,7 +5,7 @@ import lombok.Value; @Builder -@Value(staticConstructor = "of") +@Value public class ExtImpSovrnXsp { @JsonProperty("pub_id") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/stroeercore/ExtImpStroeerCore.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/stroeercore/ExtImpStroeerCore.java index b4f89021765..00eeabf53db 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/stroeercore/ExtImpStroeerCore.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/stroeercore/ExtImpStroeerCore.java @@ -9,4 +9,3 @@ public class ExtImpStroeerCore { @JsonProperty("sid") String slotId; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/tappx/ExtImpTappx.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/tappx/ExtImpTappx.java index cf4ee8b2834..98c0c8de77b 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/tappx/ExtImpTappx.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/tappx/ExtImpTappx.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.tappx; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpTappx { String host; @@ -27,4 +25,3 @@ public class ExtImpTappx { List bcrid; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpOutTelaria.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpOutTelaria.java index c58ff43f2ea..34fe9a82d26 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpOutTelaria.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpOutTelaria.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.telaria; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpOutTelaria { @JsonProperty("originalTagid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpTelaria.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpTelaria.java index 537ddf825de..c4b21399849 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpTelaria.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpTelaria.java @@ -2,11 +2,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpTelaria { @JsonProperty("adCode") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/theadx/ExtImpTheadx.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/theadx/ExtImpTheadx.java index ff7eb9e86f0..4012942097b 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/theadx/ExtImpTheadx.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/theadx/ExtImpTheadx.java @@ -19,4 +19,3 @@ public class ExtImpTheadx { String placementName; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/thirtythreeacross/ExtImpThirtyThreeAcross.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/thirtythreeacross/ExtImpThirtyThreeAcross.java index e18c9fb1583..a22e4df5f79 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/thirtythreeacross/ExtImpThirtyThreeAcross.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/thirtythreeacross/ExtImpThirtyThreeAcross.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.thirtythreeacross; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.33across */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpThirtyThreeAcross { @JsonProperty("siteId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/triplelift/ExtImpTriplelift.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/triplelift/ExtImpTriplelift.java index 473c045e2ba..dae544589bf 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/triplelift/ExtImpTriplelift.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/triplelift/ExtImpTriplelift.java @@ -1,7 +1,6 @@ package org.prebid.server.proto.openrtb.ext.request.triplelift; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import java.math.BigDecimal; @@ -9,8 +8,7 @@ /** * Defines the contract for bidRequest.imp[i].ext.triplelift */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpTriplelift { @JsonProperty("inventoryCode") @@ -18,4 +16,3 @@ public class ExtImpTriplelift { BigDecimal floor; } - diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ucfunnel/ExtImpUcfunnel.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ucfunnel/ExtImpUcfunnel.java index 68eb4336841..4c9b4f65040 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ucfunnel/ExtImpUcfunnel.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ucfunnel/ExtImpUcfunnel.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.ucfunnel; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpUcfunnel { String adunitid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/unicorn/ExtImpUnicorn.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/unicorn/ExtImpUnicorn.java index ce32cdb7050..83e0c1c2783 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/unicorn/ExtImpUnicorn.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/unicorn/ExtImpUnicorn.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.unicorn; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Value; -@AllArgsConstructor(staticName = "of") @Value @Builder(toBuilder = true) public class ExtImpUnicorn { diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/vrtcal/ExtImpVrtcal.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/vrtcal/ExtImpVrtcal.java index 899a67be538..182a5eb8487 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/vrtcal/ExtImpVrtcal.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/vrtcal/ExtImpVrtcal.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.vrtcal; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.Vrtcal */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpVrtcal { @JsonProperty("Just_an_unused_vrtcal_param") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/yahooads/ExtImpYahooAds.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/yahooads/ExtImpYahooAds.java index 23846e51bd2..e7bfd790fa9 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/yahooads/ExtImpYahooAds.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/yahooads/ExtImpYahooAds.java @@ -1,10 +1,8 @@ package org.prebid.server.proto.openrtb.ext.request.yahooads; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpYahooAds { String dcn; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldmo/ExtImpYieldmo.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldmo/ExtImpYieldmo.java index 5f9bd42f9ae..227750be1e2 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldmo/ExtImpYieldmo.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldmo/ExtImpYieldmo.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.yieldmo; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.yieldmo */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpYieldmo { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldone/ExtImpYieldone.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldone/ExtImpYieldone.java index 48ace41d819..12b59bfd92e 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldone/ExtImpYieldone.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/yieldone/ExtImpYieldone.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.yieldone; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidrequest.imp[i].ext.yieldone */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpYieldone { @JsonProperty("placementId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeroclickfraud/ExtImpZeroclickfraud.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeroclickfraud/ExtImpZeroclickfraud.java index baeffdcda8e..d74b6d512dd 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeroclickfraud/ExtImpZeroclickfraud.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/zeroclickfraud/ExtImpZeroclickfraud.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.request.zeroclickfraud; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidRequest.imp[i].ext.zeroclickfraud */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtImpZeroclickfraud { @JsonProperty("sourceId") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/CacheAsset.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/CacheAsset.java index 6a490afc7fb..99748f0f5c0 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/CacheAsset.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/CacheAsset.java @@ -1,7 +1,6 @@ package org.prebid.server.proto.openrtb.ext.response; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** @@ -10,8 +9,7 @@ * and * bidresponse.seatbid.bid[i].ext.prebid.cache.vastXml */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CacheAsset { String url; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/Events.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/Events.java index f9d60fe227a..11c0594fbbc 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/Events.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/Events.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.response; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidresponse.seatbid.bid[i].ext.prebid.events */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class Events { String win; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtAdPod.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtAdPod.java index 655ed5ddbe4..530e5321fa4 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtAdPod.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtAdPod.java @@ -1,12 +1,10 @@ package org.prebid.server.proto.openrtb.ext.response; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtAdPod { Integer podid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtDebugTrace.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtDebugTrace.java index f17c2c9cf16..6ab54f9f9ae 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtDebugTrace.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtDebugTrace.java @@ -1,6 +1,5 @@ package org.prebid.server.proto.openrtb.ext.response; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; @@ -8,8 +7,7 @@ /** * Defines the contract for bidresponse.ext.debug.trace */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtDebugTrace { List activityInfrastructure; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgi.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgi.java index 49e84d9739f..a68ed9cdf6a 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgi.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgi.java @@ -9,7 +9,7 @@ * Defines the contract for bidresponse.ext.igi */ @Builder(toBuilder = true) -@Value(staticConstructor = "of") +@Value public class ExtIgi { String impid; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgiIgs.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgiIgs.java index a243380bb4e..305d211a4b5 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgiIgs.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtIgiIgs.java @@ -6,7 +6,7 @@ import lombok.Value; @Builder(toBuilder = true) -@Value(staticConstructor = "of") +@Value public class ExtIgiIgs { @JsonProperty("impid") diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseCache.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseCache.java index cc63a9726e5..f13206d51c7 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseCache.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseCache.java @@ -1,14 +1,12 @@ package org.prebid.server.proto.openrtb.ext.response; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidresponse.seatbid.bid[i].ext.prebid.cache */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtResponseCache { CacheAsset bids; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseDebug.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseDebug.java index 7d1a5f4c499..fd2328afc18 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseDebug.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseDebug.java @@ -1,7 +1,6 @@ package org.prebid.server.proto.openrtb.ext.response; import com.iab.openrtb.request.BidRequest; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; @@ -10,8 +9,7 @@ /** * Defines the contract for bidresponse.ext.debug */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtResponseDebug { /** diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseVideoTargeting.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseVideoTargeting.java index 589b53c82f2..fdd2a33ac08 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseVideoTargeting.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseVideoTargeting.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.openrtb.ext.response; -import lombok.AllArgsConstructor; import lombok.Value; /** * Defines the contract for bidresponse.ext.debug */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class ExtResponseVideoTargeting { String hbPb; @@ -16,4 +14,3 @@ public class ExtResponseVideoTargeting { String hbCacheID; } - diff --git a/src/main/java/org/prebid/server/proto/request/CookieSyncRequest.java b/src/main/java/org/prebid/server/proto/request/CookieSyncRequest.java index b45221478fe..97e589134fb 100644 --- a/src/main/java/org/prebid/server/proto/request/CookieSyncRequest.java +++ b/src/main/java/org/prebid/server/proto/request/CookieSyncRequest.java @@ -59,4 +59,3 @@ public enum FilterType { include, exclude } } - diff --git a/src/main/java/org/prebid/server/proto/request/Targeting.java b/src/main/java/org/prebid/server/proto/request/Targeting.java index 246f33d45ed..804e7e9b179 100644 --- a/src/main/java/org/prebid/server/proto/request/Targeting.java +++ b/src/main/java/org/prebid/server/proto/request/Targeting.java @@ -1,34 +1,25 @@ package org.prebid.server.proto.request; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class Targeting { - private static final Targeting EMPTY = Targeting.of(null, null, null); - /* * Will be mapped to ext.prebid.data */ - List bidders; + /* * Will be mapped to site.ext.data */ - ObjectNode site; + /* * Will be mapped to user.ext.data */ - ObjectNode user; - - public static Targeting empty() { - return EMPTY; - } } diff --git a/src/main/java/org/prebid/server/proto/response/CookieSyncResponse.java b/src/main/java/org/prebid/server/proto/response/CookieSyncResponse.java index b7dae32ce6e..9b590390b83 100644 --- a/src/main/java/org/prebid/server/proto/response/CookieSyncResponse.java +++ b/src/main/java/org/prebid/server/proto/response/CookieSyncResponse.java @@ -1,13 +1,11 @@ package org.prebid.server.proto.response; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.cookie.model.CookieSyncStatus; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class CookieSyncResponse { CookieSyncStatus status; diff --git a/src/main/java/org/prebid/server/proto/response/VideoResponse.java b/src/main/java/org/prebid/server/proto/response/VideoResponse.java index 364f5a4beac..4eb942bd9f8 100644 --- a/src/main/java/org/prebid/server/proto/response/VideoResponse.java +++ b/src/main/java/org/prebid/server/proto/response/VideoResponse.java @@ -14,4 +14,3 @@ public class VideoResponse { ExtAmpVideoResponse ext; } - diff --git a/src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java b/src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java index 3f1e38f757b..65b272d5281 100644 --- a/src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java +++ b/src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java @@ -79,7 +79,7 @@ public static ProtobufMapper extensionMapper) { return (OpenRtb.NativeResponse.Asset asset) -> - com.iab.openrtb.response.Asset.builder() + Asset.builder() .id(asset.getId()) .required(BooleanUtils.toInteger(asset.getRequired())) .title(titleMapper.map(asset.getTitle())) diff --git a/src/main/java/org/prebid/server/settings/DatabaseApplicationSettings.java b/src/main/java/org/prebid/server/settings/DatabaseApplicationSettings.java index c346e4824f4..9c7408260d6 100644 --- a/src/main/java/org/prebid/server/settings/DatabaseApplicationSettings.java +++ b/src/main/java/org/prebid/server/settings/DatabaseApplicationSettings.java @@ -122,7 +122,7 @@ public Future> getCategories(String primaryAdServer, String /** * Transforms the first row of {@link RowSet} to required object or returns null. *

- * Note: mapper should never throws exception in case of using + * Note: mapper should never throw exception in case of using * {@link CircuitBreakerSecuredDatabaseClient}. */ private T mapToModelOrError(RowSet rowSet, Function mapper) { diff --git a/src/main/java/org/prebid/server/settings/helper/DatabaseStoredDataResultMapper.java b/src/main/java/org/prebid/server/settings/helper/DatabaseStoredDataResultMapper.java index 00853194e65..41cb6224e7e 100644 --- a/src/main/java/org/prebid/server/settings/helper/DatabaseStoredDataResultMapper.java +++ b/src/main/java/org/prebid/server/settings/helper/DatabaseStoredDataResultMapper.java @@ -39,7 +39,7 @@ private DatabaseStoredDataResultMapper() { * @param impIds - a specified set of stored imps' IDs. Adds error for each ID missing in result set * @return - a {@link StoredDataResult} object *

- * Note: mapper should never throws exception in case of using + * Note: mapper should never throw exception in case of using * {@link CircuitBreakerSecuredDatabaseClient}. */ public static StoredDataResult map(RowSet rowSet, diff --git a/src/main/java/org/prebid/server/settings/helper/StoredItemResolver.java b/src/main/java/org/prebid/server/settings/helper/StoredItemResolver.java index 0729141bd30..8e3c43058fc 100644 --- a/src/main/java/org/prebid/server/settings/helper/StoredItemResolver.java +++ b/src/main/java/org/prebid/server/settings/helper/StoredItemResolver.java @@ -26,7 +26,7 @@ private StoredItemResolver() { *

* - Otherwise, find stored item for this account or report an error if no one account matched. *

- * 2. One stored stored item was found: + * 2. One stored item was found: *

* - If account is not specified in stored item or found stored item has the same account - use it. *

diff --git a/src/main/java/org/prebid/server/settings/model/GdprConfig.java b/src/main/java/org/prebid/server/settings/model/GdprConfig.java index f4daf274da7..80d4abd9cfb 100644 --- a/src/main/java/org/prebid/server/settings/model/GdprConfig.java +++ b/src/main/java/org/prebid/server/settings/model/GdprConfig.java @@ -36,4 +36,3 @@ public class GdprConfig { @JsonProperty("purpose-one-treatment-interpretation") PurposeOneTreatmentInterpretation purposeOneTreatmentInterpretation; } - diff --git a/src/main/java/org/prebid/server/settings/model/Purposes.java b/src/main/java/org/prebid/server/settings/model/Purposes.java index 16156e6cffb..1d0732b48c2 100644 --- a/src/main/java/org/prebid/server/settings/model/Purposes.java +++ b/src/main/java/org/prebid/server/settings/model/Purposes.java @@ -31,4 +31,3 @@ public class Purposes { Purpose p10; } - diff --git a/src/main/java/org/prebid/server/settings/model/SpecialFeature.java b/src/main/java/org/prebid/server/settings/model/SpecialFeature.java index fefe7239c4e..17cdb19ff40 100644 --- a/src/main/java/org/prebid/server/settings/model/SpecialFeature.java +++ b/src/main/java/org/prebid/server/settings/model/SpecialFeature.java @@ -19,4 +19,3 @@ public class SpecialFeature { @JsonAlias("vendor-exceptions") List vendorExceptions; } - diff --git a/src/main/java/org/prebid/server/settings/model/SpecialFeatures.java b/src/main/java/org/prebid/server/settings/model/SpecialFeatures.java index f7974e444a7..a927dbfcadf 100644 --- a/src/main/java/org/prebid/server/settings/model/SpecialFeatures.java +++ b/src/main/java/org/prebid/server/settings/model/SpecialFeatures.java @@ -15,4 +15,3 @@ public class SpecialFeatures { SpecialFeature sf2; } - diff --git a/src/main/java/org/prebid/server/settings/model/StoredDataResult.java b/src/main/java/org/prebid/server/settings/model/StoredDataResult.java index 263cf8f4300..81b682d24fa 100644 --- a/src/main/java/org/prebid/server/settings/model/StoredDataResult.java +++ b/src/main/java/org/prebid/server/settings/model/StoredDataResult.java @@ -1,13 +1,11 @@ package org.prebid.server.settings.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class StoredDataResult { Map storedIdToRequest; diff --git a/src/main/java/org/prebid/server/settings/model/StoredItem.java b/src/main/java/org/prebid/server/settings/model/StoredItem.java index 5b639a30cdd..d84f0065bfa 100644 --- a/src/main/java/org/prebid/server/settings/model/StoredItem.java +++ b/src/main/java/org/prebid/server/settings/model/StoredItem.java @@ -1,13 +1,11 @@ package org.prebid.server.settings.model; -import lombok.AllArgsConstructor; import lombok.Value; /** * The model helps to reduce multiple rows found for single stored request/imp ID. */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class StoredItem { String accountId; diff --git a/src/main/java/org/prebid/server/settings/model/StoredResponseDataResult.java b/src/main/java/org/prebid/server/settings/model/StoredResponseDataResult.java index ad27eda7954..bc85d5034e3 100644 --- a/src/main/java/org/prebid/server/settings/model/StoredResponseDataResult.java +++ b/src/main/java/org/prebid/server/settings/model/StoredResponseDataResult.java @@ -1,13 +1,11 @@ package org.prebid.server.settings.model; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class StoredResponseDataResult { Map idToStoredResponses; diff --git a/src/main/java/org/prebid/server/settings/model/VideoStoredDataResult.java b/src/main/java/org/prebid/server/settings/model/VideoStoredDataResult.java index 186997df3ac..8838cc8a381 100644 --- a/src/main/java/org/prebid/server/settings/model/VideoStoredDataResult.java +++ b/src/main/java/org/prebid/server/settings/model/VideoStoredDataResult.java @@ -1,15 +1,13 @@ package org.prebid.server.settings.model; import com.iab.openrtb.request.Video; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Collections; import java.util.List; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class VideoStoredDataResult { private static final VideoStoredDataResult EMPTY = VideoStoredDataResult.of(Collections.emptyMap(), diff --git a/src/main/java/org/prebid/server/settings/proto/request/InvalidateSettingsCacheRequest.java b/src/main/java/org/prebid/server/settings/proto/request/InvalidateSettingsCacheRequest.java index 288b997e636..698fd569242 100644 --- a/src/main/java/org/prebid/server/settings/proto/request/InvalidateSettingsCacheRequest.java +++ b/src/main/java/org/prebid/server/settings/proto/request/InvalidateSettingsCacheRequest.java @@ -1,12 +1,10 @@ package org.prebid.server.settings.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.List; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class InvalidateSettingsCacheRequest { List requests; diff --git a/src/main/java/org/prebid/server/settings/proto/request/UpdateSettingsCacheRequest.java b/src/main/java/org/prebid/server/settings/proto/request/UpdateSettingsCacheRequest.java index 93c58121f5d..f1cdd231850 100644 --- a/src/main/java/org/prebid/server/settings/proto/request/UpdateSettingsCacheRequest.java +++ b/src/main/java/org/prebid/server/settings/proto/request/UpdateSettingsCacheRequest.java @@ -1,12 +1,10 @@ package org.prebid.server.settings.proto.request; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class UpdateSettingsCacheRequest { Map requests; diff --git a/src/main/java/org/prebid/server/settings/proto/response/HttpAccountsResponse.java b/src/main/java/org/prebid/server/settings/proto/response/HttpAccountsResponse.java index a893b2dc01a..9770fefc163 100644 --- a/src/main/java/org/prebid/server/settings/proto/response/HttpAccountsResponse.java +++ b/src/main/java/org/prebid/server/settings/proto/response/HttpAccountsResponse.java @@ -1,13 +1,11 @@ package org.prebid.server.settings.proto.response; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.settings.model.Account; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class HttpAccountsResponse { Map accounts; diff --git a/src/main/java/org/prebid/server/settings/proto/response/HttpFetcherResponse.java b/src/main/java/org/prebid/server/settings/proto/response/HttpFetcherResponse.java index 256e9d3273e..0d2f7e774e5 100644 --- a/src/main/java/org/prebid/server/settings/proto/response/HttpFetcherResponse.java +++ b/src/main/java/org/prebid/server/settings/proto/response/HttpFetcherResponse.java @@ -1,13 +1,11 @@ package org.prebid.server.settings.proto.response; import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; import lombok.Value; import java.util.Map; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class HttpFetcherResponse { Map requests; diff --git a/src/main/java/org/prebid/server/spring/config/AnalyticsConfiguration.java b/src/main/java/org/prebid/server/spring/config/AnalyticsConfiguration.java index d618c36fa36..2e0b2d1a296 100644 --- a/src/main/java/org/prebid/server/spring/config/AnalyticsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/AnalyticsConfiguration.java @@ -33,8 +33,8 @@ import jakarta.validation.constraints.NotNull; import java.time.Clock; import java.util.List; -import java.util.Set; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; @Configuration diff --git a/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java b/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java index 0ab743a484f..1e496ea7e9a 100644 --- a/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java @@ -626,7 +626,7 @@ private static BasicHttpClient createBasicHttpClient(Vertx vertx, HttpClientProp .setIdleTimeoutUnit(TimeUnit.MILLISECONDS) .setIdleTimeout(httpClientProperties.getIdleTimeoutMs()) .setPoolCleanerPeriod(httpClientProperties.getPoolCleanerPeriodMs()) - .setTryUseCompression(httpClientProperties.getUseCompression()) + .setDecompressionSupported(httpClientProperties.getUseCompression()) .setConnectTimeout(httpClientProperties.getConnectTimeoutMs()) // Vert.x's HttpClientRequest needs this value to be 2 for redirections to be followed once, // 3 for twice, and so on @@ -639,7 +639,7 @@ private static BasicHttpClient createBasicHttpClient(Vertx vertx, HttpClientProp options .setSsl(true) - .setKeyStoreOptions(jksOptions); + .setKeyCertOptions(jksOptions); } return new BasicHttpClient(vertx, vertx.createHttpClient(options)); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java index 7b58430ee4c..79d50338b1d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java @@ -39,4 +39,3 @@ BidderDeps advangelistsBidderDeps(BidderConfigurationProperties advangelistsConf .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java index 93b896371af..b75d013a8d6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java @@ -39,4 +39,3 @@ BidderDeps axisBidderDeps(BidderConfigurationProperties axisConfigurationPropert .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java index 8423eb76cf2..39bdebda807 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java @@ -39,4 +39,3 @@ BidderDeps axonixBidderDeps(BidderConfigurationProperties axonixConfigurationPro .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java index bef7077d93c..e5ec3bc1557 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java @@ -39,4 +39,3 @@ BidderDeps bematterfullBidderDeps(BidderConfigurationProperties bematterfullConf .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java index 64855592dbe..dbeccd07032 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java @@ -39,4 +39,3 @@ BidderDeps emxdigitalBidderDeps(BidderConfigurationProperties emxdigitalConfigur .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java index 141c4ddd313..b26cefb1909 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java @@ -39,4 +39,3 @@ BidderDeps gammaBidderDeps(BidderConfigurationProperties gammaConfigurationPrope .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java index 47cdeb08045..92062b99e1e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java @@ -39,4 +39,3 @@ BidderDeps omsBidderDeps(BidderConfigurationProperties omsConfigurationPropertie .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java index 352ec244ecd..6c7b8dedae6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java @@ -41,4 +41,3 @@ BidderDeps tappxBidderDeps(BidderConfigurationProperties tappxConfigurationPrope .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java index 7905fc384f0..6feae487f51 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java @@ -39,4 +39,3 @@ BidderDeps unicornBidderDeps(BidderConfigurationProperties unicornConfigurationP .assemble(); } } - diff --git a/src/main/java/org/prebid/server/spring/config/database/ConnectionPoolConfigurationFactory.java b/src/main/java/org/prebid/server/spring/config/database/ConnectionPoolConfigurationFactory.java deleted file mode 100644 index cba0282f72e..00000000000 --- a/src/main/java/org/prebid/server/spring/config/database/ConnectionPoolConfigurationFactory.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.prebid.server.spring.config.database; - -import io.vertx.core.json.JsonObject; -import org.prebid.server.spring.config.database.model.ConnectionPoolSettings; - -public interface ConnectionPoolConfigurationFactory { - - JsonObject create(String databaseUrl, ConnectionPoolSettings connectionPoolSettings); -} diff --git a/src/main/java/org/prebid/server/spring/config/database/DatabaseUrlFactory.java b/src/main/java/org/prebid/server/spring/config/database/DatabaseUrlFactory.java deleted file mode 100644 index 0c1828fb9b1..00000000000 --- a/src/main/java/org/prebid/server/spring/config/database/DatabaseUrlFactory.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.prebid.server.spring.config.database; - -public interface DatabaseUrlFactory { - - String createUrl(String host, int port, String databaseName); -} diff --git a/src/main/java/org/prebid/server/spring/config/database/model/DatabaseType.java b/src/main/java/org/prebid/server/spring/config/database/model/DatabaseType.java index fd7373a1aab..8542f707911 100644 --- a/src/main/java/org/prebid/server/spring/config/database/model/DatabaseType.java +++ b/src/main/java/org/prebid/server/spring/config/database/model/DatabaseType.java @@ -1,8 +1,5 @@ package org.prebid.server.spring.config.database.model; -import lombok.AllArgsConstructor; - -@AllArgsConstructor public enum DatabaseType { postgres, diff --git a/src/main/java/org/prebid/server/spring/config/metrics/MetricsConfiguration.java b/src/main/java/org/prebid/server/spring/config/metrics/MetricsConfiguration.java index daba3fda594..a30b61f9fdd 100644 --- a/src/main/java/org/prebid/server/spring/config/metrics/MetricsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/metrics/MetricsConfiguration.java @@ -1,12 +1,10 @@ package org.prebid.server.spring.config.metrics; -import org.prebid.server.auction.HooksMetricsService; -import org.slf4j.LoggerFactory; -import com.codahale.metrics.Slf4jReporter; import com.codahale.metrics.ConsoleReporter; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.ScheduledReporter; import com.codahale.metrics.SharedMetricRegistries; +import com.codahale.metrics.Slf4jReporter; import com.codahale.metrics.graphite.Graphite; import com.codahale.metrics.graphite.GraphiteReporter; import com.codahale.metrics.jvm.GarbageCollectorMetricSet; @@ -17,11 +15,13 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.ObjectUtils; +import org.prebid.server.auction.HooksMetricsService; import org.prebid.server.metric.AccountMetricsVerbosityResolver; import org.prebid.server.metric.CounterType; import org.prebid.server.metric.Metrics; import org.prebid.server.metric.model.AccountMetricsVerbosityLevel; import org.prebid.server.spring.env.YamlPropertySourceFactory; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/prebid/server/spring/config/model/ExternalConversionProperties.java b/src/main/java/org/prebid/server/spring/config/model/ExternalConversionProperties.java index 6e0373fba11..3e1181b5fe5 100644 --- a/src/main/java/org/prebid/server/spring/config/model/ExternalConversionProperties.java +++ b/src/main/java/org/prebid/server/spring/config/model/ExternalConversionProperties.java @@ -50,4 +50,3 @@ public class ExternalConversionProperties { @NotNull JacksonMapper mapper; } - diff --git a/src/main/java/org/prebid/server/spring/config/retry/ExponentialBackoffRetryPolicyConfigurationProperties.java b/src/main/java/org/prebid/server/spring/config/retry/ExponentialBackoffRetryPolicyConfigurationProperties.java index ca584979578..06d6f6d7264 100644 --- a/src/main/java/org/prebid/server/spring/config/retry/ExponentialBackoffRetryPolicyConfigurationProperties.java +++ b/src/main/java/org/prebid/server/spring/config/retry/ExponentialBackoffRetryPolicyConfigurationProperties.java @@ -27,4 +27,3 @@ public ExponentialBackoffRetryPolicy toPolicy() { return ExponentialBackoffRetryPolicy.of(delayMillis, maxDelayMillis, factor, jitter); } } - diff --git a/src/main/java/org/prebid/server/spring/config/server/application/ApplicationServerConfiguration.java b/src/main/java/org/prebid/server/spring/config/server/application/ApplicationServerConfiguration.java index b7c9eb405da..88f1ef32f92 100644 --- a/src/main/java/org/prebid/server/spring/config/server/application/ApplicationServerConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/server/application/ApplicationServerConfiguration.java @@ -47,6 +47,7 @@ import org.prebid.server.handler.info.filters.BidderInfoFilterStrategy; import org.prebid.server.handler.info.filters.EnabledOnlyBidderInfoFilterStrategy; import org.prebid.server.handler.openrtb2.AmpHandler; +import org.prebid.server.handler.openrtb2.AuctionHandler; import org.prebid.server.handler.openrtb2.VideoHandler; import org.prebid.server.health.HealthChecker; import org.prebid.server.health.PeriodicHealthChecker; @@ -150,7 +151,7 @@ HttpServerOptions httpServerOptions( httpServerOptions .setSsl(true) - .setKeyStoreOptions(jksOptions); + .setKeyCertOptions(jksOptions); } return httpServerOptions; @@ -194,7 +195,8 @@ NoCacheHandler noCacheHandler() { @Bean CorsHandler corsHandler() { - return CorsHandler.create(".*") + return CorsHandler.create() + .addRelativeOrigin(".*") .allowCredentials(true) .allowedHeaders(new HashSet<>(Arrays.asList( HttpUtil.ORIGIN_HEADER.toString(), @@ -206,7 +208,7 @@ CorsHandler corsHandler() { } @Bean - org.prebid.server.handler.openrtb2.AuctionHandler openrtbAuctionHandler( + AuctionHandler openrtbAuctionHandler( ExchangeService exchangeService, SkippedAuctionService skippedAuctionService, AuctionRequestFactory auctionRequestFactory, @@ -219,7 +221,7 @@ org.prebid.server.handler.openrtb2.AuctionHandler openrtbAuctionHandler( HookStageExecutor hookStageExecutor, JacksonMapper mapper) { - return new org.prebid.server.handler.openrtb2.AuctionHandler( + return new AuctionHandler( logSamplingRate, auctionRequestFactory, exchangeService, diff --git a/src/main/java/org/prebid/server/util/ResourceUtil.java b/src/main/java/org/prebid/server/util/ResourceUtil.java index ca2a7ef72ea..898dd29f385 100644 --- a/src/main/java/org/prebid/server/util/ResourceUtil.java +++ b/src/main/java/org/prebid/server/util/ResourceUtil.java @@ -1,6 +1,6 @@ package org.prebid.server.util; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/prebid/server/util/VersionInfo.java b/src/main/java/org/prebid/server/util/VersionInfo.java index f7240ea38bb..3ddc9b52b74 100644 --- a/src/main/java/org/prebid/server/util/VersionInfo.java +++ b/src/main/java/org/prebid/server/util/VersionInfo.java @@ -1,7 +1,6 @@ package org.prebid.server.util; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.json.JacksonMapper; import org.prebid.server.log.Logger; @@ -48,8 +47,7 @@ private static String extractVersion(String buildVersion) { return versionMatcher.lookingAt() ? versionMatcher.group() : null; } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class Revision { @JsonProperty("git.commit.id") diff --git a/src/main/java/org/prebid/server/util/algorithms/random/RandomAnyWeightedEntrySupplier.java b/src/main/java/org/prebid/server/util/algorithms/random/RandomAnyWeightedEntrySupplier.java index 8ce28177988..37f3337b339 100644 --- a/src/main/java/org/prebid/server/util/algorithms/random/RandomAnyWeightedEntrySupplier.java +++ b/src/main/java/org/prebid/server/util/algorithms/random/RandomAnyWeightedEntrySupplier.java @@ -59,4 +59,3 @@ private E getEntry(Iterable entries, long entryNumber) { throw new AssertionError(); } } - diff --git a/src/main/java/org/prebid/server/util/algorithms/random/RandomPositiveWeightedEntrySupplier.java b/src/main/java/org/prebid/server/util/algorithms/random/RandomPositiveWeightedEntrySupplier.java index 675dba5aa4f..595fc52b1df 100644 --- a/src/main/java/org/prebid/server/util/algorithms/random/RandomPositiveWeightedEntrySupplier.java +++ b/src/main/java/org/prebid/server/util/algorithms/random/RandomPositiveWeightedEntrySupplier.java @@ -17,4 +17,3 @@ protected int weight(E entry) { throw new IllegalArgumentException("Entry weight must be greater than 0."); } } - diff --git a/src/main/java/org/prebid/server/vertx/httpclient/model/HttpClientResponse.java b/src/main/java/org/prebid/server/vertx/httpclient/model/HttpClientResponse.java index 7ed9056e62e..af2f048672d 100644 --- a/src/main/java/org/prebid/server/vertx/httpclient/model/HttpClientResponse.java +++ b/src/main/java/org/prebid/server/vertx/httpclient/model/HttpClientResponse.java @@ -1,7 +1,6 @@ package org.prebid.server.vertx.httpclient.model; import io.vertx.core.MultiMap; -import lombok.AllArgsConstructor; import lombok.Value; /** @@ -9,8 +8,7 @@ *

* Should be created in "bodyHandler(...) after response has been read." */ -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class HttpClientResponse { int statusCode; diff --git a/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java b/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java index 01bbac7c4c7..7410c387a22 100644 --- a/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java +++ b/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java @@ -3225,7 +3225,7 @@ public void shouldPassIntegrationToCacheServiceAndBidEvents() { // then verify(coreCacheService).cacheBidsOpenrtb(anyList(), any(), any(), - argThat(eventsContext -> eventsContext.getIntegration().equals("integration"))); + argThat(eventsContext -> "integration".equals(eventsContext.getIntegration()))); assertThat(result.result().getSeatbid()) .flatExtracting(SeatBid::getBid).hasSize(1) diff --git a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java index d5ae7bcf6e3..25ee4657df9 100644 --- a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java +++ b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java @@ -448,7 +448,7 @@ public void shouldSkipBidderDisallowedByActivityInfrastructure() { given(activityInfrastructure.isAllowed( eq(Activity.CALL_BIDDER), argThat(argument -> argument.componentType().equals(ComponentType.BIDDER) - && argument.componentName().equals("disallowed")))) + && "disallowed".equals(argument.componentName())))) .willReturn(false); final BidRequest bidRequest = givenBidRequest(givenSingleImp(singletonMap("disallowed", 0))); diff --git a/src/test/java/org/prebid/server/auction/mediatypeprocessor/CompositeMediaTypeProcessorTest.java b/src/test/java/org/prebid/server/auction/mediatypeprocessor/CompositeMediaTypeProcessorTest.java index 0bc3c835600..47c40634788 100644 --- a/src/test/java/org/prebid/server/auction/mediatypeprocessor/CompositeMediaTypeProcessorTest.java +++ b/src/test/java/org/prebid/server/auction/mediatypeprocessor/CompositeMediaTypeProcessorTest.java @@ -49,7 +49,7 @@ public void processShouldReturnExpectedResult() { singletonList(BidderError.badInput("Error from mediaTypeProcessor1")))); given(mediaTypeProcessor2.process( - argThat(request -> request.getId().equals("processed by mediaTypeProcessor1")), + argThat(request -> "processed by mediaTypeProcessor1".equals(request.getId())), anyString(), any(), any())) diff --git a/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java b/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java index 0a59735ed07..fe4c72b89ca 100644 --- a/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java +++ b/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java @@ -16,6 +16,7 @@ import io.vertx.core.MultiMap; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.net.impl.SocketAddressImpl; +import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.RoutingContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -122,10 +123,12 @@ public class AmpRequestFactoryTest extends VertxTest { private AmpRequestFactory target; - @Mock(strictness = LENIENT) - private HttpServerRequest httpRequest; @Mock(strictness = LENIENT) private RoutingContext routingContext; + @Mock(strictness = LENIENT) + private HttpServerRequest httpRequest; + @Mock + private RequestBody requestBody; private BidRequest defaultBidRequest; @@ -141,6 +144,7 @@ public void setUp() { .willAnswer(invocation -> invocation.getArgument(0)); given(routingContext.request()).willReturn(httpRequest); + given(routingContext.body()).willReturn(requestBody); given(routingContext.queryParams()).willReturn( MultiMap.caseInsensitiveMultiMap() .add("tag_id", "tagId")); diff --git a/src/test/java/org/prebid/server/auction/requestfactory/AuctionRequestFactoryTest.java b/src/test/java/org/prebid/server/auction/requestfactory/AuctionRequestFactoryTest.java index 60a9f35c603..4da083fac4e 100644 --- a/src/test/java/org/prebid/server/auction/requestfactory/AuctionRequestFactoryTest.java +++ b/src/test/java/org/prebid/server/auction/requestfactory/AuctionRequestFactoryTest.java @@ -16,6 +16,7 @@ import io.vertx.core.MultiMap; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.net.impl.SocketAddressImpl; +import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.RoutingContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -118,6 +119,8 @@ public class AuctionRequestFactoryTest extends VertxTest { private RoutingContext routingContext; @Mock(strictness = LENIENT) private HttpServerRequest httpRequest; + @Mock(strictness = LENIENT) + private RequestBody requestBody; private Account defaultAccount; private BidRequest defaultBidRequest; @@ -153,6 +156,7 @@ public void setUp() { .willAnswer(invocation -> invocation.getArgument(0)); given(routingContext.request()).willReturn(httpRequest); + given(routingContext.body()).willReturn(requestBody); given(routingContext.queryParams()).willReturn(MultiMap.caseInsensitiveMultiMap()); given(httpRequest.headers()).willReturn(MultiMap.caseInsensitiveMultiMap()); given(httpRequest.remoteAddress()).willReturn(new SocketAddressImpl(1234, "host")); @@ -220,7 +224,7 @@ public void setUp() { @Test public void shouldReturnFailedFutureIfRequestBodyIsMissing() { // given - given(routingContext.getBody()).willReturn(null); + given(requestBody.buffer()).willReturn(null); // when final Future future = target.parseRequest(routingContext, 0L); @@ -252,7 +256,7 @@ public void shouldReturnFailedFutureIfRequestBodyExceedsMaxRequestSize() { geoLocationServiceWrapper, bidAdjustmentsRetriever); - given(routingContext.getBodyAsString()).willReturn("body"); + given(requestBody.asString()).willReturn("body"); // when final Future future = target.parseRequest(routingContext, 0L); @@ -267,7 +271,7 @@ public void shouldReturnFailedFutureIfRequestBodyExceedsMaxRequestSize() { @Test public void shouldReturnFailedFutureIfRequestBodyCouldNotBeParsed() { // given - given(routingContext.getBodyAsString()).willReturn("body"); + given(requestBody.asString()).willReturn("body"); // when final Future future = target.parseRequest(routingContext, 0L); @@ -483,7 +487,7 @@ public void shouldReturnFailedFutureIfEidsPermissionsContainsWrongDataType() { .putObject("data") .set("eidpermissions", eidPermissionNode); - given(routingContext.getBodyAsString()).willReturn(requestNode.toString()); + given(requestBody.asString()).willReturn(requestNode.toString()); // when final Future result = target.parseRequest(routingContext, 0L); @@ -519,7 +523,7 @@ public void shouldReturnFailedFutureIfEidsPermissionsBiddersContainsWrongDataTyp .putArray("eidpermissions"); arrayNode.add(eidPermissionNode); - given(routingContext.getBodyAsString()).willReturn(requestNode.toString()); + given(requestBody.asString()).willReturn(requestNode.toString()); // when final Future result = target.parseRequest(routingContext, 0L); @@ -793,7 +797,7 @@ public void shouldUpdateTimeout() { private void givenBidRequest(BidRequest bidRequest) { try { - given(routingContext.getBodyAsString()).willReturn(mapper.writeValueAsString(bidRequest)); + given(requestBody.asString()).willReturn(mapper.writeValueAsString(bidRequest)); } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/src/test/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactoryTest.java b/src/test/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactoryTest.java index c6bad5c5e94..d5c2cb5bea3 100644 --- a/src/test/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactoryTest.java +++ b/src/test/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactoryTest.java @@ -1494,7 +1494,7 @@ public void enrichBidRequestWithAccountAndPrivacyDataShouldNotSetDsaFromAccountW 3, 4, 5, - List.of(org.prebid.server.settings.model.DsaTransparency.of( + List.of(DsaTransparency.of( "domain", List.of(1)))), null)) @@ -1556,7 +1556,7 @@ public void enrichBidRequestWithAccountAndPrivacyDataShouldSetDsaFromAccountWhen 0, 1, 2, - List.of(org.prebid.server.settings.model.DsaTransparency.of( + List.of(DsaTransparency.of( "", List.of(0)))), true)) @@ -1620,7 +1620,7 @@ public void enrichBidRequestWithAccountAndPrivacyDataShouldNotSetDsaFromAccountW 0, 1, 2, - List.of(org.prebid.server.settings.model.DsaTransparency.of( + List.of(DsaTransparency.of( "", List.of(0)))), true)) diff --git a/src/test/java/org/prebid/server/auction/requestfactory/VideoRequestFactoryTest.java b/src/test/java/org/prebid/server/auction/requestfactory/VideoRequestFactoryTest.java index d5ebd38843e..ca01531b02e 100644 --- a/src/test/java/org/prebid/server/auction/requestfactory/VideoRequestFactoryTest.java +++ b/src/test/java/org/prebid/server/auction/requestfactory/VideoRequestFactoryTest.java @@ -14,6 +14,7 @@ import io.vertx.core.MultiMap; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.net.impl.SocketAddressImpl; +import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.RoutingContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -91,6 +92,8 @@ public class VideoRequestFactoryTest extends VertxTest { private RoutingContext routingContext; @Mock(strictness = LENIENT) private HttpServerRequest httpServerRequest; + @Mock + private RequestBody requestBody; @Mock(strictness = LENIENT) private DebugResolver debugResolver; @@ -115,6 +118,7 @@ public void setUp() { .willReturn(DebugContext.of(true, true, null)); given(routingContext.request()).willReturn(httpServerRequest); + given(routingContext.body()).willReturn(requestBody); given(routingContext.queryParams()).willReturn(MultiMap.caseInsensitiveMultiMap()); given(httpServerRequest.remoteAddress()).willReturn(new SocketAddressImpl(1234, "host")); given(httpServerRequest.headers()).willReturn(MultiMap.caseInsensitiveMultiMap()); @@ -149,7 +153,7 @@ public void setUp() { @Test public void shouldReturnFailedFutureIfRequestBodyIsMissing() { // given - given(routingContext.getBodyAsString()).willReturn(null); + given(requestBody.asString()).willReturn(null); // when final Future future = target.fromRequest(routingContext, 0L); @@ -164,7 +168,7 @@ public void shouldReturnFailedFutureIfRequestBodyIsMissing() { @Test public void shouldReturnFailedFutureIfStoredRequestIsEnforcedAndIdIsNotProvided() throws JsonProcessingException { // given - given(routingContext.getBodyAsString()) + given(requestBody.asString()) .willReturn(mapper.writeValueAsString(BidRequestVideo.builder().build())); given(routingContext.request().headers()).willReturn(MultiMap.caseInsensitiveMultiMap() .add(HttpUtil.USER_AGENT_HEADER, "123")); @@ -207,7 +211,7 @@ public void shouldReturnFailedFutureIfRequestBodyExceedsMaxRequestSize() { jacksonMapper, geoLocationServiceWrapper); - given(routingContext.getBodyAsString()).willReturn("body"); + given(requestBody.asString()).willReturn("body"); // when final Future future = target.fromRequest(routingContext, 0L); @@ -222,7 +226,7 @@ public void shouldReturnFailedFutureIfRequestBodyExceedsMaxRequestSize() { @Test public void shouldReturnFailedFutureIfRequestBodyCouldNotBeParsed() { // given - given(routingContext.getBodyAsString()).willReturn("body"); + given(requestBody.asString()).willReturn("body"); // when final Future future = target.fromRequest(routingContext, 0L); @@ -239,7 +243,7 @@ public void shouldUseHeadersModifiedByEntrypointHooks() throws JsonProcessingExc // given final BidRequestVideo requestVideo = BidRequestVideo.builder().build(); final String body = mapper.writeValueAsString(requestVideo); - given(routingContext.getBodyAsString()).willReturn(body); + given(requestBody.asString()).willReturn(body); given(routingContext.request().headers()).willReturn(MultiMap.caseInsensitiveMultiMap() .add(HttpUtil.USER_AGENT_HEADER, "user-agent-123")); @@ -274,7 +278,7 @@ public void shouldEnrichAuctionContextWithDebugContext() throws JsonProcessingEx // given final BidRequestVideo requestVideo = BidRequestVideo.builder().device( Device.builder().ua("123").build()).build(); - given(routingContext.getBodyAsString()).willReturn(mapper.writeValueAsString(requestVideo)); + given(requestBody.asString()).willReturn(mapper.writeValueAsString(requestVideo)); givenBidRequest(BidRequest.builder().build(), emptyList()); // when @@ -331,7 +335,7 @@ public void shouldReturnExpectedResultAndReturnErrors() throws JsonProcessingExc final BidRequestVideo requestVideo = BidRequestVideo.builder().device( Device.builder().ua("123").build()).build(); - given(routingContext.getBodyAsString()).willReturn(mapper.writeValueAsString(requestVideo)); + given(requestBody.asString()).willReturn(mapper.writeValueAsString(requestVideo)); final List podErrors = singletonList(PodError.of(1, 1, singletonList("TEST"))); givenBidRequest(bidRequest, podErrors); @@ -340,7 +344,7 @@ public void shouldReturnExpectedResultAndReturnErrors() throws JsonProcessingExc final Future> result = target.fromRequest(routingContext, 0L); // then - verify(routingContext).getBodyAsString(); + verify(requestBody).asString(); verify(videoStoredRequestProcessor).processVideoRequest("", null, emptySet(), requestVideo); verify(ortb2RequestFactory).createAuctionContext(any(), eq(MetricName.video)); verify(ortb2RequestFactory).enrichAuctionContext(any(), any(), eq(bidRequest), eq(0L)); @@ -358,7 +362,7 @@ public void shouldReturnExpectedResultAndReturnErrors() throws JsonProcessingExc public void shouldReplaceDeviceUaWithUserAgentHeaderIfPresented() throws JsonProcessingException { // given final BidRequestVideo requestVideo = BidRequestVideo.builder().build(); - given(routingContext.getBodyAsString()).willReturn(mapper.writeValueAsString(requestVideo)); + given(requestBody.asString()).willReturn(mapper.writeValueAsString(requestVideo)); given(routingContext.request().headers()).willReturn(MultiMap.caseInsensitiveMultiMap() .add(HttpUtil.USER_AGENT_HEADER, "user-agent-123")); @@ -381,7 +385,7 @@ public void shouldReplaceDeviceUaWithUserAgentHeaderIfPresented() throws JsonPro public void shouldReturnErrorIfDeviceUaAndUserAgentHeaderIsEmpty() throws JsonProcessingException { // given final BidRequestVideo requestVideo = BidRequestVideo.builder().build(); - given(routingContext.getBodyAsString()).willReturn(mapper.writeValueAsString(requestVideo)); + given(requestBody.asString()).willReturn(mapper.writeValueAsString(requestVideo)); given(httpServerRequest.headers()).willReturn(MultiMap.caseInsensitiveMultiMap()); // when @@ -519,7 +523,7 @@ public void shouldUpdateTimeout() throws JsonProcessingException { private void prepareMinimumSuccessfulConditions() throws JsonProcessingException { final BidRequestVideo requestVideo = BidRequestVideo.builder().device(Device.builder() .ua("123").build()).build(); - given(routingContext.getBodyAsString()).willReturn(mapper.writeValueAsString(requestVideo)); + given(requestBody.asString()).willReturn(mapper.writeValueAsString(requestVideo)); final ExtRequestPrebid ext = ExtRequestPrebid.builder() .targeting(ExtRequestTargeting.builder().build()) .build(); diff --git a/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java b/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java index 7dfc8bdcd12..4440063c436 100644 --- a/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/connatix/ConnatixBidderTest.java @@ -14,8 +14,8 @@ import com.iab.openrtb.response.SeatBid; import io.netty.handler.codec.http.HttpHeaderValues; import io.vertx.core.MultiMap; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/src/test/java/org/prebid/server/bidder/oraki/OrakiBidderTest.java b/src/test/java/org/prebid/server/bidder/oraki/OrakiBidderTest.java index 987d71658c2..b45ec77ab2e 100644 --- a/src/test/java/org/prebid/server/bidder/oraki/OrakiBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/oraki/OrakiBidderTest.java @@ -324,4 +324,3 @@ private ObjectNode givenImpExtOrakiBidder(UnaryOperator>> result = target.makeHttpRequests(bidRequest); // then - final ObjectNode expectedExt = mapper - .valueToTree(WrappedImpExtBidder.of(extPrebid, ExtImpPangle.of("token", null, null), 7, true, null)); + final ObjectNode expectedExt = mapper.valueToTree(WrappedImpExtBidder.builder() + .prebid(extPrebid) + .bidder(ExtImpPangle.of("token", null, null)) + .adType(7) + .isPrebid(true) + .build()); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) @@ -107,8 +114,10 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeEightIfVideoIsPresentAnd .imp(singletonList(Imp.builder() .instl(1) .video(Video.builder().build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), null, true, null))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .isPrebid(true) + .build())) .build())) .build(); @@ -116,9 +125,11 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeEightIfVideoIsPresentAnd final Result>> result = target.makeHttpRequests(bidRequest); // then - final ObjectNode expectedExt = mapper - .valueToTree(WrappedImpExtBidder.of(null, - ExtImpPangle.of("token", null, null), 8, true, null)); + final ObjectNode expectedExt = mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .adType(8) + .isPrebid(true) + .build()); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) @@ -134,8 +145,10 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeTwoIfBannerIsPresentAndI .imp(singletonList(Imp.builder() .instl(1) .banner(Banner.builder().build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), null, true, null))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .isPrebid(true) + .build())) .build())) .build(); @@ -143,8 +156,11 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeTwoIfBannerIsPresentAndI final Result>> result = target.makeHttpRequests(bidRequest); // then - final ObjectNode expectedExt = mapper - .valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of("token", null, null), 2, true, null)); + final ObjectNode expectedExt = mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .adType(2) + .isPrebid(true) + .build()); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) @@ -159,8 +175,10 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeOneIfBannerIsPresent() { final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder() .banner(Banner.builder().build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), null, true, null))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .isPrebid(true) + .build())) .build())) .build(); @@ -168,9 +186,11 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeOneIfBannerIsPresent() { final Result>> result = target.makeHttpRequests(bidRequest); // then - final ObjectNode expectedExt = mapper - .valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), 1, true, null)); + final ObjectNode expectedExt = mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .adType(1) + .isPrebid(true) + .build()); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) @@ -185,8 +205,10 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeFiveIfNativeRequestIsPre final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder() .xNative(Native.builder().request("someRequest").build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), null, true, null))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .isPrebid(true) + .build())) .build())) .build(); @@ -195,8 +217,11 @@ public void makeHttpRequestsShouldUpdateImpExtWithAdTypeFiveIfNativeRequestIsPre // then final ObjectNode expectedExt = mapper - .valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), 5, true, null)); + .valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .adType(5) + .isPrebid(true) + .build()); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) @@ -211,8 +236,10 @@ public void makeHttpRequestsShouldReturnErrorForNotSupportedAdType() { final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder() .audio(Audio.builder().build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), null, true, null))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .isPrebid(true) + .build())) .build())) .build(); @@ -480,9 +507,11 @@ public void makeHttpRequestsShouldUpdateImpExtWithNetworkIds() { final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder() .banner(Banner.builder().w(1).h(1).build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", "2", "2"), - null, true, NetworkIds.of("1", "1")))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", "2", "2")) + .isPrebid(true) + .networkids(NetworkIds.of("1", "1")) + .build())) .build())) .build(); @@ -490,10 +519,12 @@ public void makeHttpRequestsShouldUpdateImpExtWithNetworkIds() { final Result>> result = target.makeHttpRequests(bidRequest); // then - final ObjectNode expectedExt = mapper - .valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", "2", "2"), - 1, true, NetworkIds.of("2", "2"))); + final ObjectNode expectedExt = mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", "2", "2")) + .adType(1) + .isPrebid(true) + .networkids(NetworkIds.of("2", "2")) + .build()); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) @@ -508,9 +539,11 @@ public void makeHttpRequestsShouldAddErrorAndSkipImpressionIfAppIdIsNotPresentAn final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder() .banner(Banner.builder().w(1).h(1).build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, "1"), - null, true, NetworkIds.of("1", "1")))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, "1")) + .isPrebid(true) + .networkids(NetworkIds.of("1", "1")) + .build())) .build())) .build(); @@ -528,9 +561,11 @@ public void makeHttpRequestsShouldAddErrorAndSkipImpressionIfPlacementIdIsNotPre final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder() .banner(Banner.builder().w(1).h(1).build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", "1", null), - null, true, NetworkIds.of("1", "1")))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", "1", null)) + .isPrebid(true) + .networkids(NetworkIds.of("1", "1")) + .build())) .build())) .build(); @@ -548,9 +583,10 @@ public void makeHttpRequestsShouldNotUpdateImpExtWithNetworkIdsIfNetworkIdsAreAb final BidRequest bidRequest = BidRequest.builder() .imp(singletonList(Imp.builder() .banner(Banner.builder().w(1).h(1).build()) - .ext(mapper.valueToTree(WrappedImpExtBidder.of(null, ExtImpPangle.of( - "token", null, null), - null, true, null))) + .ext(mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .isPrebid(true) + .build())) .build())) .build(); @@ -558,9 +594,11 @@ public void makeHttpRequestsShouldNotUpdateImpExtWithNetworkIdsIfNetworkIdsAreAb final Result>> result = target.makeHttpRequests(bidRequest); // then - final ObjectNode expectedExt = mapper - .valueToTree(WrappedImpExtBidder.of(null, - ExtImpPangle.of("token", null, null), 1, true, null)); + final ObjectNode expectedExt = mapper.valueToTree(WrappedImpExtBidder.builder() + .bidder(ExtImpPangle.of("token", null, null)) + .adType(1) + .isPrebid(true) + .build()); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) diff --git a/src/test/java/org/prebid/server/bidder/playdigo/PlaydigoBidderTest.java b/src/test/java/org/prebid/server/bidder/playdigo/PlaydigoBidderTest.java index 6da6c8fa0e6..d209487e28c 100644 --- a/src/test/java/org/prebid/server/bidder/playdigo/PlaydigoBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/playdigo/PlaydigoBidderTest.java @@ -32,9 +32,9 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.prebid.server.proto.openrtb.ext.response.BidType.audio; import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; import static org.prebid.server.proto.openrtb.ext.response.BidType.video; -import static org.prebid.server.proto.openrtb.ext.response.BidType.audio; import static org.prebid.server.proto.openrtb.ext.response.BidType.xNative; public class PlaydigoBidderTest extends VertxTest { diff --git a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java b/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java index b6a5fd24cae..5ed82129c2f 100644 --- a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java @@ -36,7 +36,6 @@ import com.iab.openrtb.request.Video; import com.iab.openrtb.response.Bid; import io.vertx.core.http.HttpMethod; -import lombok.AllArgsConstructor; import lombok.Value; import org.assertj.core.groups.Tuple; import org.junit.jupiter.api.BeforeEach; @@ -1168,7 +1167,8 @@ public void makeHttpRequestsShouldFillSiteExtRpWithSegtaxValuesWithNoMoreThanHun // then assertThat(result.getErrors()).isEmpty(); - final BidRequest capturedBidRequest = mapper.readValue(result.getValue().get(0).getBody(), BidRequest.class); + final BidRequest capturedBidRequest = mapper.readValue( + result.getValue().getFirst().getBody(), BidRequest.class); final JsonNode targetNode = capturedBidRequest.getSite().getExt().getProperty("rp").get("target"); assertThat(targetNode.elements()).toIterable().hasSize(3); @@ -1255,7 +1255,8 @@ public void makeHttpRequestsShouldFillUserExtRpWithSegtaxValuesWithNoMoreThanHun // then assertThat(result.getErrors()).isEmpty(); - final BidRequest capturedBidRequest = mapper.readValue(result.getValue().get(0).getBody(), BidRequest.class); + final BidRequest capturedBidRequest = mapper.readValue( + result.getValue().getFirst().getBody(), BidRequest.class); final JsonNode targetNode = capturedBidRequest.getUser().getExt().getProperty("rp").get("target"); assertThat(targetNode.elements()).toIterable().hasSize(6); @@ -4044,8 +4045,7 @@ private static ObjectNode givenImpExtRpTarget() { .put("pbs_url", EXTERNAL_URL); } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class Inventory { List rating; @@ -4053,8 +4053,7 @@ private static class Inventory { List prodtype; } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class Visitor { List ucat; diff --git a/src/test/java/org/prebid/server/bidder/stroeercore/StroeerCoreBidderTest.java b/src/test/java/org/prebid/server/bidder/stroeercore/StroeerCoreBidderTest.java index 516505ff401..11e789e8a24 100644 --- a/src/test/java/org/prebid/server/bidder/stroeercore/StroeerCoreBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/stroeercore/StroeerCoreBidderTest.java @@ -28,9 +28,9 @@ import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.exception.PreBidException; import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.DsaTransparency; import org.prebid.server.proto.openrtb.ext.request.ExtRegs; import org.prebid.server.proto.openrtb.ext.request.ExtRegsDsa; -import org.prebid.server.proto.openrtb.ext.request.DsaTransparency; import org.prebid.server.proto.openrtb.ext.request.stroeercore.ExtImpStroeerCore; import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.util.HttpUtil; diff --git a/src/test/java/org/prebid/server/bidder/unicorn/UnicornBidderTest.java b/src/test/java/org/prebid/server/bidder/unicorn/UnicornBidderTest.java index 5a961e20dbf..77a2caeec96 100644 --- a/src/test/java/org/prebid/server/bidder/unicorn/UnicornBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/unicorn/UnicornBidderTest.java @@ -164,9 +164,16 @@ public void makeHttpRequestsShouldEnrichEveryImpWithSecureAndTagIdParams() { public void makeHttpRequestsShouldSetTagIdAndUpdateBidderPlacementIdPropertyWithStoredRequestProperty() { // given final BidRequest bidRequest = givenBidRequest(impBuilder -> - impBuilder.ext(mapper.valueToTree(ExtPrebid.of(ExtImpPrebid.builder() - .storedrequest(ExtStoredRequest.of("storedRequestId")) - .build(), ExtImpUnicorn.of("", "123", "mediaId", 456))))); + impBuilder.ext(mapper.valueToTree(ExtPrebid.of( + ExtImpPrebid.builder() + .storedrequest(ExtStoredRequest.of("storedRequestId")) + .build(), + ExtImpUnicorn.builder() + .placementId("") + .publisherId("123") + .mediaId("mediaId") + .accountId(456) + .build())))); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -231,7 +238,12 @@ public void makeHttpRequestsShouldUpdateSourceValue() { public void makeHttpRequestsShouldReturnErrorForNotFoundStoredRequestId() { // given final BidRequest bidRequest = givenBidRequest(impBuilder -> - impBuilder.ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpUnicorn.of("", "123", "mediaId", 456))))); + impBuilder.ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpUnicorn.builder() + .placementId("") + .publisherId("123") + .mediaId("mediaId") + .accountId(456) + .build())))); // when final Result>> result = target.makeHttpRequests(bidRequest); @@ -349,7 +361,12 @@ private static Imp givenImp(Function impCustomiz .id("123") .ext(mapper.valueToTree(ExtPrebid.of( null, - ExtImpUnicorn.of("placementId", "123", "mediaId", 456))))) + ExtImpUnicorn.builder() + .placementId("placementId") + .publisherId("123") + .mediaId("mediaId") + .accountId(456) + .build())))) .build(); } diff --git a/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java b/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java index 8df8b5f03b3..2bb02ee4463 100644 --- a/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java +++ b/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java @@ -517,7 +517,7 @@ public void processContextShouldFilterDisallowedByActivityInfrastructureBidders( given(activityInfrastructure.isAllowed( eq(Activity.SYNC_USER), argThat(argument -> argument.componentType().equals(ComponentType.BIDDER) - && argument.componentName().equals("requested-bidder")))) + && "requested-bidder".equals(argument.componentName())))) .willReturn(false); final CookieSyncContext cookieSyncContext = givenCookieSyncContext(builder -> diff --git a/src/test/java/org/prebid/server/handler/CookieSyncHandlerTest.java b/src/test/java/org/prebid/server/handler/CookieSyncHandlerTest.java index 0b6027fcc92..cce27816624 100644 --- a/src/test/java/org/prebid/server/handler/CookieSyncHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/CookieSyncHandlerTest.java @@ -7,6 +7,7 @@ import io.vertx.core.http.Cookie; import io.vertx.core.http.CookieSameSite; import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.RoutingContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -98,6 +99,8 @@ public class CookieSyncHandlerTest extends VertxTest { private RoutingContext routingContext; @Mock(strictness = LENIENT) private HttpServerResponse httpResponse; + @Mock + private RequestBody requestBody; private CookieSyncHandler target; @@ -110,6 +113,7 @@ public void setUp() { .willAnswer(invocation -> invocation.getArgument(0)); given(routingContext.response()).willReturn(httpResponse); + given(routingContext.body()).willReturn(requestBody); given(httpResponse.setStatusCode(anyInt())).willReturn(httpResponse); given(httpResponse.putHeader(any(CharSequence.class), any(AsciiString.class))).willReturn(httpResponse); @@ -145,7 +149,7 @@ public void setUp() { @Test public void shouldRespondWithErrorAndSendToAnalyticsWithoutTcfWhenRequestBodyIsMissing() { // given - given(routingContext.getBody()).willReturn(null); + given(requestBody.buffer()).willReturn(null); // when target.handle(routingContext); @@ -165,7 +169,7 @@ public void shouldRespondWithErrorAndSendToAnalyticsWithoutTcfWhenRequestBodyIsM @Test public void shouldRespondWithErrorAndSendToAnalyticsWithoutTcfWhenRequestBodyCouldNotBeParsed() { // given - given(routingContext.getBody()).willReturn(Buffer.buffer("{")); + given(requestBody.buffer()).willReturn(Buffer.buffer("{")); // when target.handle(routingContext); @@ -185,7 +189,7 @@ public void shouldRespondWithErrorAndSendToAnalyticsWithoutTcfWhenRequestBodyCou @Test public void shouldRespondWithErrorAndSendToAnalyticsWithTcfWhenOptedOut() { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).gdpr(1).build())); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) .willReturn(new UidsCookie(Uids.builder().uids(emptyMap()).optout(true).build(), jacksonMapper)); @@ -210,7 +214,7 @@ public void shouldRespondWithErrorAndSendToAnalyticsWithTcfWhenOptedOut() { @Test public void shouldRespondWithErrorIfGdprConsentIsMissing() { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).gdpr(1).build())); given(cookieSyncService.processContext(any())).willAnswer(answerWithException( tcfContext -> new InvalidCookieSyncRequestException( @@ -234,7 +238,7 @@ public void shouldRespondWithErrorIfGdprConsentIsMissing() { @Test public void shouldRespondWithBadRequestStatusIfGdprConsentIsInvalid() { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenRequestBody(CookieSyncRequest.builder() .bidders(singleton("rubicon")) .gdpr(1) @@ -259,7 +263,7 @@ public void shouldRespondWithBadRequestStatusIfGdprConsentIsInvalid() { @Test public void shouldRespondWithBadRequestStatusOnInvalidAccountConfigException() { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenRequestBody(CookieSyncRequest.builder() .bidders(singleton("rubicon")) .gdpr(1) @@ -284,7 +288,7 @@ public void shouldRespondWithBadRequestStatusOnInvalidAccountConfigException() { @Test public void shouldNotSendResponseIfClientClosedConnection() { // given - given(routingContext.getBody()).willReturn( + given(requestBody.buffer()).willReturn( givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).build())); given(routingContext.response().closed()).willReturn(true); @@ -304,7 +308,7 @@ public void shouldNotSendResponseIfClientClosedConnection() { @Test public void shouldRespondWithExpectedHeaders() { // given - given(routingContext.getBody()).willReturn( + given(requestBody.buffer()).willReturn( givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).build())); givenDefaultCookieSyncServicePipelineResult(); @@ -320,7 +324,7 @@ public void shouldRespondWithExpectedHeaders() { @Test public void shouldRespondWithDeprecationCookieHeaderWhenCookieIsResolved() { // given - given(routingContext.getBody()).willReturn( + given(requestBody.buffer()).willReturn( givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).build())); final PartitionedCookie givenDeprecationCookie = PartitionedCookie.of( Cookie.cookie("receive-cookie-deprecation", "1") @@ -348,7 +352,7 @@ public void shouldRespondWithDeprecationCookieHeaderWhenCookieIsResolved() { @Test public void shouldPassAccountToPrivacyEnforcementServiceWhenAccountIsFound() { // given - given(routingContext.getBody()).willReturn( + given(requestBody.buffer()).willReturn( givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).account("account").build())); final AccountGdprConfig accountGdprConfig = AccountGdprConfig.builder() @@ -372,7 +376,7 @@ public void shouldPassAccountToPrivacyEnforcementServiceWhenAccountIsFound() { @Test public void shouldPassAccountToPrivacyEnforcementServiceWhenAccountIsNotFound() { // given - given(routingContext.getBody()).willReturn( + given(requestBody.buffer()).willReturn( givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).account("account").build())); given(applicationSettings.getAccountById(any(), any())).willReturn(Future.failedFuture("bad")); @@ -392,7 +396,7 @@ public void shouldPassAccountToPrivacyEnforcementServiceWhenAccountIsNotFound() @Test public void shouldIncrementMetrics() { // given - given(routingContext.getBody()).willReturn( + given(requestBody.buffer()).willReturn( givenRequestBody(CookieSyncRequest.builder().bidders(emptySet()).build())); givenDefaultCookieSyncServicePipelineResult(); @@ -406,7 +410,7 @@ public void shouldIncrementMetrics() { @Test public void shouldPassSuccessfulEventToAnalyticsReporter() { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenRequestBody(CookieSyncRequest.builder().bidders(singleton("rubicon")).build())); final List bidderStatuses = diff --git a/src/test/java/org/prebid/server/handler/SettingsCacheNotificationHandlerTest.java b/src/test/java/org/prebid/server/handler/SettingsCacheNotificationHandlerTest.java index e0ea13f1d5a..fda7030dcff 100644 --- a/src/test/java/org/prebid/server/handler/SettingsCacheNotificationHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/SettingsCacheNotificationHandlerTest.java @@ -5,6 +5,7 @@ import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.RoutingContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,6 +40,8 @@ public class SettingsCacheNotificationHandlerTest extends VertxTest { private HttpServerRequest httpRequest; @Mock private HttpServerResponse httpResponse; + @Mock(strictness = LENIENT) + private RequestBody requestBody; @BeforeEach public void setUp() { @@ -46,6 +49,7 @@ public void setUp() { given(routingContext.request()).willReturn(httpRequest); given(routingContext.response()).willReturn(httpResponse); + given(routingContext.body()).willReturn(requestBody); given(routingContext.response().setStatusCode(anyInt())).willReturn(httpResponse); } @@ -53,7 +57,7 @@ public void setUp() { public void shouldReturnBadRequestForUpdateCacheIfRequestHasNoBody() { // given given(routingContext.request().method()).willReturn(HttpMethod.POST); - given(routingContext.getBody()).willReturn(null); + given(requestBody.buffer()).willReturn(null); // when handler.handle(routingContext); @@ -67,7 +71,7 @@ public void shouldReturnBadRequestForUpdateCacheIfRequestHasNoBody() { public void shouldReturnBadRequestForUpdateCacheIfRequestBodyCannotBeParsed() { // given given(routingContext.request().method()).willReturn(HttpMethod.POST); - given(routingContext.getBody()).willReturn(Buffer.buffer()); + given(requestBody.buffer()).willReturn(Buffer.buffer()); // when handler.handle(routingContext); @@ -84,7 +88,7 @@ public void shouldAskListenerToUpdateCache() throws JsonProcessingException { final UpdateSettingsCacheRequest cacheRequest = UpdateSettingsCacheRequest.of( singletonMap("reqId1", "reqValue1"), singletonMap("impId1", "impValue1")); - given(routingContext.getBody()).willReturn(Buffer.buffer(mapper.writeValueAsBytes(cacheRequest))); + given(requestBody.buffer()).willReturn(Buffer.buffer(mapper.writeValueAsBytes(cacheRequest))); // when handler.handle(routingContext); @@ -98,7 +102,7 @@ public void shouldAskListenerToUpdateCache() throws JsonProcessingException { public void shouldReturnBadRequestForInvalidateCacheIfRequestHasNoBody() { // given given(routingContext.request().method()).willReturn(HttpMethod.DELETE); - given(routingContext.getBody()).willReturn(null); + given(requestBody.buffer()).willReturn(null); // when handler.handle(routingContext); @@ -112,7 +116,7 @@ public void shouldReturnBadRequestForInvalidateCacheIfRequestHasNoBody() { public void shouldReturnBadRequestForInvalidateCacheIfRequestBodyCannotBeParsed() { // given given(routingContext.request().method()).willReturn(HttpMethod.DELETE); - given(routingContext.getBody()).willReturn(Buffer.buffer()); + given(requestBody.buffer()).willReturn(Buffer.buffer()); // when handler.handle(routingContext); @@ -129,7 +133,7 @@ public void shouldAskListenerToInvalidateCache() throws JsonProcessingException final InvalidateSettingsCacheRequest cacheRequest = InvalidateSettingsCacheRequest.of( singletonList("reqId1"), singletonList("impId1")); - given(routingContext.getBody()).willReturn(Buffer.buffer(mapper.writeValueAsBytes(cacheRequest))); + given(requestBody.buffer()).willReturn(Buffer.buffer(mapper.writeValueAsBytes(cacheRequest))); // when handler.handle(routingContext); @@ -143,7 +147,7 @@ public void shouldAskListenerToInvalidateCache() throws JsonProcessingException public void shouldReturnMethodNotAllowedStatusResponseIfRequestHasNeitherPostOrDeleteMethod() { // given given(routingContext.request().method()).willReturn(HttpMethod.GET); - given(routingContext.getBody()).willReturn(null); + given(requestBody.buffer()).willReturn(null); // when handler.handle(routingContext); diff --git a/src/test/java/org/prebid/server/handler/VersionHandlerTest.java b/src/test/java/org/prebid/server/handler/VersionHandlerTest.java index 33e74ec136d..8168e4dd6b1 100644 --- a/src/test/java/org/prebid/server/handler/VersionHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/VersionHandlerTest.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import io.vertx.core.http.HttpServerResponse; import io.vertx.ext.web.RoutingContext; -import lombok.AllArgsConstructor; import lombok.Value; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -53,8 +52,7 @@ public void handleShouldRespondWithoutVersionAndCommitWhenNullPassedAtCreation() verify(httpResponse).end(mapper.writeValueAsString(RevisionResponse.of(null, null))); } - @AllArgsConstructor(staticName = "of") - @Value + @Value(staticConstructor = "of") private static class RevisionResponse { String revision; diff --git a/src/test/java/org/prebid/server/handler/VtrackHandlerTest.java b/src/test/java/org/prebid/server/handler/VtrackHandlerTest.java index 0674ab1d1ce..a48af60aabf 100644 --- a/src/test/java/org/prebid/server/handler/VtrackHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/VtrackHandlerTest.java @@ -8,6 +8,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.RoutingContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -62,17 +63,20 @@ public class VtrackHandlerTest extends VertxTest { private TimeoutFactory timeoutFactory; private VtrackHandler handler; - @Mock + @Mock(strictness = LENIENT) private RoutingContext routingContext; @Mock(strictness = LENIENT) private HttpServerRequest httpRequest; @Mock private HttpServerResponse httpResponse; + @Mock + private RequestBody requestBody; @BeforeEach public void setUp() { given(routingContext.request()).willReturn(httpRequest); given(routingContext.response()).willReturn(httpResponse); + given(routingContext.body()).willReturn(requestBody); given(httpResponse.putHeader(any(CharSequence.class), any(AsciiString.class))).willReturn(httpResponse); given(httpRequest.getParam("a")).willReturn("accountId"); @@ -111,7 +115,7 @@ public void shouldRespondWithExpectedHeaders() { @Test public void shouldRespondWithBadRequestWhenBodyIsEmpty() { // given - given(routingContext.getBody()).willReturn(null); + given(requestBody.buffer()).willReturn(null); // when handler.handle(routingContext); @@ -126,7 +130,7 @@ public void shouldRespondWithBadRequestWhenBodyIsEmpty() { @Test public void shouldRespondWithBadRequestWhenBodyCannotBeParsed() { // given - given(routingContext.getBody()).willReturn(Buffer.buffer("invalid")); + given(requestBody.buffer()).willReturn(Buffer.buffer("invalid")); // when handler.handle(routingContext); @@ -141,7 +145,7 @@ public void shouldRespondWithBadRequestWhenBodyCannotBeParsed() { @Test public void shouldRespondWithBadRequestWhenBidIdIsMissing() throws JsonProcessingException { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenVtrackRequest(identity())); // when @@ -157,7 +161,7 @@ public void shouldRespondWithBadRequestWhenBidIdIsMissing() throws JsonProcessin @Test public void shouldRespondWithBadRequestWhenBidderIsMissing() throws JsonProcessingException { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenVtrackRequest(builder -> builder.bidid("bidId"))); // when @@ -173,7 +177,7 @@ public void shouldRespondWithBadRequestWhenBidderIsMissing() throws JsonProcessi @Test public void shouldRespondWithBadRequestWhenTypeIsNotXML() throws JsonProcessingException { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenVtrackRequest(builder -> builder.bidid("bidId").bidder("bidder").type("json"))); // when @@ -189,7 +193,7 @@ public void shouldRespondWithBadRequestWhenTypeIsNotXML() throws JsonProcessingE @Test public void shouldRespondWithBadRequestWhenValueDoesNotContainVast() throws JsonProcessingException { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenVtrackRequest(builder -> builder.bidid("bidId") .bidder("bidder") .type("xml") @@ -208,7 +212,7 @@ public void shouldRespondWithBadRequestWhenValueDoesNotContainVast() throws Json @Test public void shouldRespondWithInternalServerErrorWhenFetchingAccountFails() throws JsonProcessingException { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenVtrackRequest(builder -> builder .bidder("bidder") .bidid("bidId") @@ -231,7 +235,7 @@ public void shouldRespondWithInternalServerErrorWhenFetchingAccountFails() throw @Test public void shouldRespondWithInternalServerErrorWhenCacheServiceReturnFailure() throws JsonProcessingException { // given - given(routingContext.getBody()) + given(requestBody.buffer()) .willReturn(givenVtrackRequest(builder -> builder .bidder("bidder") .bidid("bidId") @@ -264,7 +268,7 @@ public void shouldTolerateNotFoundAccount() throws JsonProcessingException { .bidder("bidder") .type("xml") .value(new TextNode(" responseCacheObjects = new ArrayList<>(); for (BidPutObject putItem : puts) { - final String id = putItem.getType().equals("json") + final String id = "json".equals(putItem.getType()) ? putItem.getValue().get("id").textValue() + "@" + resolvePriceForJsonMediaType(putItem) : putItem.getValue().textValue(); @@ -297,8 +296,7 @@ public boolean applyGlobally() { } } - @Value - @AllArgsConstructor(staticName = "of") + @Value(staticConstructor = "of") static class BidRequestExecutionParameters { String dealId; diff --git a/src/test/java/org/prebid/server/it/TheadxTest.java b/src/test/java/org/prebid/server/it/TheadxTest.java index 036a8e463ea..54690c49387 100644 --- a/src/test/java/org/prebid/server/it/TheadxTest.java +++ b/src/test/java/org/prebid/server/it/TheadxTest.java @@ -33,4 +33,3 @@ public void openrtb2AuctionShouldRespondWithBidsFromTheadx() throws IOException, singletonList("theadx")); } } - diff --git a/src/test/java/org/prebid/server/it/VimayxTest.java b/src/test/java/org/prebid/server/it/VimayxTest.java index 2995e51d1da..ac7750065d0 100644 --- a/src/test/java/org/prebid/server/it/VimayxTest.java +++ b/src/test/java/org/prebid/server/it/VimayxTest.java @@ -34,4 +34,3 @@ public void openrtb2AuctionShouldRespondWithBidsFromVimayx() throws IOException, assertJsonEquals("openrtb2/vimayx/test-auction-vimayx-response.json", response, singletonList("vimayx")); } } - diff --git a/src/test/java/org/prebid/server/log/HttpInteractionLoggerTest.java b/src/test/java/org/prebid/server/log/HttpInteractionLoggerTest.java index 78fb2d326ec..017cdf03bab 100644 --- a/src/test/java/org/prebid/server/log/HttpInteractionLoggerTest.java +++ b/src/test/java/org/prebid/server/log/HttpInteractionLoggerTest.java @@ -4,6 +4,7 @@ import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; import io.vertx.core.http.HttpServerRequest; +import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.RoutingContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -40,14 +41,17 @@ public class HttpInteractionLoggerTest extends VertxTest { private RoutingContext routingContext; @Mock(strictness = LENIENT) private HttpServerRequest serverRequest; + @Mock(strictness = LENIENT) + private RequestBody requestBody; private HttpInteractionLogger target; @BeforeEach public void setUp() { target = new HttpInteractionLogger(jacksonMapper); - given(routingContext.getBodyAsString()).willReturn("{}"); given(routingContext.request()).willReturn(serverRequest); + given(routingContext.body()).willReturn(requestBody); + given(requestBody.asString()).willReturn("{}"); given(serverRequest.uri()).willReturn("example.com"); ReflectionTestUtils.setField(target, "logger", logger); } @@ -150,7 +154,7 @@ public void maybeLogOpenrtb2AuctionShouldNotLogIfSpecEndpointIsNotAuction() { @Test public void maybeLogOpenrtb2AuctionShouldLogOneLineBodyFromContext() { // given - given(routingContext.getBodyAsString()).willReturn(""" + given(requestBody.asString()).willReturn(""" { "param": "value" }"""); @@ -169,7 +173,7 @@ public void maybeLogOpenrtb2AuctionShouldLogOneLineBodyFromContext() { @Test public void maybeLogOpenrtb2AuctionShouldLogMessageInsteadOfInvalidBody() { // given - given(routingContext.getBodyAsString()).willReturn("{"); + given(requestBody.asString()).willReturn("{"); final AuctionContext givenAuctionContext = givenAuctionContext(accountBuilder -> accountBuilder.id("123")); final HttpLogSpec givenSpec = HttpLogSpec.of(null, null, "123", null, 1); diff --git a/src/test/java/org/prebid/server/vertx/httpclient/BasicHttpClientTest.java b/src/test/java/org/prebid/server/vertx/httpclient/BasicHttpClientTest.java index a9101f06440..61618b362ea 100644 --- a/src/test/java/org/prebid/server/vertx/httpclient/BasicHttpClientTest.java +++ b/src/test/java/org/prebid/server/vertx/httpclient/BasicHttpClientTest.java @@ -4,6 +4,7 @@ import io.vertx.core.MultiMap; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpClient; import io.vertx.core.http.HttpClientRequest; import io.vertx.core.http.HttpClientResponse; import io.vertx.core.http.HttpMethod; @@ -42,7 +43,7 @@ public class BasicHttpClientTest { @Mock private Vertx vertx; @Mock(strictness = LENIENT) - private io.vertx.core.http.HttpClient wrappedHttpClient; + private HttpClient wrappedHttpClient; private BasicHttpClient httpClient; @Mock(strictness = LENIENT)