From 90baabe5ba31d375d27eb5db2abba9bf22006797 Mon Sep 17 00:00:00 2001 From: Dubyk Danylo <45672370+CTMBNara@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:07:15 +0200 Subject: [PATCH] Remove unused code declarations (#1645) --- .../server/auction/ExchangeService.java | 5 +-- .../auction/PrivacyEnforcementService.java | 2 +- .../auction/StoredResponseProcessor.java | 5 ++- .../auction/TargetingKeywordsCreator.java | 2 +- .../server/auction/model/AuctionContext.java | 4 -- .../server/auction/model/ConsentType.java | 2 +- .../auction/model/TargetingBidInfo.java | 21 --------- .../requestfactory/AmpRequestFactory.java | 4 +- .../requestfactory/VideoRequestFactory.java | 6 +-- .../prebid/server/bidder/DisabledBidder.java | 2 +- .../server/bidder/ViewabilityVendors.java | 2 +- .../server/bidder/aceex/AceexBidder.java | 2 +- .../bidder/acuityads/AcuityadsBidder.java | 2 +- .../adgeneration/AdgenerationBidder.java | 2 +- .../server/bidder/adhese/AdheseBidder.java | 10 ++--- .../bidder/adkernel/AdkernelBidder.java | 2 +- .../bidder/adkerneladn/AdkernelAdnBidder.java | 2 +- .../server/bidder/admixer/AdmixerBidder.java | 2 +- .../server/bidder/adocean/AdoceanBidder.java | 2 +- .../adocean/model/AdoceanRequestData.java | 18 -------- .../bidder/adoppler/AdopplerBidder.java | 2 +- .../server/bidder/adprime/AdprimeBidder.java | 2 +- .../bidder/adtarget/AdtargetBidder.java | 2 +- .../bidder/adtelligent/AdtelligentBidder.java | 2 +- .../advangelists/AdvangelistsBidder.java | 4 +- .../server/bidder/adview/AdviewBidder.java | 2 +- .../bidder/adyoulike/AdyoulikeBidder.java | 3 +- .../prebid/server/bidder/aja/AjaBidder.java | 14 ++---- .../server/bidder/algorix/AlgorixBidder.java | 2 +- .../prebid/server/bidder/amx/AmxBidder.java | 2 +- .../server/bidder/applogy/ApplogyBidder.java | 2 +- .../bidder/appnexus/AppnexusBidder.java | 2 +- .../appnexus/model/BidRequestWithUrl.java | 14 ------ .../bidder/appnexus/proto/AppnexusBidExt.java | 6 +-- .../bidder/appnexus/proto/AppnexusParams.java | 44 ------------------- .../server/bidder/axonix/AxonixBidder.java | 2 +- .../bidder/beachfront/BeachfrontBidder.java | 2 +- .../server/bidder/beintoo/BeintooBidder.java | 2 +- .../server/bidder/between/BetweenBidder.java | 12 ++--- .../bidder/bidmachine/BidmachineBidder.java | 2 +- .../bidder/bidscube/BidscubeBidder.java | 5 +-- .../prebid/server/bidder/bmtm/BmtmBidder.java | 2 +- .../bidder/brightroll/BrightrollBidder.java | 2 +- .../bidder/connectad/ConnectadBidder.java | 2 +- .../bidder/conversant/ConversantBidder.java | 2 +- .../conversant/proto/ConversantParams.java | 32 -------------- .../server/bidder/cpmstar/CpmStarBidder.java | 2 +- .../bidder/datablocks/DatablocksBidder.java | 2 +- .../bidder/deepintent/DeepintentBidder.java | 2 +- .../prebid/server/bidder/dmx/DmxBidder.java | 2 +- .../bidder/emxdigital/EmxDigitalBidder.java | 4 +- .../bidder/engagebdr/EngagebdrBidder.java | 2 +- .../bidder/eplanning/EplanningBidder.java | 2 +- .../bidder/facebook/FacebookBidder.java | 2 +- .../server/bidder/gamma/GammaBidder.java | 2 +- .../bidder/grid/GridKeywordsProcessor.java | 2 +- .../server/bidder/gumgum/GumgumBidder.java | 2 +- .../bidder/impactify/ImpactifyBidder.java | 2 +- .../improvedigital/ImprovedigitalBidder.java | 2 +- .../server/bidder/inmobi/InmobiBidder.java | 2 +- .../server/bidder/invibes/InvibesBidder.java | 2 +- .../server/bidder/iqzone/IqzoneBidder.java | 2 +- .../org/prebid/server/bidder/ix/IxBidder.java | 4 +- .../server/bidder/kayzen/KayzenBidder.java | 2 +- .../server/bidder/kidoz/KidozBidder.java | 26 +++++------ .../bidder/krushmedia/KrushmediaBidder.java | 2 +- .../server/bidder/kubient/KubientBidder.java | 2 +- .../bidder/lockerdome/LockerdomeBidder.java | 2 +- .../server/bidder/logicad/LogicadBidder.java | 2 +- .../bidder/lunamedia/LunamediaBidder.java | 4 +- .../bidder/madvertise/MadvertiseBidder.java | 7 +-- .../bidder/marsmedia/MarsmediaBidder.java | 2 +- .../bidder/mobfoxpb/MobfoxpbBidder.java | 2 +- .../bidder/mobilefuse/MobilefuseBidder.java | 2 +- .../NanointeractiveBidder.java | 2 +- .../nextmillenium/NextMilleniumBidder.java | 2 +- .../ninthdecimal/NinthdecimalBidder.java | 4 +- .../server/bidder/onetag/OnetagBidder.java | 2 +- .../server/bidder/openweb/OpenWebBidder.java | 2 +- .../server/bidder/openx/OpenxBidder.java | 2 +- .../bidder/operaads/OperaadsBidder.java | 2 +- .../bidder/orbidder/OrbidderBidder.java | 2 +- .../bidder/outbrain/OutbrainBidder.java | 2 +- .../bidder/pubmatic/PubmaticBidder.java | 2 +- .../bidder/pubnative/PubnativeBidder.java | 2 +- .../model/NormalizedPulsepointParams.java | 17 ------- .../pulsepoint/proto/PulsepointParams.java | 19 -------- .../bidder/rhythmone/RhythmoneBidder.java | 2 +- .../server/bidder/rubicon/RubiconBidder.java | 10 ++--- .../rubicon/proto/request/RubiconParams.java | 27 ------------ .../proto/request/RubiconVideoParams.java | 24 ---------- .../sharethrough/SharethroughBidder.java | 2 +- .../bidder/silvermob/SilvermobBidder.java | 2 +- .../server/bidder/smaato/SmaatoBidder.java | 2 +- .../smartadserver/SmartadserverBidder.java | 2 +- .../bidder/smarthub/SmarthubBidder.java | 2 +- .../bidder/smartrtb/SmartrtbBidder.java | 2 +- .../bidder/smartyads/SmartyAdsBidder.java | 2 +- .../somoaudience/SomoaudienceBidder.java | 2 +- .../server/bidder/sovrn/SovrnBidder.java | 2 +- .../bidder/sovrn/model/BidRequestWithUrl.java | 14 ------ .../bidder/sovrn/proto/SovrnParams.java | 13 ------ .../synacormedia/SynacormediaBidder.java | 2 +- .../server/bidder/tappx/TappxBidder.java | 2 +- .../server/bidder/telaria/TelariaBidder.java | 2 +- .../bidder/triplelift/TripleliftBidder.java | 2 +- .../TripleliftNativeBidder.java | 2 +- .../prebid/server/bidder/ttx/TtxBidder.java | 2 +- .../bidder/ucfunnel/UcfunnelBidder.java | 2 +- .../server/bidder/unicorn/UnicornBidder.java | 2 +- .../server/bidder/unruly/UnrulyBidder.java | 2 +- .../ValueImpressionBidder.java | 2 +- .../bidder/yahoossp/YahooSSPBidder.java | 4 +- .../bidder/yeahmobi/YeahmobiBidder.java | 2 +- .../bidder/yieldlab/YieldlabBidder.java | 2 +- .../bidder/yieldone/YieldoneBidder.java | 2 +- .../zeroclickfraud/ZeroclickfraudBidder.java | 2 +- .../server/cache/proto/BidCacheResult.java | 13 ------ .../cache/proto/request/BannerValue.java | 17 ------- .../server/deals/DeliveryProgressService.java | 4 +- .../prebid/server/deals/PlannerService.java | 4 +- .../server/deals/lineitem/DeliveryToken.java | 6 +-- .../prebid/server/deals/model/AlertEvent.java | 14 +++--- .../server/deals/model/AlertSource.java | 12 ++--- .../prebid/server/deals/model/DeviceType.java | 2 +- .../server/deals/model/LineItemTargeting.java | 16 ------- .../deals/model/LineItemTargetingSize.java | 16 ------- .../server/deals/model/UserServiceResult.java | 18 -------- .../DealsSimulationAdminHandler.java | 4 +- ...imulationAwareDeliveryProgressService.java | 2 +- .../deals/targeting/TargetingDefinition.java | 6 +-- .../deals/targeting/interpret/Matches.java | 4 +- .../deals/targeting/interpret/Within.java | 2 +- .../deals/targeting/model/UserSegments.java | 15 ------- .../targeting/syntax/BooleanOperator.java | 4 -- .../targeting/syntax/TargetingCategory.java | 2 +- .../MaxMindGeoLocationService.java | 2 +- .../server/handler/LineItemStatusHandler.java | 5 +-- .../handler/LoggerControlKnobHandler.java | 6 +-- .../server/handler/TracerLogHandler.java | 4 +- .../prebid/server/handler/VtrackHandler.java | 1 - .../handler/info/BidderDetailsHandler.java | 6 +-- .../server/hooks/execution/model/Stage.java | 1 + .../prebid/server/json/DecodeException.java | 3 -- .../server/log/HttpInteractionLogger.java | 2 +- .../server/metric/model/MetricsContext.java | 12 ----- .../org/prebid/server/model/Endpoint.java | 1 + .../optout/GoogleRecaptchaVerifier.java | 8 +--- .../org/prebid/server/privacy/ccpa/Ccpa.java | 6 +-- .../gdpr/model/PublisherRestrictionEmpty.java | 12 ----- .../purpose/PurposeStrategy.java | 4 +- .../gdpr/vendorlist/VendorListService.java | 16 ------- .../gdpr/vendorlist/proto/Feature.java | 1 + .../gdpr/vendorlist/proto/PurposeCode.java | 1 + .../gdpr/vendorlist/proto/SpecialFeature.java | 1 + .../gdpr/vendorlist/proto/SpecialPurpose.java | 1 + .../proto/openrtb/ext/FlexibleExtension.java | 2 +- .../ext/request/nobid/ExtImpNobid.java | 16 ------- .../request/rubicon/RubiconImpExtContext.java | 12 ----- .../ext/response/ExtResponseSyncData.java | 2 +- .../openrtb/ext/response/ExtUserSync.java | 2 +- .../CompositeApplicationSettings.java | 6 +-- .../settings/FileApplicationSettings.java | 2 +- .../settings/HttpApplicationSettings.java | 12 ++--- .../prebid/server/settings/SettingsCache.java | 4 +- .../model/AccountAnalyticsConfig.java | 12 ++--- .../server/settings/model/CategoryParams.java | 12 ----- .../server/settings/model/EnforcePurpose.java | 1 + .../proto/response/HttpRefreshResponse.java | 8 ++-- .../config/GeoLocationConfiguration.java | 2 + .../spring/config/SettingsConfiguration.java | 6 ++- .../config/bidder/util/UsersyncerCreator.java | 2 +- .../java/org/prebid/server/util/HttpUtil.java | 16 ++----- .../org/prebid/server/vast/VastModifier.java | 7 +-- .../server/vertx/LocalMessageCodec.java | 2 +- .../server/assertion/FutureAssertion.java | 6 +-- .../server/auction/ExchangeServiceTest.java | 5 --- .../requestfactory/AmpRequestFactoryTest.java | 3 +- .../server/bidder/BidderCatalogTest.java | 2 +- .../bidder/HttpBidderRequesterTest.java | 14 ------ .../bidder/adhese/AdheseBidderTest.java | 7 ++- .../bidder/admixer/AdmixerBidderTest.java | 15 +++---- .../beachfront/BeachfrontBidderTest.java | 2 - .../conversant/ConversantBidderTest.java | 8 ++-- .../bidder/facebook/FacebookBidderTest.java | 3 +- .../bidder/invibes/InvibesBidderTest.java | 2 +- .../bidder/iqzone/IqzoneBidderTest.java | 12 ++--- .../bidder/loopme/LoopmeBidderTest.java | 5 --- .../bidder/marsmedia/MarsmediaBidderTest.java | 2 +- .../bidder/orbidder/OrbidderBidderTest.java | 16 ------- .../bidder/pubmatic/PubmaticBidderTest.java | 19 ++++---- .../smilewanted/SmileWantedBidderTest.java | 5 --- .../server/bidder/ttx/TtxBidderTest.java | 4 +- .../server/deals/AlertHttpServiceTest.java | 2 +- .../deals/DeliveryProgressServiceTest.java | 3 +- .../server/deals/PlannerServiceTest.java | 2 +- .../prebid/server/deals/UserServiceTest.java | 5 --- .../DealsSimulationAdminHandlerTest.java | 3 +- .../execution/RemoteFileSyncerTest.java | 1 - ...tBreakerSecuredGeoLocationServiceTest.java | 2 +- .../handler/CustomizedAdminEndpointTest.java | 2 +- .../handler/LineItemStatusHandlerTest.java | 6 +-- .../handler/LoggerControlKnobHandlerTest.java | 3 +- .../org/prebid/server/it/ApplicationTest.java | 4 +- .../prebid/server/it/DealsSimulationTest.java | 2 +- .../java/org/prebid/server/it/SovrnTest.java | 2 - .../it/hooks/SampleItBidderRequestHook.java | 6 +-- .../HttpPeriodicRefreshServiceTest.java | 4 +- .../org/prebid/server/util/HttpUtilTest.java | 6 +-- .../test-appnexus-bid-request-1.json | 10 +---- 210 files changed, 282 insertions(+), 847 deletions(-) delete mode 100644 src/main/java/org/prebid/server/auction/model/TargetingBidInfo.java delete mode 100644 src/main/java/org/prebid/server/bidder/adocean/model/AdoceanRequestData.java delete mode 100644 src/main/java/org/prebid/server/bidder/appnexus/model/BidRequestWithUrl.java delete mode 100644 src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusParams.java delete mode 100644 src/main/java/org/prebid/server/bidder/conversant/proto/ConversantParams.java delete mode 100644 src/main/java/org/prebid/server/bidder/pulsepoint/model/NormalizedPulsepointParams.java delete mode 100644 src/main/java/org/prebid/server/bidder/pulsepoint/proto/PulsepointParams.java delete mode 100644 src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconParams.java delete mode 100644 src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoParams.java delete mode 100644 src/main/java/org/prebid/server/bidder/sovrn/model/BidRequestWithUrl.java delete mode 100644 src/main/java/org/prebid/server/bidder/sovrn/proto/SovrnParams.java delete mode 100644 src/main/java/org/prebid/server/cache/proto/BidCacheResult.java delete mode 100644 src/main/java/org/prebid/server/cache/proto/request/BannerValue.java delete mode 100644 src/main/java/org/prebid/server/deals/model/LineItemTargeting.java delete mode 100644 src/main/java/org/prebid/server/deals/model/LineItemTargetingSize.java delete mode 100644 src/main/java/org/prebid/server/deals/model/UserServiceResult.java delete mode 100644 src/main/java/org/prebid/server/deals/targeting/model/UserSegments.java delete mode 100644 src/main/java/org/prebid/server/metric/model/MetricsContext.java delete mode 100644 src/main/java/org/prebid/server/privacy/gdpr/model/PublisherRestrictionEmpty.java delete mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/nobid/ExtImpNobid.java delete mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/RubiconImpExtContext.java delete mode 100644 src/main/java/org/prebid/server/settings/model/CategoryParams.java diff --git a/src/main/java/org/prebid/server/auction/ExchangeService.java b/src/main/java/org/prebid/server/auction/ExchangeService.java index af27bb4fec8..5e018c198e7 100644 --- a/src/main/java/org/prebid/server/auction/ExchangeService.java +++ b/src/main/java/org/prebid/server/auction/ExchangeService.java @@ -315,10 +315,9 @@ private static BidRequestCacheInfo bidRequestCacheInfo(BidRequest bidRequest) { if (targeting != null && cache != null) { final boolean shouldCacheBids = cache.getBids() != null; final boolean shouldCacheVideoBids = cache.getVastxml() != null; - final boolean shouldCacheWinningBidsOnly = targeting.getIncludebidderkeys() - ? false + final boolean shouldCacheWinningBidsOnly = !targeting.getIncludebidderkeys() // ext.prebid.targeting.includebidderkeys takes precedence - : ObjectUtils.defaultIfNull(cache.getWinningonly(), false); + && ObjectUtils.defaultIfNull(cache.getWinningonly(), false); if (shouldCacheBids || shouldCacheVideoBids || shouldCacheWinningBidsOnly) { final Integer cacheBidsTtl = shouldCacheBids ? cache.getBids().getTtlseconds() : null; diff --git a/src/main/java/org/prebid/server/auction/PrivacyEnforcementService.java b/src/main/java/org/prebid/server/auction/PrivacyEnforcementService.java index 6afa3bdb1ba..13ea10b25c8 100644 --- a/src/main/java/org/prebid/server/auction/PrivacyEnforcementService.java +++ b/src/main/java/org/prebid/server/auction/PrivacyEnforcementService.java @@ -422,7 +422,7 @@ private Set extractCcpaEnforcedBidders(List bidders, if (nosaleBidders.size() == 1 && nosaleBidders.contains(CATCH_ALL_BIDDERS)) { ccpaEnforcedBidders.clear(); } else { - ccpaEnforcedBidders.removeAll(nosaleBidders); + nosaleBidders.forEach(ccpaEnforcedBidders::remove); } ccpaEnforcedBidders.removeIf(bidder -> diff --git a/src/main/java/org/prebid/server/auction/StoredResponseProcessor.java b/src/main/java/org/prebid/server/auction/StoredResponseProcessor.java index cf61ee48f66..068aba566fc 100644 --- a/src/main/java/org/prebid/server/auction/StoredResponseProcessor.java +++ b/src/main/java/org/prebid/server/auction/StoredResponseProcessor.java @@ -47,8 +47,9 @@ public class StoredResponseProcessor { private static final String PREBID_EXT = "prebid"; private static final String DEFAULT_BID_CURRENCY = "USD"; - private static final TypeReference> SEATBID_LIST_TYPE = new TypeReference>() { - }; + private static final TypeReference> SEATBID_LIST_TYPE = + new TypeReference<>() { + }; private final ApplicationSettings applicationSettings; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java index 237c3d8b9fd..ce50ec69557 100644 --- a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java +++ b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java @@ -204,7 +204,7 @@ private Map makeFor(String bidder, keywordMap.put(HB_VAST_ID_KEY, vastCacheId); } if ((StringUtils.isNotBlank(vastCacheId) || StringUtils.isNotBlank(cacheId)) - && (cacheHost != null && cachePath != null)) { + && cacheHost != null && cachePath != null) { keywordMap.put(HB_CACHE_HOST_KEY, cacheHost); keywordMap.put(HB_CACHE_PATH_KEY, cachePath); } diff --git a/src/main/java/org/prebid/server/auction/model/AuctionContext.java b/src/main/java/org/prebid/server/auction/model/AuctionContext.java index a9db82277ee..5120b9dee9e 100644 --- a/src/main/java/org/prebid/server/auction/model/AuctionContext.java +++ b/src/main/java/org/prebid/server/auction/model/AuctionContext.java @@ -80,10 +80,6 @@ public AuctionContext with(BidResponse bidResponse) { return this.toBuilder().bidResponse(bidResponse).build(); } - public AuctionContext with(BidRequest bidRequest, List errors) { - return this.toBuilder().bidRequest(bidRequest).prebidErrors(errors).build(); - } - public AuctionContext with(List auctionParticipations) { return this.toBuilder().auctionParticipations(auctionParticipations).build(); } diff --git a/src/main/java/org/prebid/server/auction/model/ConsentType.java b/src/main/java/org/prebid/server/auction/model/ConsentType.java index a35297fb3f7..811519ff824 100644 --- a/src/main/java/org/prebid/server/auction/model/ConsentType.java +++ b/src/main/java/org/prebid/server/auction/model/ConsentType.java @@ -5,5 +5,5 @@ */ public enum ConsentType { - tcfV1, tcfV2, usPrivacy, unknown; + tcfV1, tcfV2, usPrivacy, unknown } diff --git a/src/main/java/org/prebid/server/auction/model/TargetingBidInfo.java b/src/main/java/org/prebid/server/auction/model/TargetingBidInfo.java deleted file mode 100644 index 319dca3f272..00000000000 --- a/src/main/java/org/prebid/server/auction/model/TargetingBidInfo.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.prebid.server.auction.model; - -import lombok.Builder; -import lombok.Value; - -@Builder(toBuilder = true) -@Value -public class TargetingBidInfo { - - BidInfo bidInfo; - - String bidderCode; - - boolean isTargetingEnabled; - - boolean isWinningBid; - - boolean isBidderWinningBid; - - boolean isAddTargetBidderCode; -} 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 21598e97673..5df617750d3 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java @@ -201,8 +201,8 @@ private static Site createSite(HttpRequestContext httpRequest) { } private static User createUser(ConsentType consentType, String consentString, String addtlConsent) { - final boolean tcfV2ConsentProvided = (StringUtils.isNotBlank(consentString) - && TcfDefinerService.isConsentStringValid(consentString)) + final boolean tcfV2ConsentProvided = StringUtils.isNotBlank(consentString) + && TcfDefinerService.isConsentStringValid(consentString) && (consentType == null || consentType == ConsentType.tcfV2); if (StringUtils.isNotBlank(addtlConsent) || tcfV2ConsentProvided) { 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 631d129d48a..3908a3c88df 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java @@ -106,10 +106,8 @@ public Future> fromRequest(RoutingContext routingC .compose(httpRequest -> createBidRequest(httpRequest) .map(bidRequestWithErrors -> populatePodErrors( bidRequestWithErrors.getPodErrors(), podErrors, bidRequestWithErrors)) - .map(bidRequestWithErrors -> { - return ortb2RequestFactory.enrichAuctionContext( - initialAuctionContext, httpRequest, bidRequestWithErrors.getData(), startTime); - })) + .map(bidRequestWithErrors -> ortb2RequestFactory.enrichAuctionContext( + initialAuctionContext, httpRequest, bidRequestWithErrors.getData(), startTime))) .compose(auctionContext -> ortb2RequestFactory.fetchAccountWithoutStoredRequestLookup(auctionContext) .map(auctionContext::with)) diff --git a/src/main/java/org/prebid/server/bidder/DisabledBidder.java b/src/main/java/org/prebid/server/bidder/DisabledBidder.java index dda95ee859e..8d67d1d91e0 100644 --- a/src/main/java/org/prebid/server/bidder/DisabledBidder.java +++ b/src/main/java/org/prebid/server/bidder/DisabledBidder.java @@ -17,7 +17,7 @@ */ public class DisabledBidder implements Bidder { - private String errorMessage; + private final String errorMessage; public DisabledBidder(String errorMessage) { this.errorMessage = Objects.requireNonNull(errorMessage); diff --git a/src/main/java/org/prebid/server/bidder/ViewabilityVendors.java b/src/main/java/org/prebid/server/bidder/ViewabilityVendors.java index 4ddc4b8faa5..2b03b9bdf07 100644 --- a/src/main/java/org/prebid/server/bidder/ViewabilityVendors.java +++ b/src/main/java/org/prebid/server/bidder/ViewabilityVendors.java @@ -10,7 +10,7 @@ public enum ViewabilityVendors { sizemek("sizmek.com"), whiteops("whiteops.com"); - private String url; + private final String url; ViewabilityVendors(String url) { this.url = url; diff --git a/src/main/java/org/prebid/server/bidder/aceex/AceexBidder.java b/src/main/java/org/prebid/server/bidder/aceex/AceexBidder.java index eec5e76d4b1..74dc0b62a9c 100644 --- a/src/main/java/org/prebid/server/bidder/aceex/AceexBidder.java +++ b/src/main/java/org/prebid/server/bidder/aceex/AceexBidder.java @@ -31,7 +31,7 @@ public class AceexBidder implements Bidder { private static final TypeReference> ACEEX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String ACCOUNT_ID_MACRO = "{{AccountId}}"; private static final String X_OPENRTB_VERSION = "2.5"; diff --git a/src/main/java/org/prebid/server/bidder/acuityads/AcuityadsBidder.java b/src/main/java/org/prebid/server/bidder/acuityads/AcuityadsBidder.java index d8af07580d9..5503816231a 100644 --- a/src/main/java/org/prebid/server/bidder/acuityads/AcuityadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/acuityads/AcuityadsBidder.java @@ -34,7 +34,7 @@ public class AcuityadsBidder implements Bidder { private static final TypeReference> ACUITYADS_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String OPENRTB_VERSION = "2.5"; private static final String URL_HOST_MACRO = "{{Host}}"; diff --git a/src/main/java/org/prebid/server/bidder/adgeneration/AdgenerationBidder.java b/src/main/java/org/prebid/server/bidder/adgeneration/AdgenerationBidder.java index 911b4bedaa9..5a785662993 100644 --- a/src/main/java/org/prebid/server/bidder/adgeneration/AdgenerationBidder.java +++ b/src/main/java/org/prebid/server/bidder/adgeneration/AdgenerationBidder.java @@ -46,7 +46,7 @@ public class AdgenerationBidder implements Bidder { Pattern.CASE_INSENSITIVE); private static final TypeReference> ADGENERATION_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; 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 7eb600a5218..218bd186e2f 100644 --- a/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java +++ b/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java @@ -49,7 +49,7 @@ public class AdheseBidder implements Bidder { private static final TypeReference> ADHESE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String ORIGIN_BID = "JERLICIA"; @@ -212,12 +212,12 @@ public Result> makeBids(HttpCall httpCall, Bi } final BigDecimal price; - final Integer width; - final Integer height; + final int width; + final int height; try { price = getPrice(adheseBid); - width = Integer.valueOf(adheseBid.getWidth()); - height = Integer.valueOf(adheseBid.getHeight()); + width = Integer.parseInt(adheseBid.getWidth()); + height = Integer.parseInt(adheseBid.getHeight()); } catch (NumberFormatException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } 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 caa85e76a4e..116d38f4398 100644 --- a/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java +++ b/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java @@ -37,7 +37,7 @@ public class AdkernelBidder implements Bidder { private static final TypeReference> ADKERNEL_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointTemplate; diff --git a/src/main/java/org/prebid/server/bidder/adkerneladn/AdkernelAdnBidder.java b/src/main/java/org/prebid/server/bidder/adkerneladn/AdkernelAdnBidder.java index a7c4a91576a..37229183f4d 100644 --- a/src/main/java/org/prebid/server/bidder/adkerneladn/AdkernelAdnBidder.java +++ b/src/main/java/org/prebid/server/bidder/adkerneladn/AdkernelAdnBidder.java @@ -40,7 +40,7 @@ public class AdkernelAdnBidder implements Bidder { private static final TypeReference> ADKERNELADN_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String DEFAULT_DOMAIN = "tag.adkernel.com"; private static final String URL_HOST_MACRO = "{{Host}}"; diff --git a/src/main/java/org/prebid/server/bidder/admixer/AdmixerBidder.java b/src/main/java/org/prebid/server/bidder/admixer/AdmixerBidder.java index 3315dd98170..e94e0507965 100644 --- a/src/main/java/org/prebid/server/bidder/admixer/AdmixerBidder.java +++ b/src/main/java/org/prebid/server/bidder/admixer/AdmixerBidder.java @@ -37,7 +37,7 @@ public class AdmixerBidder implements Bidder { private static final TypeReference> ADMIXER_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; 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 24783e1cd52..711eb17400f 100644 --- a/src/main/java/org/prebid/server/bidder/adocean/AdoceanBidder.java +++ b/src/main/java/org/prebid/server/bidder/adocean/AdoceanBidder.java @@ -52,7 +52,7 @@ public class AdoceanBidder implements Bidder { private static final TypeReference> ADOCEAN_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String VERSION = "1.2.0"; private static final int MAX_URI_LENGTH = 8000; diff --git a/src/main/java/org/prebid/server/bidder/adocean/model/AdoceanRequestData.java b/src/main/java/org/prebid/server/bidder/adocean/model/AdoceanRequestData.java deleted file mode 100644 index bc17c5b33a9..00000000000 --- a/src/main/java/org/prebid/server/bidder/adocean/model/AdoceanRequestData.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.prebid.server.bidder.adocean.model; - -import io.vertx.core.MultiMap; -import lombok.AllArgsConstructor; -import lombok.Value; - -import java.util.Map; - -@AllArgsConstructor(staticName = "of") -@Value -public class AdoceanRequestData { - - String url; - - MultiMap headers; - - Map slaveSizes; -} diff --git a/src/main/java/org/prebid/server/bidder/adoppler/AdopplerBidder.java b/src/main/java/org/prebid/server/bidder/adoppler/AdopplerBidder.java index 8e761fb4049..0d98277339a 100644 --- a/src/main/java/org/prebid/server/bidder/adoppler/AdopplerBidder.java +++ b/src/main/java/org/prebid/server/bidder/adoppler/AdopplerBidder.java @@ -40,7 +40,7 @@ public class AdopplerBidder implements Bidder { private static final TypeReference> ADOPPLER_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String DEFAULT_CLIENT = "app"; diff --git a/src/main/java/org/prebid/server/bidder/adprime/AdprimeBidder.java b/src/main/java/org/prebid/server/bidder/adprime/AdprimeBidder.java index e95d0699d45..de7e357ce46 100644 --- a/src/main/java/org/prebid/server/bidder/adprime/AdprimeBidder.java +++ b/src/main/java/org/prebid/server/bidder/adprime/AdprimeBidder.java @@ -36,7 +36,7 @@ public class AdprimeBidder implements Bidder { private static final TypeReference> ADPRIME_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/adtarget/AdtargetBidder.java b/src/main/java/org/prebid/server/bidder/adtarget/AdtargetBidder.java index 67f798debaa..5276e6c97b2 100644 --- a/src/main/java/org/prebid/server/bidder/adtarget/AdtargetBidder.java +++ b/src/main/java/org/prebid/server/bidder/adtarget/AdtargetBidder.java @@ -39,7 +39,7 @@ public class AdtargetBidder implements Bidder { private static final TypeReference> ADTARGET_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/adtelligent/AdtelligentBidder.java b/src/main/java/org/prebid/server/bidder/adtelligent/AdtelligentBidder.java index 7c2c6b18839..ad47c3ea3de 100644 --- a/src/main/java/org/prebid/server/bidder/adtelligent/AdtelligentBidder.java +++ b/src/main/java/org/prebid/server/bidder/adtelligent/AdtelligentBidder.java @@ -42,7 +42,7 @@ public class AdtelligentBidder implements Bidder { private static final TypeReference> ADTELLIGENT_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; 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 5afa4104357..5f715b0e604 100644 --- a/src/main/java/org/prebid/server/bidder/advangelists/AdvangelistsBidder.java +++ b/src/main/java/org/prebid/server/bidder/advangelists/AdvangelistsBidder.java @@ -38,8 +38,8 @@ public class AdvangelistsBidder implements Bidder { - private static final TypeReference> ADVANGELISTS_EXT_TYPE_REFERENCE = new - TypeReference>() { + private static final TypeReference> ADVANGELISTS_EXT_TYPE_REFERENCE = + new TypeReference<>() { }; private static final String URL_PUBLISHER_ID_MACRO = "{{PublisherID}}"; diff --git a/src/main/java/org/prebid/server/bidder/adview/AdviewBidder.java b/src/main/java/org/prebid/server/bidder/adview/AdviewBidder.java index f77a9a5c58a..8fbfc0d26c6 100644 --- a/src/main/java/org/prebid/server/bidder/adview/AdviewBidder.java +++ b/src/main/java/org/prebid/server/bidder/adview/AdviewBidder.java @@ -37,7 +37,7 @@ public class AdviewBidder implements Bidder { private static final TypeReference> ADVIEW_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String ACCOUNT_ID_MACRO = "{{AccountId}}"; private static final String BIDDER_CURRENCY = "USD"; diff --git a/src/main/java/org/prebid/server/bidder/adyoulike/AdyoulikeBidder.java b/src/main/java/org/prebid/server/bidder/adyoulike/AdyoulikeBidder.java index e7d0405523c..41ee8fc56c1 100644 --- a/src/main/java/org/prebid/server/bidder/adyoulike/AdyoulikeBidder.java +++ b/src/main/java/org/prebid/server/bidder/adyoulike/AdyoulikeBidder.java @@ -32,9 +32,8 @@ public class AdyoulikeBidder implements Bidder { private static final TypeReference> ADYOULIKE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; - private static final String URL_PUBLISHER_ID_MACRO = "{{publisherId}}"; private final String endpointUrl; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/bidder/aja/AjaBidder.java b/src/main/java/org/prebid/server/bidder/aja/AjaBidder.java index 47a656a1d88..67bb41e6bbe 100644 --- a/src/main/java/org/prebid/server/bidder/aja/AjaBidder.java +++ b/src/main/java/org/prebid/server/bidder/aja/AjaBidder.java @@ -34,7 +34,7 @@ public class AjaBidder implements Bidder { private static final TypeReference> AJA_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; @@ -72,10 +72,7 @@ public Result>> makeHttpRequests(BidRequest bidRequ for (final String tagId : tagIds) { final Imp imp = impsByTagID.get(tagId); - final HttpRequest singleRequest = createSingleRequest(imp, bidRequest, endpointUrl, errors); - if (singleRequest == null) { - continue; - } + final HttpRequest singleRequest = createSingleRequest(imp, bidRequest, endpointUrl); result.add(singleRequest); } @@ -93,11 +90,8 @@ private ExtImpAja parseExtAJA(Imp imp, List errors) { return null; } - private HttpRequest createSingleRequest(Imp imp, BidRequest request, String url, - List errors) { - final BidRequest outgoingRequest = request.toBuilder() - .imp(Collections.singletonList(imp)) - .build(); + private HttpRequest createSingleRequest(Imp imp, BidRequest request, String url) { + final BidRequest outgoingRequest = request.toBuilder().imp(Collections.singletonList(imp)).build(); return HttpRequest.builder() .method(HttpMethod.POST) 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 1f9df344b0b..9f8b4072de9 100644 --- a/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java +++ b/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java @@ -37,7 +37,7 @@ public class AlgorixBidder implements Bidder { private static final TypeReference> ALGORIX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String URL_REGION_MACRO = "{HOST}"; 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 5fe1d1303f2..86406da34cf 100644 --- a/src/main/java/org/prebid/server/bidder/amx/AmxBidder.java +++ b/src/main/java/org/prebid/server/bidder/amx/AmxBidder.java @@ -39,7 +39,7 @@ public class AmxBidder implements Bidder { private static final TypeReference> AMX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String ADAPTER_VERSION = "pbs1.1"; diff --git a/src/main/java/org/prebid/server/bidder/applogy/ApplogyBidder.java b/src/main/java/org/prebid/server/bidder/applogy/ApplogyBidder.java index 1157618b9bf..3e58a00d02d 100644 --- a/src/main/java/org/prebid/server/bidder/applogy/ApplogyBidder.java +++ b/src/main/java/org/prebid/server/bidder/applogy/ApplogyBidder.java @@ -35,7 +35,7 @@ public class ApplogyBidder implements Bidder { private static final TypeReference> APPLOGY_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; 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 facd6ae01ef..e5c75f9cf45 100644 --- a/src/main/java/org/prebid/server/bidder/appnexus/AppnexusBidder.java +++ b/src/main/java/org/prebid/server/bidder/appnexus/AppnexusBidder.java @@ -74,7 +74,7 @@ public class AppnexusBidder implements Bidder { private static final Map IAB_CATEGORIES = new HashMap<>(); private static final TypeReference> APPNEXUS_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; static { diff --git a/src/main/java/org/prebid/server/bidder/appnexus/model/BidRequestWithUrl.java b/src/main/java/org/prebid/server/bidder/appnexus/model/BidRequestWithUrl.java deleted file mode 100644 index 9ba4d8d1a93..00000000000 --- a/src/main/java/org/prebid/server/bidder/appnexus/model/BidRequestWithUrl.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.prebid.server.bidder.appnexus.model; - -import com.iab.openrtb.request.BidRequest; -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class BidRequestWithUrl { - - BidRequest bidRequest; - - String endpointUrl; -} diff --git a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExt.java b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExt.java index ea0bf610334..ed92bf2a820 100644 --- a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExt.java +++ b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExt.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.appnexus.proto; -import lombok.AllArgsConstructor; import lombok.Value; -@AllArgsConstructor(staticName = "of") -@Value -public final class AppnexusBidExt { +@Value(staticConstructor = "of") +public class AppnexusBidExt { AppnexusBidExtAppnexus appnexus; } diff --git a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusParams.java b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusParams.java deleted file mode 100644 index 562ebeacf8e..00000000000 --- a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.prebid.server.bidder.appnexus.proto; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.Builder; -import lombok.Value; - -import java.math.BigDecimal; -import java.util.List; - -@Builder(toBuilder = true) -@Value -public class AppnexusParams { - - @JsonProperty("placementId") - Integer legacyPlacementId; - - @JsonProperty("invCode") - String legacyInvCode; - - @JsonProperty("trafficSourceCode") - String legacyTrafficSourceCode; - - @JsonProperty("placement_id") - Integer placementId; - - @JsonProperty("inv_code") - String invCode; - - String member; - - List keywords; - - @JsonProperty("traffic_source_code") - String trafficSourceCode; - - BigDecimal reserve; - - String position; - - Boolean usePmtRule; - - ObjectNode privateSizes; // At this time we do no processing on the private sizes, so just leaving it as a JSON blob -} 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 6c942fde1c3..d46aa43f240 100644 --- a/src/main/java/org/prebid/server/bidder/axonix/AxonixBidder.java +++ b/src/main/java/org/prebid/server/bidder/axonix/AxonixBidder.java @@ -30,7 +30,7 @@ public class AxonixBidder implements Bidder { private static final TypeReference> AXONIX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; public static final String URL_SUPPLY_ID_MACRO = "{{SupplyId}}"; 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 36f2fb81f2c..74a4b963b1e 100644 --- a/src/main/java/org/prebid/server/bidder/beachfront/BeachfrontBidder.java +++ b/src/main/java/org/prebid/server/bidder/beachfront/BeachfrontBidder.java @@ -67,7 +67,7 @@ public class BeachfrontBidder implements Bidder { private static final int DEFAULT_VIDEO_HEIGHT = 250; private static final TypeReference> BEACHFRONT_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String bannerEndpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/beintoo/BeintooBidder.java b/src/main/java/org/prebid/server/bidder/beintoo/BeintooBidder.java index 87116667f1a..b10d370ff78 100644 --- a/src/main/java/org/prebid/server/bidder/beintoo/BeintooBidder.java +++ b/src/main/java/org/prebid/server/bidder/beintoo/BeintooBidder.java @@ -39,7 +39,7 @@ public class BeintooBidder implements Bidder { private static final TypeReference> BEINTOO_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/between/BetweenBidder.java b/src/main/java/org/prebid/server/bidder/between/BetweenBidder.java index f3ee7859942..a5731593f45 100644 --- a/src/main/java/org/prebid/server/bidder/between/BetweenBidder.java +++ b/src/main/java/org/prebid/server/bidder/between/BetweenBidder.java @@ -37,7 +37,7 @@ public class BetweenBidder implements Bidder { private static final TypeReference> BETWEEN_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String URL_HOST_MACRO = "{{Host}}"; @@ -64,7 +64,7 @@ public Result>> makeHttpRequests(BidRequest request errors.add(BidderError.badInput(e.getMessage())); } } - if (errors.size() > 0) { + if (!errors.isEmpty()) { return Result.withErrors(errors); } @@ -164,20 +164,20 @@ private static MultiMap resolveHeaders(Device device, Site site) { public final Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - return Result.of(extractBids(httpCall.getRequest().getPayload(), bidResponse), Collections.emptyList()); + 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); + return bidsFromResponse(bidResponse); } - private static List bidsFromResponse(BidRequest bidRequest, BidResponse bidResponse) { + private static List bidsFromResponse(BidResponse bidResponse) { return bidResponse.getSeatbid().stream() .filter(Objects::nonNull) .map(SeatBid::getBid) diff --git a/src/main/java/org/prebid/server/bidder/bidmachine/BidmachineBidder.java b/src/main/java/org/prebid/server/bidder/bidmachine/BidmachineBidder.java index f06d0b996b4..ea771f58625 100644 --- a/src/main/java/org/prebid/server/bidder/bidmachine/BidmachineBidder.java +++ b/src/main/java/org/prebid/server/bidder/bidmachine/BidmachineBidder.java @@ -37,7 +37,7 @@ public class BidmachineBidder implements Bidder { private static final TypeReference> BIDMACHINE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/bidscube/BidscubeBidder.java b/src/main/java/org/prebid/server/bidder/bidscube/BidscubeBidder.java index cb58371c7e2..f866cd134b9 100644 --- a/src/main/java/org/prebid/server/bidder/bidscube/BidscubeBidder.java +++ b/src/main/java/org/prebid/server/bidder/bidscube/BidscubeBidder.java @@ -22,10 +22,8 @@ import org.prebid.server.util.HttpUtil; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -33,8 +31,7 @@ public class BidscubeBidder implements Bidder { - private static final Set POSSIBLE_BID_TYPES = Collections.unmodifiableSet( - new HashSet<>(Arrays.asList("banner", "video", "native"))); + private static final Set POSSIBLE_BID_TYPES = Set.of("banner", "video", "native"); private final String endpointUrl; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/bidder/bmtm/BmtmBidder.java b/src/main/java/org/prebid/server/bidder/bmtm/BmtmBidder.java index ac488674ae9..d818e1f6e34 100644 --- a/src/main/java/org/prebid/server/bidder/bmtm/BmtmBidder.java +++ b/src/main/java/org/prebid/server/bidder/bmtm/BmtmBidder.java @@ -36,7 +36,7 @@ public class BmtmBidder implements Bidder { private static final TypeReference> BMTM_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/brightroll/BrightrollBidder.java b/src/main/java/org/prebid/server/bidder/brightroll/BrightrollBidder.java index d43deadb8bb..e1dc28a0d05 100644 --- a/src/main/java/org/prebid/server/bidder/brightroll/BrightrollBidder.java +++ b/src/main/java/org/prebid/server/bidder/brightroll/BrightrollBidder.java @@ -40,7 +40,7 @@ public class BrightrollBidder implements Bidder { private static final String OPENRTB_VERSION = "2.5"; private static final TypeReference> BRIGHTROLL_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/connectad/ConnectadBidder.java b/src/main/java/org/prebid/server/bidder/connectad/ConnectadBidder.java index 43d9a90779b..6bcf785c03a 100644 --- a/src/main/java/org/prebid/server/bidder/connectad/ConnectadBidder.java +++ b/src/main/java/org/prebid/server/bidder/connectad/ConnectadBidder.java @@ -38,7 +38,7 @@ public class ConnectadBidder implements Bidder { private static final TypeReference> CONNECTAD_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String HTTPS_PREFIX = "https"; diff --git a/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java b/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java index ef50a0a9010..5bd1613e29c 100644 --- a/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java +++ b/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java @@ -41,7 +41,7 @@ public class ConversantBidder implements Bidder { private static final TypeReference> CONVERSANT_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; // List of API frameworks supported by the publisher diff --git a/src/main/java/org/prebid/server/bidder/conversant/proto/ConversantParams.java b/src/main/java/org/prebid/server/bidder/conversant/proto/ConversantParams.java deleted file mode 100644 index 053f076a875..00000000000 --- a/src/main/java/org/prebid/server/bidder/conversant/proto/ConversantParams.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.prebid.server.bidder.conversant.proto; - -import lombok.Builder; -import lombok.Value; - -import java.math.BigDecimal; -import java.util.List; - -@Builder -@Value -public class ConversantParams { - - String siteId; - - Integer secure; - - String tagId; - - Integer position; - - BigDecimal bidfloor; - - Integer mobile; - - List mimes; - - List api; - - List protocols; - - Integer maxduration; -} diff --git a/src/main/java/org/prebid/server/bidder/cpmstar/CpmStarBidder.java b/src/main/java/org/prebid/server/bidder/cpmstar/CpmStarBidder.java index c59bf2d80dc..81ad4b6dd3e 100644 --- a/src/main/java/org/prebid/server/bidder/cpmstar/CpmStarBidder.java +++ b/src/main/java/org/prebid/server/bidder/cpmstar/CpmStarBidder.java @@ -32,7 +32,7 @@ public class CpmStarBidder implements Bidder { private static final TypeReference> CPM_STAR_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/datablocks/DatablocksBidder.java b/src/main/java/org/prebid/server/bidder/datablocks/DatablocksBidder.java index 0488d545280..26c58afa93b 100644 --- a/src/main/java/org/prebid/server/bidder/datablocks/DatablocksBidder.java +++ b/src/main/java/org/prebid/server/bidder/datablocks/DatablocksBidder.java @@ -35,7 +35,7 @@ public class DatablocksBidder implements Bidder { private static final TypeReference> DATABLOCKS_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointTemplate; diff --git a/src/main/java/org/prebid/server/bidder/deepintent/DeepintentBidder.java b/src/main/java/org/prebid/server/bidder/deepintent/DeepintentBidder.java index 23016d5af23..6b9c8b214b3 100644 --- a/src/main/java/org/prebid/server/bidder/deepintent/DeepintentBidder.java +++ b/src/main/java/org/prebid/server/bidder/deepintent/DeepintentBidder.java @@ -33,7 +33,7 @@ public class DeepintentBidder implements Bidder { private static final TypeReference> DEEPINTENT_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String DISPLAY_MANAGER = "di_prebid"; diff --git a/src/main/java/org/prebid/server/bidder/dmx/DmxBidder.java b/src/main/java/org/prebid/server/bidder/dmx/DmxBidder.java index b4f2136144b..857fb90f202 100644 --- a/src/main/java/org/prebid/server/bidder/dmx/DmxBidder.java +++ b/src/main/java/org/prebid/server/bidder/dmx/DmxBidder.java @@ -47,7 +47,7 @@ public class DmxBidder implements Bidder { private static final TypeReference> DMX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final int SECURE = 1; diff --git a/src/main/java/org/prebid/server/bidder/emxdigital/EmxDigitalBidder.java b/src/main/java/org/prebid/server/bidder/emxdigital/EmxDigitalBidder.java index 534a202a98f..966d11d6da2 100644 --- a/src/main/java/org/prebid/server/bidder/emxdigital/EmxDigitalBidder.java +++ b/src/main/java/org/prebid/server/bidder/emxdigital/EmxDigitalBidder.java @@ -43,8 +43,8 @@ public class EmxDigitalBidder implements Bidder { private static final String USD_CURRENCY = "USD"; private static final Integer PROTOCOL_VAST_40 = 7; - private static final TypeReference> EMXDIGITAL_EXT_TYPE_REFERENCE = new - TypeReference>() { + private static final TypeReference> EMXDIGITAL_EXT_TYPE_REFERENCE = + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/engagebdr/EngagebdrBidder.java b/src/main/java/org/prebid/server/bidder/engagebdr/EngagebdrBidder.java index 194a4eb021d..4dab197c420 100644 --- a/src/main/java/org/prebid/server/bidder/engagebdr/EngagebdrBidder.java +++ b/src/main/java/org/prebid/server/bidder/engagebdr/EngagebdrBidder.java @@ -34,7 +34,7 @@ public class EngagebdrBidder implements Bidder { private static final TypeReference> ENGAGEBDR_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/eplanning/EplanningBidder.java b/src/main/java/org/prebid/server/bidder/eplanning/EplanningBidder.java index 16fb0f0af86..1e672c01f9a 100644 --- a/src/main/java/org/prebid/server/bidder/eplanning/EplanningBidder.java +++ b/src/main/java/org/prebid/server/bidder/eplanning/EplanningBidder.java @@ -70,7 +70,7 @@ public class EplanningBidder implements Bidder { Arrays.asList("300x250", "728x90", "300x600", "160x600", "970x250", "970x90", "1x1")); private static final TypeReference> EPLANNING_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/facebook/FacebookBidder.java b/src/main/java/org/prebid/server/bidder/facebook/FacebookBidder.java index 5f2fd02c90f..2641dd971cd 100644 --- a/src/main/java/org/prebid/server/bidder/facebook/FacebookBidder.java +++ b/src/main/java/org/prebid/server/bidder/facebook/FacebookBidder.java @@ -50,7 +50,7 @@ public class FacebookBidder implements Bidder { private static final TypeReference> FACEBOOK_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final List SUPPORTED_BANNER_HEIGHT = Arrays.asList(250, 50); 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 d6e9dcf20b3..bd87972ace6 100644 --- a/src/main/java/org/prebid/server/bidder/gamma/GammaBidder.java +++ b/src/main/java/org/prebid/server/bidder/gamma/GammaBidder.java @@ -38,7 +38,7 @@ public class GammaBidder implements Bidder { private static final TypeReference> GAMMA_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/grid/GridKeywordsProcessor.java b/src/main/java/org/prebid/server/bidder/grid/GridKeywordsProcessor.java index 47126e67a09..e56be026186 100644 --- a/src/main/java/org/prebid/server/bidder/grid/GridKeywordsProcessor.java +++ b/src/main/java/org/prebid/server/bidder/grid/GridKeywordsProcessor.java @@ -27,7 +27,7 @@ public class GridKeywordsProcessor { private static final TypeReference> MAP_TYPE_REF = - new TypeReference>() { + new TypeReference<>() { }; private static final String KEYWORDS_PROPERTY = "keywords"; private static final String USER_PROPERTY = "user"; 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 cb377c74049..2ad02f1c91b 100644 --- a/src/main/java/org/prebid/server/bidder/gumgum/GumgumBidder.java +++ b/src/main/java/org/prebid/server/bidder/gumgum/GumgumBidder.java @@ -47,7 +47,7 @@ public class GumgumBidder implements Bidder { private static final TypeReference> GUMGUM_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 95e1a8d9126..ccfa34ed600 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -39,7 +39,7 @@ public class ImpactifyBidder implements Bidder { private static final TypeReference> IMPACTIFY_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String X_OPENRTB_VERSION = "2.5"; private static final String BIDDER_CURRENCY = "USD"; diff --git a/src/main/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidder.java b/src/main/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidder.java index 4912b22cf80..27665a2e3e7 100644 --- a/src/main/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidder.java +++ b/src/main/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidder.java @@ -36,7 +36,7 @@ public class ImprovedigitalBidder implements Bidder { private static final TypeReference> IMPROVEDIGITAL_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/inmobi/InmobiBidder.java b/src/main/java/org/prebid/server/bidder/inmobi/InmobiBidder.java index 8ca2e97a9a2..2e66b8a24de 100644 --- a/src/main/java/org/prebid/server/bidder/inmobi/InmobiBidder.java +++ b/src/main/java/org/prebid/server/bidder/inmobi/InmobiBidder.java @@ -34,7 +34,7 @@ public class InmobiBidder implements Bidder { private static final TypeReference> INMOBI_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final int FIRST_IMP_INDEX = 0; diff --git a/src/main/java/org/prebid/server/bidder/invibes/InvibesBidder.java b/src/main/java/org/prebid/server/bidder/invibes/InvibesBidder.java index 87187fa576d..0b87198ac02 100644 --- a/src/main/java/org/prebid/server/bidder/invibes/InvibesBidder.java +++ b/src/main/java/org/prebid/server/bidder/invibes/InvibesBidder.java @@ -46,7 +46,7 @@ public class InvibesBidder implements Bidder { private static final TypeReference> INVIBES_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String INVIBES_BID_VERSION = "4"; private static final String ADAPTER_VERSION = "prebid_1.0.0"; diff --git a/src/main/java/org/prebid/server/bidder/iqzone/IqzoneBidder.java b/src/main/java/org/prebid/server/bidder/iqzone/IqzoneBidder.java index ed5ce7e77e9..507a7843c05 100644 --- a/src/main/java/org/prebid/server/bidder/iqzone/IqzoneBidder.java +++ b/src/main/java/org/prebid/server/bidder/iqzone/IqzoneBidder.java @@ -34,7 +34,7 @@ public class IqzoneBidder implements Bidder { private static final TypeReference> IQZONE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/bidder/ix/IxBidder.java b/src/main/java/org/prebid/server/bidder/ix/IxBidder.java index 479afc1c0f0..0bc9b7ef89a 100644 --- a/src/main/java/org/prebid/server/bidder/ix/IxBidder.java +++ b/src/main/java/org/prebid/server/bidder/ix/IxBidder.java @@ -46,8 +46,8 @@ public class IxBidder implements Bidder { - private static final TypeReference> IX_EXT_TYPE_REFERENCE = new - TypeReference>() { + private static final TypeReference> IX_EXT_TYPE_REFERENCE = + new TypeReference<>() { }; private static final int REQUEST_LIMIT = 20; diff --git a/src/main/java/org/prebid/server/bidder/kayzen/KayzenBidder.java b/src/main/java/org/prebid/server/bidder/kayzen/KayzenBidder.java index 7c2eccabb72..881dd1cc883 100644 --- a/src/main/java/org/prebid/server/bidder/kayzen/KayzenBidder.java +++ b/src/main/java/org/prebid/server/bidder/kayzen/KayzenBidder.java @@ -31,7 +31,7 @@ public class KayzenBidder implements Bidder { private static final TypeReference> KAYZEN_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String URL_ZONE_ID_MACRO = "{{ZoneID}}"; private static final String URL_ACCOUNT_ID_MACRO = "{{AccountID}}"; diff --git a/src/main/java/org/prebid/server/bidder/kidoz/KidozBidder.java b/src/main/java/org/prebid/server/bidder/kidoz/KidozBidder.java index c3e50a35bb6..df1d755087a 100644 --- a/src/main/java/org/prebid/server/bidder/kidoz/KidozBidder.java +++ b/src/main/java/org/prebid/server/bidder/kidoz/KidozBidder.java @@ -35,7 +35,7 @@ public class KidozBidder implements Bidder { private static final TypeReference> KIDOZ_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; @@ -53,9 +53,8 @@ public Result>> makeHttpRequests(BidRequest request for (Imp imp : request.getImp()) { try { - final Imp validImp = validateImp(imp); - final ExtImpKidoz extImpKidoz = parseAndValidateImpExt(imp); - result.add(createSingleRequest(validImp, request, endpointUrl)); + validateImp(imp); + result.add(createSingleRequest(request, imp)); } catch (PreBidException e) { errors.add(BidderError.badInput(e.getMessage())); } @@ -64,21 +63,21 @@ public Result>> makeHttpRequests(BidRequest request return Result.of(result, errors); } - private HttpRequest createSingleRequest(Imp imp, BidRequest request, String url) { + private HttpRequest createSingleRequest(BidRequest request, Imp imp) { final BidRequest outgoingRequest = request.toBuilder().imp(Collections.singletonList(imp)).build(); final MultiMap headers = HttpUtil.headers().add(HttpUtil.X_OPENRTB_VERSION_HEADER, "2.5"); return HttpRequest.builder() .method(HttpMethod.POST) - .uri(url) + .uri(endpointUrl) .headers(headers) .body(mapper.encodeToBytes(outgoingRequest)) .payload(outgoingRequest) .build(); } - private Imp validateImp(Imp imp) { + private void validateImp(Imp imp) { if (imp.getBanner() == null && imp.getVideo() == null) { throw new PreBidException("Kidoz only supports banner or video ads"); } @@ -90,18 +89,17 @@ private Imp validateImp(Imp imp) { } } - return imp; - } - - private ExtImpKidoz parseAndValidateImpExt(Imp imp) { final ExtImpKidoz extImpKidoz; try { - extImpKidoz = mapper.mapper().convertValue(imp.getExt(), KIDOZ_EXT_TYPE_REFERENCE) - .getBidder(); + extImpKidoz = mapper.mapper().convertValue(imp.getExt(), KIDOZ_EXT_TYPE_REFERENCE).getBidder(); } catch (IllegalArgumentException e) { throw new PreBidException(e.getMessage()); } + validateImpExt(extImpKidoz); + } + + private static void validateImpExt(ExtImpKidoz extImpKidoz) { if (extImpKidoz == null) { throw new PreBidException("impression extensions required"); } @@ -113,8 +111,6 @@ private ExtImpKidoz parseAndValidateImpExt(Imp imp) { if (StringUtils.isBlank(extImpKidoz.getPublisherID())) { throw new PreBidException("Kidoz publisher_id required"); } - - return extImpKidoz; } @Override diff --git a/src/main/java/org/prebid/server/bidder/krushmedia/KrushmediaBidder.java b/src/main/java/org/prebid/server/bidder/krushmedia/KrushmediaBidder.java index 30ccd93d0fb..2e2efba77f8 100644 --- a/src/main/java/org/prebid/server/bidder/krushmedia/KrushmediaBidder.java +++ b/src/main/java/org/prebid/server/bidder/krushmedia/KrushmediaBidder.java @@ -34,7 +34,7 @@ public class KrushmediaBidder implements Bidder { private static final TypeReference> KRUSHMEDIA_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String URI_ACCOUNT_ID_MACRO = "{{AccountID}}"; diff --git a/src/main/java/org/prebid/server/bidder/kubient/KubientBidder.java b/src/main/java/org/prebid/server/bidder/kubient/KubientBidder.java index e57aee88d2a..ea102105f33 100644 --- a/src/main/java/org/prebid/server/bidder/kubient/KubientBidder.java +++ b/src/main/java/org/prebid/server/bidder/kubient/KubientBidder.java @@ -33,7 +33,7 @@ public class KubientBidder implements Bidder { private static final TypeReference> KUBIENT_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/lockerdome/LockerdomeBidder.java b/src/main/java/org/prebid/server/bidder/lockerdome/LockerdomeBidder.java index 25465ad7e82..98bc2f9df05 100644 --- a/src/main/java/org/prebid/server/bidder/lockerdome/LockerdomeBidder.java +++ b/src/main/java/org/prebid/server/bidder/lockerdome/LockerdomeBidder.java @@ -33,7 +33,7 @@ public class LockerdomeBidder implements Bidder { private static final TypeReference> LOCKERDOME_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/logicad/LogicadBidder.java b/src/main/java/org/prebid/server/bidder/logicad/LogicadBidder.java index 2e4bfd94f15..323efbee053 100644 --- a/src/main/java/org/prebid/server/bidder/logicad/LogicadBidder.java +++ b/src/main/java/org/prebid/server/bidder/logicad/LogicadBidder.java @@ -34,7 +34,7 @@ public class LogicadBidder implements Bidder { private static final TypeReference> LOGICAD_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/lunamedia/LunamediaBidder.java b/src/main/java/org/prebid/server/bidder/lunamedia/LunamediaBidder.java index cb4c0ee2001..8a4024f968d 100644 --- a/src/main/java/org/prebid/server/bidder/lunamedia/LunamediaBidder.java +++ b/src/main/java/org/prebid/server/bidder/lunamedia/LunamediaBidder.java @@ -39,8 +39,8 @@ public class LunamediaBidder implements Bidder { - private static final TypeReference> IMP_EXT_TYPE_REFERENCE = new - TypeReference>() { + private static final TypeReference> IMP_EXT_TYPE_REFERENCE = + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/madvertise/MadvertiseBidder.java b/src/main/java/org/prebid/server/bidder/madvertise/MadvertiseBidder.java index 97ead4e0dbd..53488dc3a57 100644 --- a/src/main/java/org/prebid/server/bidder/madvertise/MadvertiseBidder.java +++ b/src/main/java/org/prebid/server/bidder/madvertise/MadvertiseBidder.java @@ -24,10 +24,8 @@ import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.util.HttpUtil; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -36,14 +34,13 @@ public class MadvertiseBidder implements Bidder { private static final TypeReference> MADVERTISE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final int ZONE_ID_MIN_LENGTH = 7; private static final String X_OPENRTB_VERSION = "2.5"; private static final String ZONE_ID_MACRO = "{{ZoneID}}"; - private static final Set VIDEO_BID_ATTRS = Collections.unmodifiableSet( - new HashSet<>(Arrays.asList(16, 6, 7))); + private static final Set VIDEO_BID_ATTRS = Set.of(16, 6, 7); private final JacksonMapper mapper; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/marsmedia/MarsmediaBidder.java b/src/main/java/org/prebid/server/bidder/marsmedia/MarsmediaBidder.java index 0273f30f8d1..f0040233090 100644 --- a/src/main/java/org/prebid/server/bidder/marsmedia/MarsmediaBidder.java +++ b/src/main/java/org/prebid/server/bidder/marsmedia/MarsmediaBidder.java @@ -36,7 +36,7 @@ public class MarsmediaBidder implements Bidder { private static final TypeReference> MARSMEDIA_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/mobfoxpb/MobfoxpbBidder.java b/src/main/java/org/prebid/server/bidder/mobfoxpb/MobfoxpbBidder.java index 0d353037bd4..b0c55256418 100644 --- a/src/main/java/org/prebid/server/bidder/mobfoxpb/MobfoxpbBidder.java +++ b/src/main/java/org/prebid/server/bidder/mobfoxpb/MobfoxpbBidder.java @@ -43,7 +43,7 @@ public class MobfoxpbBidder implements Bidder { private final JacksonMapper mapper; private static final TypeReference> MOBFOXPB_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; public MobfoxpbBidder(String endpoint, JacksonMapper mapper) { 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 79fc0d910fc..fc852039c0c 100644 --- a/src/main/java/org/prebid/server/bidder/mobilefuse/MobilefuseBidder.java +++ b/src/main/java/org/prebid/server/bidder/mobilefuse/MobilefuseBidder.java @@ -30,7 +30,7 @@ public class MobilefuseBidder implements Bidder { private static final TypeReference> MOBILEFUSE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/nanointeractive/NanointeractiveBidder.java b/src/main/java/org/prebid/server/bidder/nanointeractive/NanointeractiveBidder.java index bc9490f62b9..7eab20d7ca1 100644 --- a/src/main/java/org/prebid/server/bidder/nanointeractive/NanointeractiveBidder.java +++ b/src/main/java/org/prebid/server/bidder/nanointeractive/NanointeractiveBidder.java @@ -36,7 +36,7 @@ public class NanointeractiveBidder implements Bidder { private static final TypeReference> NANOINTERACTIVE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/bidder/nextmillenium/NextMilleniumBidder.java b/src/main/java/org/prebid/server/bidder/nextmillenium/NextMilleniumBidder.java index 3a55a15c192..ab45c8c912b 100644 --- a/src/main/java/org/prebid/server/bidder/nextmillenium/NextMilleniumBidder.java +++ b/src/main/java/org/prebid/server/bidder/nextmillenium/NextMilleniumBidder.java @@ -33,7 +33,7 @@ public class NextMilleniumBidder implements Bidder { private static final TypeReference> NEXTMILLENIUM_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/ninthdecimal/NinthdecimalBidder.java b/src/main/java/org/prebid/server/bidder/ninthdecimal/NinthdecimalBidder.java index f7d6489a21c..ed10c614adc 100644 --- a/src/main/java/org/prebid/server/bidder/ninthdecimal/NinthdecimalBidder.java +++ b/src/main/java/org/prebid/server/bidder/ninthdecimal/NinthdecimalBidder.java @@ -39,8 +39,8 @@ public class NinthdecimalBidder implements Bidder { - private static final TypeReference> NINTHDECIMAL_EXT_TYPE_REFERENCE = new - TypeReference>() { + private static final TypeReference> NINTHDECIMAL_EXT_TYPE_REFERENCE = + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/onetag/OnetagBidder.java b/src/main/java/org/prebid/server/bidder/onetag/OnetagBidder.java index 8c6cb35720f..4b65017fd7d 100644 --- a/src/main/java/org/prebid/server/bidder/onetag/OnetagBidder.java +++ b/src/main/java/org/prebid/server/bidder/onetag/OnetagBidder.java @@ -32,7 +32,7 @@ public class OnetagBidder implements Bidder { private static final TypeReference> ONETAG_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String URL_PUBLISHER_ID_MACRO = "{{publisherId}}"; diff --git a/src/main/java/org/prebid/server/bidder/openweb/OpenWebBidder.java b/src/main/java/org/prebid/server/bidder/openweb/OpenWebBidder.java index f737bf95d57..e06783a7dd2 100644 --- a/src/main/java/org/prebid/server/bidder/openweb/OpenWebBidder.java +++ b/src/main/java/org/prebid/server/bidder/openweb/OpenWebBidder.java @@ -37,7 +37,7 @@ public class OpenWebBidder implements Bidder { private static final TypeReference> OPENWEB_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final JacksonMapper mapper; diff --git a/src/main/java/org/prebid/server/bidder/openx/OpenxBidder.java b/src/main/java/org/prebid/server/bidder/openx/OpenxBidder.java index 7697bf4cba2..c732c7348b6 100644 --- a/src/main/java/org/prebid/server/bidder/openx/OpenxBidder.java +++ b/src/main/java/org/prebid/server/bidder/openx/OpenxBidder.java @@ -47,7 +47,7 @@ public class OpenxBidder implements Bidder { private static final String DEFAULT_BID_CURRENCY = "USD"; private static final TypeReference> OPENX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; 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 97f869ed600..e2e9fe2f5fc 100644 --- a/src/main/java/org/prebid/server/bidder/operaads/OperaadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/operaads/OperaadsBidder.java @@ -40,7 +40,7 @@ public class OperaadsBidder implements Bidder { private static final TypeReference> OPERAADS_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String PUBLISHER_ID_MACRO = "{{PublisherId}}"; private static final String ACCOUNT_ID_MACRO = "{{AccountId}}"; diff --git a/src/main/java/org/prebid/server/bidder/orbidder/OrbidderBidder.java b/src/main/java/org/prebid/server/bidder/orbidder/OrbidderBidder.java index 28d6e463d2f..cfe55860e93 100644 --- a/src/main/java/org/prebid/server/bidder/orbidder/OrbidderBidder.java +++ b/src/main/java/org/prebid/server/bidder/orbidder/OrbidderBidder.java @@ -30,7 +30,7 @@ public class OrbidderBidder implements Bidder { private static final TypeReference> ORBIDDER_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/outbrain/OutbrainBidder.java b/src/main/java/org/prebid/server/bidder/outbrain/OutbrainBidder.java index 0b548a5f9e4..d1f4a64434e 100644 --- a/src/main/java/org/prebid/server/bidder/outbrain/OutbrainBidder.java +++ b/src/main/java/org/prebid/server/bidder/outbrain/OutbrainBidder.java @@ -44,7 +44,7 @@ public class OutbrainBidder implements Bidder { private static final int EVENT_TYPE_IMPRESSION = 1; private static final TypeReference> OUTBRAIN_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/pubmatic/PubmaticBidder.java b/src/main/java/org/prebid/server/bidder/pubmatic/PubmaticBidder.java index f8f01efc9c7..118ea3c9149 100644 --- a/src/main/java/org/prebid/server/bidder/pubmatic/PubmaticBidder.java +++ b/src/main/java/org/prebid/server/bidder/pubmatic/PubmaticBidder.java @@ -57,7 +57,7 @@ public class PubmaticBidder implements Bidder { private static final String PREBID = "prebid"; private static final TypeReference> WRAPPER_TYPE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/pubnative/PubnativeBidder.java b/src/main/java/org/prebid/server/bidder/pubnative/PubnativeBidder.java index 82a983b57af..e4a02642f0e 100644 --- a/src/main/java/org/prebid/server/bidder/pubnative/PubnativeBidder.java +++ b/src/main/java/org/prebid/server/bidder/pubnative/PubnativeBidder.java @@ -41,7 +41,7 @@ public class PubnativeBidder implements Bidder { private static final TypeReference> PUBNATIVE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String PUBNATIVE_CURRENCY = "USD"; diff --git a/src/main/java/org/prebid/server/bidder/pulsepoint/model/NormalizedPulsepointParams.java b/src/main/java/org/prebid/server/bidder/pulsepoint/model/NormalizedPulsepointParams.java deleted file mode 100644 index 01c758d2784..00000000000 --- a/src/main/java/org/prebid/server/bidder/pulsepoint/model/NormalizedPulsepointParams.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.prebid.server.bidder.pulsepoint.model; - -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class NormalizedPulsepointParams { - - String publisherId; - - String tagId; - - Integer adSizeWidth; - - Integer adSizeHeight; -} diff --git a/src/main/java/org/prebid/server/bidder/pulsepoint/proto/PulsepointParams.java b/src/main/java/org/prebid/server/bidder/pulsepoint/proto/PulsepointParams.java deleted file mode 100644 index 0ce76003aab..00000000000 --- a/src/main/java/org/prebid/server/bidder/pulsepoint/proto/PulsepointParams.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.prebid.server.bidder.pulsepoint.proto; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class PulsepointParams { - - @JsonProperty("cp") - Integer publisherId; - - @JsonProperty("ct") - Integer tagId; - - @JsonProperty("cf") - String adSize; -} diff --git a/src/main/java/org/prebid/server/bidder/rhythmone/RhythmoneBidder.java b/src/main/java/org/prebid/server/bidder/rhythmone/RhythmoneBidder.java index e977d34d324..f1db077052e 100644 --- a/src/main/java/org/prebid/server/bidder/rhythmone/RhythmoneBidder.java +++ b/src/main/java/org/prebid/server/bidder/rhythmone/RhythmoneBidder.java @@ -33,7 +33,7 @@ public class RhythmoneBidder implements Bidder { private static final TypeReference> RHYTHMONE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; 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 d3a55e56906..33ecec313ad 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java @@ -148,18 +148,16 @@ public class RubiconBidder implements Bidder { private static final String DMP_STYPE = "dmp"; private static final String XAPI_CURRENCY = "USD"; - private static final Set USER_SEGTAXES = Collections.unmodifiableSet( - new HashSet<>(Collections.singletonList(4))); - private static final Set SITE_SEGTAXES = Collections.unmodifiableSet( - new HashSet<>(Arrays.asList(1, 2, 5, 6))); + private static final Set USER_SEGTAXES = Set.of(4); + private static final Set SITE_SEGTAXES = Set.of(1, 2, 5, 6); private static final Set STYPE_TO_REMOVE = new HashSet<>(Arrays.asList(PPUID_STYPE, SHA256EMAIL_STYPE, DMP_STYPE)); private static final TypeReference> RUBICON_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final TypeReference> EXT_PREBID_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final int PORTRAIT_MOBILE_SIZE_ID = 67; private static final int LANDSCAPE_MOBILE_SIZE_ID = 101; diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconParams.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconParams.java deleted file mode 100644 index 97c66909d55..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconParams.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.JsonNode; -import lombok.Builder; -import lombok.Value; -import org.prebid.server.proto.openrtb.ext.request.rubicon.RubiconVideoParams; - -@Builder -@Value -public class RubiconParams { - - @JsonProperty("accountId") - Integer accountId; - - @JsonProperty("siteId") - Integer siteId; - - @JsonProperty("zoneId") - Integer zoneId; - - JsonNode inventory; - - JsonNode visitor; - - RubiconVideoParams video; -} diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoParams.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoParams.java deleted file mode 100644 index 8bfdf0aaeb3..00000000000 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconVideoParams.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.prebid.server.bidder.rubicon.proto.request; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Builder; -import lombok.Value; - -@Builder -@Value -public class RubiconVideoParams { - - String language; - - @JsonProperty("playerHeight") - String playerHeight; - - @JsonProperty("playerWidth") - String playerWidth; - - Integer sizeId; - - Integer skip; - - Integer skipdelay; -} diff --git a/src/main/java/org/prebid/server/bidder/sharethrough/SharethroughBidder.java b/src/main/java/org/prebid/server/bidder/sharethrough/SharethroughBidder.java index fad020f771a..e3c96afd817 100644 --- a/src/main/java/org/prebid/server/bidder/sharethrough/SharethroughBidder.java +++ b/src/main/java/org/prebid/server/bidder/sharethrough/SharethroughBidder.java @@ -48,7 +48,7 @@ public class SharethroughBidder implements Bidder { private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); private static final TypeReference> SHARETHROUGH_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/silvermob/SilvermobBidder.java b/src/main/java/org/prebid/server/bidder/silvermob/SilvermobBidder.java index 1820e95b66e..02059633241 100644 --- a/src/main/java/org/prebid/server/bidder/silvermob/SilvermobBidder.java +++ b/src/main/java/org/prebid/server/bidder/silvermob/SilvermobBidder.java @@ -34,7 +34,7 @@ public class SilvermobBidder implements Bidder { private static final TypeReference> SILVERMOB_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String URL_HOST_MACRO = "{{Host}}"; 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 8a2c4c833bd..526f650b935 100644 --- a/src/main/java/org/prebid/server/bidder/smaato/SmaatoBidder.java +++ b/src/main/java/org/prebid/server/bidder/smaato/SmaatoBidder.java @@ -66,7 +66,7 @@ public class SmaatoBidder implements Bidder { private static final TypeReference> SMAATO_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String CLIENT_VERSION = "prebid_server_0.4"; private static final String SMT_ADTYPE_HEADER = "X-Smt-Adtype"; diff --git a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java index f5108e14b0d..24d12bb7b7b 100644 --- a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java +++ b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java @@ -37,7 +37,7 @@ public class SmartadserverBidder implements Bidder { private static final TypeReference> SMARTADSERVER_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/smarthub/SmarthubBidder.java b/src/main/java/org/prebid/server/bidder/smarthub/SmarthubBidder.java index c81c4a1e8a8..f8f5aaf941f 100644 --- a/src/main/java/org/prebid/server/bidder/smarthub/SmarthubBidder.java +++ b/src/main/java/org/prebid/server/bidder/smarthub/SmarthubBidder.java @@ -32,7 +32,7 @@ public class SmarthubBidder implements Bidder { private static final TypeReference> SMARTHUB_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointTemplate; diff --git a/src/main/java/org/prebid/server/bidder/smartrtb/SmartrtbBidder.java b/src/main/java/org/prebid/server/bidder/smartrtb/SmartrtbBidder.java index 4f8ef7bac66..e44057d8051 100644 --- a/src/main/java/org/prebid/server/bidder/smartrtb/SmartrtbBidder.java +++ b/src/main/java/org/prebid/server/bidder/smartrtb/SmartrtbBidder.java @@ -35,7 +35,7 @@ public class SmartrtbBidder implements Bidder { private static final TypeReference> SMARTRTB_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String CREATIVE_TYPE_BANNER = "BANNER"; 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 de6d143b6ad..3c49c1daed9 100644 --- a/src/main/java/org/prebid/server/bidder/smartyads/SmartyAdsBidder.java +++ b/src/main/java/org/prebid/server/bidder/smartyads/SmartyAdsBidder.java @@ -33,7 +33,7 @@ public class SmartyAdsBidder implements Bidder { private static final TypeReference> SMARTYADS_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String URL_HOST_MACRO = "{{Host}}"; private static final String URL_SOURCE_ID_MACRO = "{{SourceId}}"; diff --git a/src/main/java/org/prebid/server/bidder/somoaudience/SomoaudienceBidder.java b/src/main/java/org/prebid/server/bidder/somoaudience/SomoaudienceBidder.java index bd47413f173..8583373b18c 100644 --- a/src/main/java/org/prebid/server/bidder/somoaudience/SomoaudienceBidder.java +++ b/src/main/java/org/prebid/server/bidder/somoaudience/SomoaudienceBidder.java @@ -36,7 +36,7 @@ public class SomoaudienceBidder implements Bidder { private static final TypeReference> SOMOAUDIENCE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String CONFIG = "hb_pbs_1.0.0"; diff --git a/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java b/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java index a97020183b8..b4bf2048f86 100644 --- a/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java +++ b/src/main/java/org/prebid/server/bidder/sovrn/SovrnBidder.java @@ -42,7 +42,7 @@ public class SovrnBidder implements Bidder { private static final String LJT_READER_COOKIE_NAME = "ljt_reader"; private static final TypeReference> SOVRN_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/sovrn/model/BidRequestWithUrl.java b/src/main/java/org/prebid/server/bidder/sovrn/model/BidRequestWithUrl.java deleted file mode 100644 index cf948086053..00000000000 --- a/src/main/java/org/prebid/server/bidder/sovrn/model/BidRequestWithUrl.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.prebid.server.bidder.sovrn.model; - -import com.iab.openrtb.request.BidRequest; -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class BidRequestWithUrl { - - BidRequest bidRequest; - - String endpointUrl; -} diff --git a/src/main/java/org/prebid/server/bidder/sovrn/proto/SovrnParams.java b/src/main/java/org/prebid/server/bidder/sovrn/proto/SovrnParams.java deleted file mode 100644 index c7b42cbf89b..00000000000 --- a/src/main/java/org/prebid/server/bidder/sovrn/proto/SovrnParams.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.prebid.server.bidder.sovrn.proto; - -import lombok.AllArgsConstructor; -import lombok.Value; - -@Value -@AllArgsConstructor(staticName = "of") -public class SovrnParams { - - String tagId; - - Float bidfloor; -} diff --git a/src/main/java/org/prebid/server/bidder/synacormedia/SynacormediaBidder.java b/src/main/java/org/prebid/server/bidder/synacormedia/SynacormediaBidder.java index 2aa3de3db31..c6355100666 100644 --- a/src/main/java/org/prebid/server/bidder/synacormedia/SynacormediaBidder.java +++ b/src/main/java/org/prebid/server/bidder/synacormedia/SynacormediaBidder.java @@ -36,7 +36,7 @@ public class SynacormediaBidder implements Bidder { private static final TypeReference> SYNACORMEDIA_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/tappx/TappxBidder.java b/src/main/java/org/prebid/server/bidder/tappx/TappxBidder.java index eaebf4bb802..4b7cc3078bf 100644 --- a/src/main/java/org/prebid/server/bidder/tappx/TappxBidder.java +++ b/src/main/java/org/prebid/server/bidder/tappx/TappxBidder.java @@ -40,7 +40,7 @@ public class TappxBidder implements Bidder { private static final String TYPE_CNN = "prebid"; private static final TypeReference> TAPX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/telaria/TelariaBidder.java b/src/main/java/org/prebid/server/bidder/telaria/TelariaBidder.java index 937a24aebf6..8cc87a89ad0 100644 --- a/src/main/java/org/prebid/server/bidder/telaria/TelariaBidder.java +++ b/src/main/java/org/prebid/server/bidder/telaria/TelariaBidder.java @@ -40,7 +40,7 @@ public class TelariaBidder implements Bidder { private static final TypeReference> TELARIA_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/triplelift/TripleliftBidder.java b/src/main/java/org/prebid/server/bidder/triplelift/TripleliftBidder.java index db0238d6133..cdadd7e1f4d 100644 --- a/src/main/java/org/prebid/server/bidder/triplelift/TripleliftBidder.java +++ b/src/main/java/org/prebid/server/bidder/triplelift/TripleliftBidder.java @@ -35,7 +35,7 @@ public class TripleliftBidder implements Bidder { private static final TypeReference> TRIPLELIFT_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/tripleliftnative/TripleliftNativeBidder.java b/src/main/java/org/prebid/server/bidder/tripleliftnative/TripleliftNativeBidder.java index c2614a40c4a..661c3ab1f10 100644 --- a/src/main/java/org/prebid/server/bidder/tripleliftnative/TripleliftNativeBidder.java +++ b/src/main/java/org/prebid/server/bidder/tripleliftnative/TripleliftNativeBidder.java @@ -39,7 +39,7 @@ public class TripleliftNativeBidder implements Bidder { private static final String UNKNOWN_PUBLISHER_ID = "unknown"; private static final TypeReference> TRIPLELIFT_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/ttx/TtxBidder.java b/src/main/java/org/prebid/server/bidder/ttx/TtxBidder.java index fc4d30a901a..ec9afe371cf 100644 --- a/src/main/java/org/prebid/server/bidder/ttx/TtxBidder.java +++ b/src/main/java/org/prebid/server/bidder/ttx/TtxBidder.java @@ -42,7 +42,7 @@ public class TtxBidder implements Bidder { private static final TypeReference> TTX_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/ucfunnel/UcfunnelBidder.java b/src/main/java/org/prebid/server/bidder/ucfunnel/UcfunnelBidder.java index a848ea714c8..b2b22587325 100644 --- a/src/main/java/org/prebid/server/bidder/ucfunnel/UcfunnelBidder.java +++ b/src/main/java/org/prebid/server/bidder/ucfunnel/UcfunnelBidder.java @@ -31,7 +31,7 @@ public class UcfunnelBidder implements Bidder { private static final TypeReference> UCFUNNEL_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; 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 fc6b8a0da5b..6e24591e582 100644 --- a/src/main/java/org/prebid/server/bidder/unicorn/UnicornBidder.java +++ b/src/main/java/org/prebid/server/bidder/unicorn/UnicornBidder.java @@ -44,7 +44,7 @@ public class UnicornBidder implements Bidder { private static final TypeReference> UNICORN_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/unruly/UnrulyBidder.java b/src/main/java/org/prebid/server/bidder/unruly/UnrulyBidder.java index f1793ce62d6..face5d03bc4 100644 --- a/src/main/java/org/prebid/server/bidder/unruly/UnrulyBidder.java +++ b/src/main/java/org/prebid/server/bidder/unruly/UnrulyBidder.java @@ -33,7 +33,7 @@ public class UnrulyBidder implements Bidder { private static final TypeReference> UNRULY_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/valueimpression/ValueImpressionBidder.java b/src/main/java/org/prebid/server/bidder/valueimpression/ValueImpressionBidder.java index b92b3b8788a..912132f84d0 100644 --- a/src/main/java/org/prebid/server/bidder/valueimpression/ValueImpressionBidder.java +++ b/src/main/java/org/prebid/server/bidder/valueimpression/ValueImpressionBidder.java @@ -32,7 +32,7 @@ public class ValueImpressionBidder implements Bidder { private static final TypeReference> VALUE_IMPRESSION_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/yahoossp/YahooSSPBidder.java b/src/main/java/org/prebid/server/bidder/yahoossp/YahooSSPBidder.java index 89a06782e76..6e1cc0fb4e8 100644 --- a/src/main/java/org/prebid/server/bidder/yahoossp/YahooSSPBidder.java +++ b/src/main/java/org/prebid/server/bidder/yahoossp/YahooSSPBidder.java @@ -39,7 +39,7 @@ public class YahooSSPBidder implements Bidder { private static final TypeReference> YAHOOSSP_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; @@ -176,7 +176,7 @@ private static List extractBids(BidResponse bidResponse, BidRequest b } if (seatBids.isEmpty()) { - throw new PreBidException(String.format("Invalid SeatBids count: %d", seatBids.size())); + throw new PreBidException("Invalid SeatBids count: 0"); } return bidsFromResponse(bidResponse, bidRequest.getImp()); } diff --git a/src/main/java/org/prebid/server/bidder/yeahmobi/YeahmobiBidder.java b/src/main/java/org/prebid/server/bidder/yeahmobi/YeahmobiBidder.java index 0d6762f8a2a..197e5f7253f 100644 --- a/src/main/java/org/prebid/server/bidder/yeahmobi/YeahmobiBidder.java +++ b/src/main/java/org/prebid/server/bidder/yeahmobi/YeahmobiBidder.java @@ -35,7 +35,7 @@ public class YeahmobiBidder implements Bidder { private static final TypeReference> YEAHMOBI_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/yieldlab/YieldlabBidder.java b/src/main/java/org/prebid/server/bidder/yieldlab/YieldlabBidder.java index 5b86431429c..10162d5d4bb 100644 --- a/src/main/java/org/prebid/server/bidder/yieldlab/YieldlabBidder.java +++ b/src/main/java/org/prebid/server/bidder/yieldlab/YieldlabBidder.java @@ -49,7 +49,7 @@ public class YieldlabBidder implements Bidder { private static final TypeReference> YIELDLAB_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String BID_CURRENCY = "EUR"; diff --git a/src/main/java/org/prebid/server/bidder/yieldone/YieldoneBidder.java b/src/main/java/org/prebid/server/bidder/yieldone/YieldoneBidder.java index 1bacb87c015..6b5dfaadbd9 100644 --- a/src/main/java/org/prebid/server/bidder/yieldone/YieldoneBidder.java +++ b/src/main/java/org/prebid/server/bidder/yieldone/YieldoneBidder.java @@ -33,7 +33,7 @@ public class YieldoneBidder implements Bidder { private static final TypeReference> YIELDONE_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private final String endpointUrl; diff --git a/src/main/java/org/prebid/server/bidder/zeroclickfraud/ZeroclickfraudBidder.java b/src/main/java/org/prebid/server/bidder/zeroclickfraud/ZeroclickfraudBidder.java index 18c3251a5fe..13dcc0a32f8 100644 --- a/src/main/java/org/prebid/server/bidder/zeroclickfraud/ZeroclickfraudBidder.java +++ b/src/main/java/org/prebid/server/bidder/zeroclickfraud/ZeroclickfraudBidder.java @@ -35,7 +35,7 @@ public class ZeroclickfraudBidder implements Bidder { private static final TypeReference> ZEROCLICKFRAUD_EXT_TYPE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String HOST = "{{Host}}"; diff --git a/src/main/java/org/prebid/server/cache/proto/BidCacheResult.java b/src/main/java/org/prebid/server/cache/proto/BidCacheResult.java deleted file mode 100644 index 8cfe37b06b6..00000000000 --- a/src/main/java/org/prebid/server/cache/proto/BidCacheResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.prebid.server.cache.proto; - -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class BidCacheResult { - - String cacheId; - - String cacheUrl; -} diff --git a/src/main/java/org/prebid/server/cache/proto/request/BannerValue.java b/src/main/java/org/prebid/server/cache/proto/request/BannerValue.java deleted file mode 100644 index e312ebd16bc..00000000000 --- a/src/main/java/org/prebid/server/cache/proto/request/BannerValue.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.prebid.server.cache.proto.request; - -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class BannerValue { - - String adm; - - String nurl; - - Integer width; - - Integer height; -} diff --git a/src/main/java/org/prebid/server/deals/DeliveryProgressService.java b/src/main/java/org/prebid/server/deals/DeliveryProgressService.java index 76dfae0c7fd..25731cece6a 100644 --- a/src/main/java/org/prebid/server/deals/DeliveryProgressService.java +++ b/src/main/java/org/prebid/server/deals/DeliveryProgressService.java @@ -40,7 +40,7 @@ public class DeliveryProgressService implements ApplicationEventProcessor { private final long lineItemStatusTtl; - protected DeliveryProgress overallDeliveryProgress; + protected final DeliveryProgress overallDeliveryProgress; protected DeliveryProgress currentDeliveryProgress; public DeliveryProgressService(DeliveryProgressProperties deliveryProgressProperties, @@ -181,7 +181,7 @@ protected void incrementTokens(LineItem lineItem, ZonedDateTime now, Map> LINE_ITEM_METADATA_TYPE_REFERENCE - = new TypeReference>() { + protected static final TypeReference> LINE_ITEM_METADATA_TYPE_REFERENCE = + new TypeReference<>() { }; private static final String BASIC_AUTH_PATTERN = "Basic %s"; diff --git a/src/main/java/org/prebid/server/deals/lineitem/DeliveryToken.java b/src/main/java/org/prebid/server/deals/lineitem/DeliveryToken.java index 4016be23e23..67188cc96e9 100644 --- a/src/main/java/org/prebid/server/deals/lineitem/DeliveryToken.java +++ b/src/main/java/org/prebid/server/deals/lineitem/DeliveryToken.java @@ -14,10 +14,6 @@ public class DeliveryToken implements Comparable { private final LongAdder spent; - private DeliveryToken(DeliveryToken deliveryToken) { - this(deliveryToken.token, new LongAdder()); - } - private DeliveryToken(Token token) { this(token, new LongAdder()); } @@ -28,7 +24,7 @@ private DeliveryToken(Token token, LongAdder spent) { } public static DeliveryToken of(DeliveryToken deliveryToken) { - return new DeliveryToken(deliveryToken); + return new DeliveryToken(deliveryToken.token); } public static DeliveryToken of(Token token) { diff --git a/src/main/java/org/prebid/server/deals/model/AlertEvent.java b/src/main/java/org/prebid/server/deals/model/AlertEvent.java index a231b1f6bbf..157ab84c41f 100644 --- a/src/main/java/org/prebid/server/deals/model/AlertEvent.java +++ b/src/main/java/org/prebid/server/deals/model/AlertEvent.java @@ -9,17 +9,17 @@ @Value public class AlertEvent { - private String id; + String id; - private String action; + String action; - private AlertPriority priority; + AlertPriority priority; - private ZonedDateTime updatedAt; + ZonedDateTime updatedAt; - private String name; + String name; - private String details; + String details; - private AlertSource source; + AlertSource source; } diff --git a/src/main/java/org/prebid/server/deals/model/AlertSource.java b/src/main/java/org/prebid/server/deals/model/AlertSource.java index b4be61a2a43..a673a18cb5b 100644 --- a/src/main/java/org/prebid/server/deals/model/AlertSource.java +++ b/src/main/java/org/prebid/server/deals/model/AlertSource.java @@ -8,18 +8,18 @@ @Value public class AlertSource { - private String env; + String env; @JsonProperty("data-center") - private String dataCenter; + String dataCenter; - private String region; + String region; - private String system; + String system; @JsonProperty("sub-system") - private String subSystem; + String subSystem; @JsonProperty("host-id") - private String hostId; + String hostId; } diff --git a/src/main/java/org/prebid/server/deals/model/DeviceType.java b/src/main/java/org/prebid/server/deals/model/DeviceType.java index 43dbefa13b4..723cfdfed31 100644 --- a/src/main/java/org/prebid/server/deals/model/DeviceType.java +++ b/src/main/java/org/prebid/server/deals/model/DeviceType.java @@ -10,7 +10,7 @@ public enum DeviceType { SET_TOP_BOX("set top box"), TABLET("tablet"); - private String name; + private final String name; DeviceType(String name) { this.name = name; diff --git a/src/main/java/org/prebid/server/deals/model/LineItemTargeting.java b/src/main/java/org/prebid/server/deals/model/LineItemTargeting.java deleted file mode 100644 index cabdef1b620..00000000000 --- a/src/main/java/org/prebid/server/deals/model/LineItemTargeting.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.prebid.server.deals.model; - -import lombok.AllArgsConstructor; -import lombok.Value; - -import java.util.List; - -/** - * Defines the contract for lineitems[].targeting. - */ -@AllArgsConstructor(staticName = "of") -@Value -public class LineItemTargeting { - - List size; -} diff --git a/src/main/java/org/prebid/server/deals/model/LineItemTargetingSize.java b/src/main/java/org/prebid/server/deals/model/LineItemTargetingSize.java deleted file mode 100644 index a6e7c6cb401..00000000000 --- a/src/main/java/org/prebid/server/deals/model/LineItemTargetingSize.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.prebid.server.deals.model; - -import lombok.AllArgsConstructor; -import lombok.Value; - -/** - * Defines the contract for lineitems[].targeting.size. - */ -@AllArgsConstructor(staticName = "of") -@Value -public class LineItemTargetingSize { - - Integer w; - - Integer h; -} diff --git a/src/main/java/org/prebid/server/deals/model/UserServiceResult.java b/src/main/java/org/prebid/server/deals/model/UserServiceResult.java deleted file mode 100644 index c30d8fec532..00000000000 --- a/src/main/java/org/prebid/server/deals/model/UserServiceResult.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.prebid.server.deals.model; - -import lombok.AllArgsConstructor; -import lombok.Value; -import org.prebid.server.cache.model.DebugHttpCall; - -@AllArgsConstructor(staticName = "of") -@Value -public class UserServiceResult { - - UserDetails userDetails; - - DebugHttpCall cacheHttpCall; - - public static UserServiceResult empty() { - return UserServiceResult.of(UserDetails.empty(), DebugHttpCall.empty()); - } -} diff --git a/src/main/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandler.java b/src/main/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandler.java index 1bb14d329e3..67cd92a65de 100644 --- a/src/main/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandler.java +++ b/src/main/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandler.java @@ -23,8 +23,8 @@ public class DealsSimulationAdminHandler implements Handler { - private static final TypeReference> BID_RATES_TYPE_REFERENCE - = new TypeReference>() { + private static final TypeReference> BID_RATES_TYPE_REFERENCE = + new TypeReference<>() { }; private static final Logger logger = LoggerFactory.getLogger(DealsSimulationAdminHandler.class); diff --git a/src/main/java/org/prebid/server/deals/simulation/SimulationAwareDeliveryProgressService.java b/src/main/java/org/prebid/server/deals/simulation/SimulationAwareDeliveryProgressService.java index fce81110c8b..511c37207fb 100644 --- a/src/main/java/org/prebid/server/deals/simulation/SimulationAwareDeliveryProgressService.java +++ b/src/main/java/org/prebid/server/deals/simulation/SimulationAwareDeliveryProgressService.java @@ -18,7 +18,7 @@ public class SimulationAwareDeliveryProgressService extends DeliveryProgressServ private static final String PG_SIM_TIMESTAMP = "pg-sim-timestamp"; - private long readyAtAdjustment; + private final long readyAtAdjustment; private volatile boolean firstReportUpdate; public SimulationAwareDeliveryProgressService(DeliveryProgressProperties deliveryProgressProperties, diff --git a/src/main/java/org/prebid/server/deals/targeting/TargetingDefinition.java b/src/main/java/org/prebid/server/deals/targeting/TargetingDefinition.java index fe4f79eac78..ec1cb8683af 100644 --- a/src/main/java/org/prebid/server/deals/targeting/TargetingDefinition.java +++ b/src/main/java/org/prebid/server/deals/targeting/TargetingDefinition.java @@ -1,12 +1,10 @@ package org.prebid.server.deals.targeting; -import lombok.AllArgsConstructor; import lombok.Value; import org.prebid.server.deals.targeting.interpret.Expression; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class TargetingDefinition { - private final Expression rootExpression; + Expression rootExpression; } diff --git a/src/main/java/org/prebid/server/deals/targeting/interpret/Matches.java b/src/main/java/org/prebid/server/deals/targeting/interpret/Matches.java index d16c3a61f1a..e2289ff0cb8 100644 --- a/src/main/java/org/prebid/server/deals/targeting/interpret/Matches.java +++ b/src/main/java/org/prebid/server/deals/targeting/interpret/Matches.java @@ -14,9 +14,9 @@ public class Matches implements TerminalExpression { private final TargetingCategory category; - private BiFunction method; + private final BiFunction method; - private String value; + private final String value; public Matches(TargetingCategory category, String value) { this.category = Objects.requireNonNull(category); diff --git a/src/main/java/org/prebid/server/deals/targeting/interpret/Within.java b/src/main/java/org/prebid/server/deals/targeting/interpret/Within.java index 1e2bf337b50..08b4552327b 100644 --- a/src/main/java/org/prebid/server/deals/targeting/interpret/Within.java +++ b/src/main/java/org/prebid/server/deals/targeting/interpret/Within.java @@ -15,7 +15,7 @@ public class Within implements TerminalExpression { private final TargetingCategory category; - private GeoRegion value; + private final GeoRegion value; public Within(TargetingCategory category, GeoRegion value) { this.category = Objects.requireNonNull(category); diff --git a/src/main/java/org/prebid/server/deals/targeting/model/UserSegments.java b/src/main/java/org/prebid/server/deals/targeting/model/UserSegments.java deleted file mode 100644 index ed3976985d0..00000000000 --- a/src/main/java/org/prebid/server/deals/targeting/model/UserSegments.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.prebid.server.deals.targeting.model; - -import lombok.AllArgsConstructor; -import lombok.Value; - -import java.util.List; - -@Value -@AllArgsConstructor(staticName = "of") -public class UserSegments { - - String source; - - List ids; -} diff --git a/src/main/java/org/prebid/server/deals/targeting/syntax/BooleanOperator.java b/src/main/java/org/prebid/server/deals/targeting/syntax/BooleanOperator.java index 3200c4c02c9..4b004051a5e 100644 --- a/src/main/java/org/prebid/server/deals/targeting/syntax/BooleanOperator.java +++ b/src/main/java/org/prebid/server/deals/targeting/syntax/BooleanOperator.java @@ -14,10 +14,6 @@ public enum BooleanOperator { this.value = value; } - public String value() { - return value; - } - public static boolean isBooleanOperator(String candidate) { return Arrays.stream(BooleanOperator.values()).anyMatch(op -> op.value.equals(candidate)); } diff --git a/src/main/java/org/prebid/server/deals/targeting/syntax/TargetingCategory.java b/src/main/java/org/prebid/server/deals/targeting/syntax/TargetingCategory.java index fcc3409c9b8..670e1874b5e 100644 --- a/src/main/java/org/prebid/server/deals/targeting/syntax/TargetingCategory.java +++ b/src/main/java/org/prebid/server/deals/targeting/syntax/TargetingCategory.java @@ -113,7 +113,7 @@ public enum Type { dow("user.ext.time.userdow"), hour("user.ext.time.userhour"); - private String attribute; + private final String attribute; Type(String attribute) { this.attribute = attribute; diff --git a/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java b/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java index 45464fce4a6..ab4ebd7a5fb 100644 --- a/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java +++ b/src/main/java/org/prebid/server/geolocation/MaxMindGeoLocationService.java @@ -99,7 +99,7 @@ private static String resolveCountry(CityResponse cityResponse) { return StringUtils.lowerCase(isoCode); } - private static String resolveRegion(CityResponse cityResponse) throws IOException, GeoIp2Exception { + private static String resolveRegion(CityResponse cityResponse) { final List subdivisions = cityResponse != null ? cityResponse.getSubdivisions() : null; final Subdivision firstSubdivision = CollectionUtils.isEmpty(subdivisions) ? null : subdivisions.get(0); return firstSubdivision != null ? firstSubdivision.getIsoCode() : null; diff --git a/src/main/java/org/prebid/server/handler/LineItemStatusHandler.java b/src/main/java/org/prebid/server/handler/LineItemStatusHandler.java index 3a376b3d2a3..e0046b67b16 100644 --- a/src/main/java/org/prebid/server/handler/LineItemStatusHandler.java +++ b/src/main/java/org/prebid/server/handler/LineItemStatusHandler.java @@ -12,7 +12,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.util.HttpUtil; -import java.time.ZonedDateTime; import java.util.Objects; public class LineItemStatusHandler implements Handler { @@ -20,7 +19,6 @@ public class LineItemStatusHandler implements Handler { private static final Logger logger = LoggerFactory.getLogger(LineItemStatusHandler.class); private static final String ID_PARAM = "id"; - private static final String PG_SIM_TIMESTAMP = "pg-sim-timestamp"; private final DeliveryProgressService deliveryProgressService; private final JacksonMapper mapper; @@ -48,8 +46,7 @@ public void handle(RoutingContext routingContext) { } try { - final ZonedDateTime time = HttpUtil.getDateFromHeader(routingContext.request().headers(), PG_SIM_TIMESTAMP); - final LineItemStatusReport report = deliveryProgressService.getLineItemStatusReport(lineItemId, time); + final LineItemStatusReport report = deliveryProgressService.getLineItemStatusReport(lineItemId); HttpUtil.headers().forEach(entry -> routingContext.response().putHeader(entry.getKey(), entry.getValue())); HttpUtil.executeSafely(routingContext, endpoint, diff --git a/src/main/java/org/prebid/server/handler/LoggerControlKnobHandler.java b/src/main/java/org/prebid/server/handler/LoggerControlKnobHandler.java index 4e54ffb0502..8a781d84a2d 100644 --- a/src/main/java/org/prebid/server/handler/LoggerControlKnobHandler.java +++ b/src/main/java/org/prebid/server/handler/LoggerControlKnobHandler.java @@ -10,9 +10,6 @@ import org.prebid.server.util.HttpUtil; import java.time.Duration; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; import java.util.Objects; import java.util.Set; @@ -21,8 +18,7 @@ public class LoggerControlKnobHandler implements Handler { private static final String LEVEL_PARAMETER = "level"; private static final String DURATION_PARAMETER = "duration"; - private static final Set ALLOWED_LEVELS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( - "error", "warn", "info", "debug"))); + private static final Set ALLOWED_LEVELS = Set.of("error", "warn", "info", "debug"); private final long maxDurationMs; private final LoggerControlKnob loggerControlKnob; diff --git a/src/main/java/org/prebid/server/handler/TracerLogHandler.java b/src/main/java/org/prebid/server/handler/TracerLogHandler.java index a4cd450b84c..befcf22397d 100644 --- a/src/main/java/org/prebid/server/handler/TracerLogHandler.java +++ b/src/main/java/org/prebid/server/handler/TracerLogHandler.java @@ -18,7 +18,7 @@ public class TracerLogHandler implements Handler { private static final String LOG_LEVEL_PARAMETER = "level"; private static final String DURATION_IN_SECONDS = "duration"; - private CriteriaManager criteriaManager; + private final CriteriaManager criteriaManager; public TracerLogHandler(CriteriaManager criteriaManager) { this.criteriaManager = Objects.requireNonNull(criteriaManager); @@ -37,7 +37,7 @@ public void handle(RoutingContext routingContext) { return; } - final Integer duration; + final int duration; final String loggerLevel = parameters.get(LOG_LEVEL_PARAMETER); try { duration = parseDuration(parameters.get(DURATION_IN_SECONDS)); diff --git a/src/main/java/org/prebid/server/handler/VtrackHandler.java b/src/main/java/org/prebid/server/handler/VtrackHandler.java index 0892e0061ca..ec98d3c5479 100644 --- a/src/main/java/org/prebid/server/handler/VtrackHandler.java +++ b/src/main/java/org/prebid/server/handler/VtrackHandler.java @@ -172,7 +172,6 @@ private void handleAccountResult(AsyncResult asyncAccount, respondWithServerError(routingContext, "Error occurred while fetching account", asyncAccount.cause()); } else { // insert impression tracking if account allows events and bidder allows VAST modification - final Account account = asyncAccount.result(); final Boolean isEventEnabled = accountEventsEnabled(asyncAccount.result()); final Set allowedBidders = biddersAllowingVastUpdate(vtrackPuts); cacheService.cachePutObjects(vtrackPuts, isEventEnabled, allowedBidders, accountId, integration, timeout) diff --git a/src/main/java/org/prebid/server/handler/info/BidderDetailsHandler.java b/src/main/java/org/prebid/server/handler/info/BidderDetailsHandler.java index caa24790820..1441b01a73b 100644 --- a/src/main/java/org/prebid/server/handler/info/BidderDetailsHandler.java +++ b/src/main/java/org/prebid/server/handler/info/BidderDetailsHandler.java @@ -5,14 +5,12 @@ import io.netty.handler.codec.http.HttpHeaderValues; import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.core.Handler; -import io.vertx.core.logging.Logger; -import io.vertx.core.logging.LoggerFactory; import io.vertx.ext.web.RoutingContext; import lombok.Value; import org.prebid.server.bidder.BidderCatalog; +import org.prebid.server.bidder.BidderInfo; import org.prebid.server.json.JacksonMapper; import org.prebid.server.model.Endpoint; -import org.prebid.server.bidder.BidderInfo; import org.prebid.server.util.HttpUtil; import java.util.Collections; @@ -25,8 +23,6 @@ public class BidderDetailsHandler implements Handler { - private static final Logger logger = LoggerFactory.getLogger(BidderDetailsHandler.class); - private static final String BIDDER_NAME_PARAM = "bidderName"; private static final String ALL_PARAM_VALUE = "all"; diff --git a/src/main/java/org/prebid/server/hooks/execution/model/Stage.java b/src/main/java/org/prebid/server/hooks/execution/model/Stage.java index 5e2f6301786..f91a9ed70b2 100644 --- a/src/main/java/org/prebid/server/hooks/execution/model/Stage.java +++ b/src/main/java/org/prebid/server/hooks/execution/model/Stage.java @@ -26,6 +26,7 @@ public enum Stage { this.value = value; } + @SuppressWarnings("unused") @JsonCreator public static Stage fromString(String value) { return Arrays.stream(values()) diff --git a/src/main/java/org/prebid/server/json/DecodeException.java b/src/main/java/org/prebid/server/json/DecodeException.java index 3940ad689ee..78710e16783 100644 --- a/src/main/java/org/prebid/server/json/DecodeException.java +++ b/src/main/java/org/prebid/server/json/DecodeException.java @@ -2,9 +2,6 @@ public class DecodeException extends RuntimeException { - public DecodeException() { - } - public DecodeException(String message) { super(message); } diff --git a/src/main/java/org/prebid/server/log/HttpInteractionLogger.java b/src/main/java/org/prebid/server/log/HttpInteractionLogger.java index 77da9396f54..f42e8de4548 100644 --- a/src/main/java/org/prebid/server/log/HttpInteractionLogger.java +++ b/src/main/java/org/prebid/server/log/HttpInteractionLogger.java @@ -135,7 +135,7 @@ private boolean interactionSatisfiesSpec(AuctionContext auctionContext, return (endpoint == null || endpoint == requestEndpoint) && (account == null || account.equals(requestAccountId)) - && (bidder != null && bidder.equals(requestBidder)); + && bidder != null && bidder.equals(requestBidder); } private HttpLogSpec.Endpoint parseHttpLogEndpoint(MetricName requestTypeMetric) { diff --git a/src/main/java/org/prebid/server/metric/model/MetricsContext.java b/src/main/java/org/prebid/server/metric/model/MetricsContext.java deleted file mode 100644 index 2492cd5ef01..00000000000 --- a/src/main/java/org/prebid/server/metric/model/MetricsContext.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.prebid.server.metric.model; - -import lombok.AllArgsConstructor; -import lombok.Value; -import org.prebid.server.metric.MetricName; - -@AllArgsConstructor(staticName = "of") -@Value -public class MetricsContext { - - MetricName requestType; -} diff --git a/src/main/java/org/prebid/server/model/Endpoint.java b/src/main/java/org/prebid/server/model/Endpoint.java index 498b47dc432..71131b0b85b 100644 --- a/src/main/java/org/prebid/server/model/Endpoint.java +++ b/src/main/java/org/prebid/server/model/Endpoint.java @@ -37,6 +37,7 @@ public String value() { return value; } + @SuppressWarnings("unused") @JsonCreator public static Endpoint fromString(String value) { return Arrays.stream(values()) diff --git a/src/main/java/org/prebid/server/optout/GoogleRecaptchaVerifier.java b/src/main/java/org/prebid/server/optout/GoogleRecaptchaVerifier.java index ab0633dcad4..67cf7e4e7f0 100644 --- a/src/main/java/org/prebid/server/optout/GoogleRecaptchaVerifier.java +++ b/src/main/java/org/prebid/server/optout/GoogleRecaptchaVerifier.java @@ -13,8 +13,8 @@ import org.prebid.server.vertx.http.HttpClient; import org.prebid.server.vertx.http.model.HttpClientResponse; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Objects; @@ -59,11 +59,7 @@ private static String encodedBody(String secret, String recaptcha) { } private static String encodeValue(String value) { - try { - return URLEncoder.encode(value, "utf-8"); - } catch (UnsupportedEncodingException e) { - throw new PreBidException(String.format("Cannot encode request form value: %s", value), e); - } + return URLEncoder.encode(value, StandardCharsets.UTF_8); } /** diff --git a/src/main/java/org/prebid/server/privacy/ccpa/Ccpa.java b/src/main/java/org/prebid/server/privacy/ccpa/Ccpa.java index b0d01545ddf..cf6a812a193 100644 --- a/src/main/java/org/prebid/server/privacy/ccpa/Ccpa.java +++ b/src/main/java/org/prebid/server/privacy/ccpa/Ccpa.java @@ -1,12 +1,10 @@ package org.prebid.server.privacy.ccpa; -import lombok.AllArgsConstructor; import lombok.Value; import org.apache.commons.lang3.StringUtils; import org.prebid.server.exception.PreBidException; -@AllArgsConstructor(staticName = "of") -@Value +@Value(staticConstructor = "of") public class Ccpa { public static final Ccpa EMPTY = Ccpa.of(null); @@ -21,7 +19,7 @@ public class Ccpa { private static final String NOT_ENFORCED_SIGNAL = "N"; private static final String NOT_DEFINED_SIGNAL = "-"; - private String usPrivacy; + String usPrivacy; public boolean isNotEmpty() { return StringUtils.isNotEmpty(usPrivacy); diff --git a/src/main/java/org/prebid/server/privacy/gdpr/model/PublisherRestrictionEmpty.java b/src/main/java/org/prebid/server/privacy/gdpr/model/PublisherRestrictionEmpty.java deleted file mode 100644 index 03de2fdd19f..00000000000 --- a/src/main/java/org/prebid/server/privacy/gdpr/model/PublisherRestrictionEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.prebid.server.privacy.gdpr.model; - -import com.iabtcf.utils.BitSetIntIterable; -import com.iabtcf.v2.PublisherRestriction; -import com.iabtcf.v2.RestrictionType; - -public class PublisherRestrictionEmpty extends PublisherRestriction { - - public PublisherRestrictionEmpty(int purposeId) { - super(purposeId, RestrictionType.UNDEFINED, BitSetIntIterable.EMPTY); - } -} 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 4b7b111a1bc..806adc7858a 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 @@ -91,7 +91,7 @@ private Collection allowedByTypeStrategy(TCString vendorConsen } // Full by default - if (purposeType == null || Objects.equals(purposeType, EnforcePurpose.full)) { + if (purposeType == null || purposeType.equals(EnforcePurpose.full)) { return allowedByFullTypeStrategy(vendorConsent, isEnforceVendors, vendorForPurpose, excludedVendors); } @@ -107,7 +107,7 @@ protected Collection excludedVendors(Collection - bidderNameExceptions.contains(vendorPermission.getVendorPermission().getBidderName())); + bidderNameExceptions.contains(vendorPermission.getVendorPermission().getBidderName())); } protected Collection allowedByBasicTypeStrategy( 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 764066e1379..f9c4c3cae52 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 @@ -24,7 +24,6 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.Collections; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -61,8 +60,6 @@ public abstract class VendorListService { private final Metrics metrics; protected final JacksonMapper mapper; - protected final Set knownVendorIds; - /** * This is memory/performance optimized model slice: * map of vendor list version -> map of vendor ID -> Vendors @@ -97,8 +94,6 @@ public VendorListService(String cacheDir, this.metrics = Objects.requireNonNull(metrics); this.mapper = Objects.requireNonNull(mapper); - knownVendorIds = knownVendorIds(gdprHostVendorId, bidderCatalog); - createAndCheckWritePermissionsFor(fileSystem, cacheDir); cache = Objects.requireNonNull(createCache(fileSystem, cacheDir)); @@ -168,17 +163,6 @@ public Future> forVersion(int version) { */ protected abstract int getTcfVersion(); - private static Set knownVendorIds(Integer gdprHostVendorId, BidderCatalog bidderCatalog) { - final Set knownVendorIds = bidderCatalog.knownVendorIds(); - - // add host vendor ID (used in /setuid and /cookie_sync endpoint handlers) - if (gdprHostVendorId != null) { - knownVendorIds.add(gdprHostVendorId); - } - - return Collections.unmodifiableSet(knownVendorIds); - } - /** * Creates if doesn't exists and checks write permissions for the given directory. */ diff --git a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Feature.java b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Feature.java index a6829a19511..ba8f1d71f44 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Feature.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/Feature.java @@ -17,6 +17,7 @@ public enum Feature { this.code = code; } + @SuppressWarnings("unused") @JsonCreator public static Feature valueOf(int code) { return Arrays.stream(values()) diff --git a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/PurposeCode.java b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/PurposeCode.java index c6d08462045..bce1c3b5307 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/PurposeCode.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/PurposeCode.java @@ -30,6 +30,7 @@ public int code() { return code; } + @SuppressWarnings("unused") @JsonCreator public static PurposeCode valueOf(int code) { return Arrays.stream(values()) diff --git a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialFeature.java b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialFeature.java index 8371ebc383b..237cf5547e1 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialFeature.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialFeature.java @@ -16,6 +16,7 @@ public enum SpecialFeature { this.code = code; } + @SuppressWarnings("unused") @JsonCreator public static SpecialFeature valueOf(int code) { return Arrays.stream(values()) diff --git a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialPurpose.java b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialPurpose.java index 66d77b53764..f6d518cd3b6 100644 --- a/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialPurpose.java +++ b/src/main/java/org/prebid/server/privacy/gdpr/vendorlist/proto/SpecialPurpose.java @@ -16,6 +16,7 @@ public enum SpecialPurpose { this.code = code; } + @SuppressWarnings("unused") @JsonCreator public static SpecialPurpose valueOf(int code) { return Arrays.stream(values()) diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/FlexibleExtension.java b/src/main/java/org/prebid/server/proto/openrtb/ext/FlexibleExtension.java index 7da43c05d2a..4a33f49772f 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/FlexibleExtension.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/FlexibleExtension.java @@ -16,7 +16,7 @@ public abstract class FlexibleExtension { public static final TypeReference> PROPERTIES_TYPE_REF = - new TypeReference>() { + new TypeReference<>() { }; private final Map properties = new HashMap<>(); diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/nobid/ExtImpNobid.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/nobid/ExtImpNobid.java deleted file mode 100644 index e2a25fc93b3..00000000000 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/nobid/ExtImpNobid.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.prebid.server.proto.openrtb.ext.request.nobid; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class ExtImpNobid { - - @JsonProperty("siteId") - Integer siteId; - - @JsonProperty("placementId") - Integer placementId; -} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/RubiconImpExtContext.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/RubiconImpExtContext.java deleted file mode 100644 index 61606ba6efd..00000000000 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/rubicon/RubiconImpExtContext.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.prebid.server.proto.openrtb.ext.request.rubicon; - -import com.fasterxml.jackson.databind.node.ObjectNode; -import lombok.AllArgsConstructor; -import lombok.Value; - -@AllArgsConstructor(staticName = "of") -@Value -public class RubiconImpExtContext { - - ObjectNode data; -} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseSyncData.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseSyncData.java index af3d0cfbe02..cf3c35b6de8 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseSyncData.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtResponseSyncData.java @@ -8,7 +8,7 @@ * Defines the contract for bidresponse.ext.usersync.{bidder} */ @Value -final class ExtResponseSyncData { +class ExtResponseSyncData { CookieStatus status; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtUserSync.java b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtUserSync.java index 9c17733a588..015864d7987 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtUserSync.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/response/ExtUserSync.java @@ -6,7 +6,7 @@ * Defines the contract for bidresponse.ext.usersync.{bidder}.syncs[i] */ @Value -final class ExtUserSync { +class ExtUserSync { String url; diff --git a/src/main/java/org/prebid/server/settings/CompositeApplicationSettings.java b/src/main/java/org/prebid/server/settings/CompositeApplicationSettings.java index 952dbdb5307..f65f2186ae0 100644 --- a/src/main/java/org/prebid/server/settings/CompositeApplicationSettings.java +++ b/src/main/java/org/prebid/server/settings/CompositeApplicationSettings.java @@ -22,7 +22,7 @@ */ public class CompositeApplicationSettings implements ApplicationSettings { - private Proxy proxy; + private final Proxy proxy; public CompositeApplicationSettings(List delegates) { if (Objects.requireNonNull(delegates).isEmpty()) { @@ -96,8 +96,8 @@ public Future getStoredResponses(Set responseI */ private static class Proxy implements ApplicationSettings { - private ApplicationSettings applicationSettings; - private Proxy next; + private final ApplicationSettings applicationSettings; + private final Proxy next; private Proxy(ApplicationSettings applicationSettings, Proxy next) { this.applicationSettings = applicationSettings; diff --git a/src/main/java/org/prebid/server/settings/FileApplicationSettings.java b/src/main/java/org/prebid/server/settings/FileApplicationSettings.java index 1c371ca090f..cb8e560b133 100644 --- a/src/main/java/org/prebid/server/settings/FileApplicationSettings.java +++ b/src/main/java/org/prebid/server/settings/FileApplicationSettings.java @@ -41,7 +41,7 @@ public class FileApplicationSettings implements ApplicationSettings { private static final TypeReference> CATEGORY_FORMAT_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; private static final String JSON_SUFFIX = ".json"; diff --git a/src/main/java/org/prebid/server/settings/HttpApplicationSettings.java b/src/main/java/org/prebid/server/settings/HttpApplicationSettings.java index e4364f286cf..b5c6d42f7fd 100644 --- a/src/main/java/org/prebid/server/settings/HttpApplicationSettings.java +++ b/src/main/java/org/prebid/server/settings/HttpApplicationSettings.java @@ -67,14 +67,14 @@ public class HttpApplicationSettings implements ApplicationSettings { private static final Logger logger = LoggerFactory.getLogger(HttpApplicationSettings.class); private static final TypeReference> CATEGORY_RESPONSE_REFERENCE = - new TypeReference>() { + new TypeReference<>() { }; - private String endpoint; - private String ampEndpoint; - private String videoEndpoint; - private String categoryEndpoint; - private HttpClient httpClient; + private final String endpoint; + private final String ampEndpoint; + private final String videoEndpoint; + private final String categoryEndpoint; + private final HttpClient httpClient; private final JacksonMapper mapper; public HttpApplicationSettings(HttpClient httpClient, JacksonMapper mapper, String endpoint, String ampEndpoint, diff --git a/src/main/java/org/prebid/server/settings/SettingsCache.java b/src/main/java/org/prebid/server/settings/SettingsCache.java index 0bb11a4b9b3..46c28ee8757 100644 --- a/src/main/java/org/prebid/server/settings/SettingsCache.java +++ b/src/main/java/org/prebid/server/settings/SettingsCache.java @@ -76,7 +76,7 @@ public void save(Map requests, Map imps) { @Override public void invalidate(List requests, List imps) { - requestCache.keySet().removeAll(requests); - impCache.keySet().removeAll(imps); + requests.forEach(requestCache.keySet()::remove); + imps.forEach(impCache.keySet()::remove); } } diff --git a/src/main/java/org/prebid/server/settings/model/AccountAnalyticsConfig.java b/src/main/java/org/prebid/server/settings/model/AccountAnalyticsConfig.java index 2b431e1fe71..522f9b0aa0e 100644 --- a/src/main/java/org/prebid/server/settings/model/AccountAnalyticsConfig.java +++ b/src/main/java/org/prebid/server/settings/model/AccountAnalyticsConfig.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Value; -import java.util.Collections; -import java.util.HashMap; import java.util.Map; @Value(staticConstructor = "of") @@ -14,12 +12,10 @@ public class AccountAnalyticsConfig { private static final Map FALLBACK_AUCTION_EVENTS; static { - final Map events = new HashMap<>(); - events.put("web", false); - events.put("amp", true); - events.put("app", true); - - FALLBACK_AUCTION_EVENTS = Collections.unmodifiableMap(events); + FALLBACK_AUCTION_EVENTS = Map.of( + "web", false, + "amp", true, + "app", true); } @JsonProperty("auction-events") diff --git a/src/main/java/org/prebid/server/settings/model/CategoryParams.java b/src/main/java/org/prebid/server/settings/model/CategoryParams.java deleted file mode 100644 index fc62a2b4038..00000000000 --- a/src/main/java/org/prebid/server/settings/model/CategoryParams.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.prebid.server.settings.model; - -import lombok.AllArgsConstructor; -import lombok.Value; - -@Value -@AllArgsConstructor(staticName = "of") -public class CategoryParams { - - String primaryAdServer; - String publisher; -} diff --git a/src/main/java/org/prebid/server/settings/model/EnforcePurpose.java b/src/main/java/org/prebid/server/settings/model/EnforcePurpose.java index d7d57c171c2..7e011f38be8 100644 --- a/src/main/java/org/prebid/server/settings/model/EnforcePurpose.java +++ b/src/main/java/org/prebid/server/settings/model/EnforcePurpose.java @@ -6,6 +6,7 @@ public enum EnforcePurpose { no, basic, full; + @SuppressWarnings("unused") @JsonCreator public static EnforcePurpose forValue(String value) { return EnforcePurpose.valueOf(value); diff --git a/src/main/java/org/prebid/server/settings/proto/response/HttpRefreshResponse.java b/src/main/java/org/prebid/server/settings/proto/response/HttpRefreshResponse.java index 28f2ad152cc..28f51621766 100644 --- a/src/main/java/org/prebid/server/settings/proto/response/HttpRefreshResponse.java +++ b/src/main/java/org/prebid/server/settings/proto/response/HttpRefreshResponse.java @@ -1,16 +1,14 @@ 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 HttpRefreshResponse { - private Map requests; + Map requests; - private Map imps; + Map imps; } diff --git a/src/main/java/org/prebid/server/spring/config/GeoLocationConfiguration.java b/src/main/java/org/prebid/server/spring/config/GeoLocationConfiguration.java index 7edd378c565..f67dd4d9a9a 100644 --- a/src/main/java/org/prebid/server/spring/config/GeoLocationConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/GeoLocationConfiguration.java @@ -2,6 +2,7 @@ import io.vertx.core.Vertx; import io.vertx.core.http.HttpClientOptions; +import lombok.experimental.UtilityClass; import org.prebid.server.execution.RemoteFileSyncer; import org.prebid.server.geolocation.CircuitBreakerSecuredGeoLocationService; import org.prebid.server.geolocation.CountryCodeMapper; @@ -27,6 +28,7 @@ import java.nio.charset.StandardCharsets; import java.time.Clock; +@UtilityClass public class GeoLocationConfiguration { @Configuration diff --git a/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java b/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java index c9c35a44739..f280ec3bca1 100644 --- a/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.UtilityClass; import org.apache.commons.lang3.ObjectUtils; import org.prebid.server.execution.TimeoutFactory; import org.prebid.server.json.JacksonMapper; @@ -49,6 +50,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +@UtilityClass public class SettingsConfiguration { @Configuration @@ -323,8 +325,8 @@ CompositeApplicationSettings compositeApplicationSettings( final List applicationSettingsList = Stream.of(fileApplicationSettings, - jdbcApplicationSettings, - httpApplicationSettings) + jdbcApplicationSettings, + httpApplicationSettings) .filter(Objects::nonNull) .collect(Collectors.toList()); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java b/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java index 0a060ff26c9..0edbac8bc60 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java @@ -28,7 +28,7 @@ private static Usersyncer createAndValidate(UsersyncConfigurationProperties user throw new IllegalArgumentException(String.format( "Invalid usersync configuration: primary method is missing while secondary is present. " + "Configuration: %s", - usersync.toString())); + usersync)); } return usersyncer; diff --git a/src/main/java/org/prebid/server/util/HttpUtil.java b/src/main/java/org/prebid/server/util/HttpUtil.java index 4f9a8f5081f..b5742956e42 100644 --- a/src/main/java/org/prebid/server/util/HttpUtil.java +++ b/src/main/java/org/prebid/server/util/HttpUtil.java @@ -16,7 +16,6 @@ import org.prebid.server.model.Endpoint; import org.prebid.server.model.HttpRequestContext; -import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLDecoder; @@ -26,7 +25,6 @@ import java.util.Arrays; import java.util.Base64; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -70,7 +68,7 @@ public final class HttpUtil { public static final CharSequence CONTENT_ENCODING_HEADER = HttpHeaders.createOptimized("Content-Encoding"); public static final CharSequence X_OPENRTB_VERSION_HEADER = HttpHeaders.createOptimized("x-openrtb-version"); public static final CharSequence X_PREBID_HEADER = HttpHeaders.createOptimized("x-prebid"); - private static final Set SENSITIVE_HEADERS = new HashSet<>(Arrays.asList(AUTHORIZATION_HEADER.toString())); + private static final Set SENSITIVE_HEADERS = Set.of(AUTHORIZATION_HEADER.toString()); public static final CharSequence PG_TRX_ID = HttpHeaders.createOptimized("pg-trx-id"); private static final String BASIC_AUTH_PATTERN = "Basic %s"; @@ -95,11 +93,7 @@ public static String validateUrl(String url) { * The result can be safety used as the query string. */ public static String encodeUrl(String value) { - try { - return URLEncoder.encode(value, "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new IllegalArgumentException(String.format("Cannot encode url: %s", value)); - } + return URLEncoder.encode(value, StandardCharsets.UTF_8); } /** @@ -109,11 +103,7 @@ public static String decodeUrl(String value) { if (StringUtils.isBlank(value)) { return null; } - try { - return URLDecoder.decode(value, "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new IllegalArgumentException(String.format("Cannot decode url: %s", value)); - } + return URLDecoder.decode(value, StandardCharsets.UTF_8); } /** diff --git a/src/main/java/org/prebid/server/vast/VastModifier.java b/src/main/java/org/prebid/server/vast/VastModifier.java index beb7e2358e8..9da86752909 100644 --- a/src/main/java/org/prebid/server/vast/VastModifier.java +++ b/src/main/java/org/prebid/server/vast/VastModifier.java @@ -125,11 +125,8 @@ private static String insertAfterExistingImpressionTag(String vastXml, String va final String impressionTag = ""; final int replacementStart = vastXml.lastIndexOf(IMPRESSION_CLOSE_TAG); - return new StringBuilder().append(vastXml, 0, replacementStart) - .append(IMPRESSION_CLOSE_TAG) - .append(impressionTag) - .append(vastXml.substring(replacementStart + IMPRESSION_CLOSE_TAG.length())) - .toString(); + return vastXml.substring(0, replacementStart) + IMPRESSION_CLOSE_TAG + impressionTag + + vastXml.substring(replacementStart + IMPRESSION_CLOSE_TAG.length()); } private static String insertBeforeElementCloseTag(String vastXml, String vastUrlTracking, String elementCloseTag) { diff --git a/src/main/java/org/prebid/server/vertx/LocalMessageCodec.java b/src/main/java/org/prebid/server/vertx/LocalMessageCodec.java index 0714cffe474..302dcb11eff 100644 --- a/src/main/java/org/prebid/server/vertx/LocalMessageCodec.java +++ b/src/main/java/org/prebid/server/vertx/LocalMessageCodec.java @@ -11,7 +11,7 @@ public class LocalMessageCodec implements MessageCodec { private static final String CODEC_NAME = "LocalMessageCodec"; - public static MessageCodec create() { + public static MessageCodec create() { return new LocalMessageCodec(); } diff --git a/src/test/java/org/prebid/server/assertion/FutureAssertion.java b/src/test/java/org/prebid/server/assertion/FutureAssertion.java index f8eb8f26fa2..22c4c9b93fb 100644 --- a/src/test/java/org/prebid/server/assertion/FutureAssertion.java +++ b/src/test/java/org/prebid/server/assertion/FutureAssertion.java @@ -9,7 +9,7 @@ public class FutureAssertion extends AbstractAssert, Future> { - private ComparisonStrategy futureValueComparisonStrategy; + private final ComparisonStrategy futureValueComparisonStrategy; private FutureAssertion(Future actual) { super(actual, FutureAssertion.class); @@ -28,12 +28,12 @@ public FutureAssertion isSucceeded() { return myself; } - public ThrowableAssert isFailed() { + public ThrowableAssert isFailed() { isNotNull(); if (!actual.failed()) { failWithMessage("Expected future to be failed"); } - return new ThrowableAssert(actual.cause()); + return new ThrowableAssert<>(actual.cause()); } public FutureAssertion succeededWith(VALUE expectedValue) { diff --git a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java index a2101f4d787..a9d6d824ca6 100644 --- a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java +++ b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java @@ -185,7 +185,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.prebid.server.assertion.FutureAssertion.assertThat; import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; import static org.prebid.server.proto.openrtb.ext.response.BidType.video; @@ -1306,7 +1305,6 @@ public void shouldTolerateNullRequestExtPrebidTargeting() { .allSatisfy(map -> assertThat(map).isNull()); } - @SuppressWarnings("unchecked") @Test public void shouldTolerateResponseBidValidationErrors() { // given @@ -1345,7 +1343,6 @@ public void shouldTolerateResponseBidValidationErrors() { BidderError.generic("bid validation error")); } - @SuppressWarnings("unchecked") @Test public void shouldTolerateResponseBidValidationWarnings() { // given @@ -2651,7 +2648,6 @@ public void shouldDropBidsWithInvalidPriceAndAddDebugWarnings() { verify(metrics, times(3)).updateAdapterRequestErrorMetric("bidder", MetricName.unknown_error); } - @SuppressWarnings("unchecked") @Test public void shouldDropBidIfPrebidExceptionWasThrownDuringCurrencyConversion() { // given @@ -2679,7 +2675,6 @@ public void shouldDropBidIfPrebidExceptionWasThrownDuringCurrencyConversion() { assertThat(firstSeatBid.getErrors()).containsOnly(expectedError); } - @SuppressWarnings("unchecked") @Test public void shouldUpdateBidPriceWithCurrencyConversionAndPriceAdjustmentFactor() { // given 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 6da5561f4c1..be8cca57e68 100644 --- a/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java +++ b/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java @@ -288,7 +288,7 @@ public void shouldReturnFailedFutureIfEntrypointHookRejectedRequest() { } @Test - public void shouldEnrichAuctionContextWithDebugContext() throws JsonProcessingException { + public void shouldEnrichAuctionContextWithDebugContext() { // given givenBidRequest(); @@ -1524,7 +1524,6 @@ public void shouldReturnBidRequestWithoutRegsExtUsPrivacyWhenConsentStringIsVali assertThat(result.getRegs()).isNull(); } - @SuppressWarnings("unchecked") @Test public void shouldReturnBidRequestWithCreatedExtPrebidAmpData() { // given diff --git a/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java b/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java index 3ea49c49ec3..769526e47ad 100644 --- a/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java +++ b/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java @@ -18,7 +18,7 @@ public class BidderCatalogTest { public final MockitoRule mockitoRule = MockitoJUnit.rule(); @Mock - private Bidder bidder; + private Bidder bidder; private BidderCatalog bidderCatalog; diff --git a/src/test/java/org/prebid/server/bidder/HttpBidderRequesterTest.java b/src/test/java/org/prebid/server/bidder/HttpBidderRequesterTest.java index 3f255188b88..839e30f7a4a 100644 --- a/src/test/java/org/prebid/server/bidder/HttpBidderRequesterTest.java +++ b/src/test/java/org/prebid/server/bidder/HttpBidderRequesterTest.java @@ -13,12 +13,10 @@ import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpServerRequest; import io.vertx.ext.web.RoutingContext; -import lombok.AllArgsConstructor; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.ArgumentMatcher; import org.mockito.BDDMockito; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; @@ -852,16 +850,4 @@ private void givenHttpClientReturnsResponses(HttpClientResponse... httpClientRes stubbing = stubbing.willReturn(Future.succeededFuture(httpClientResponse)); } } - - @AllArgsConstructor - public static class MultiMapMatcher implements ArgumentMatcher { - - private final MultiMap left; - - @Override - public boolean matches(MultiMap right) { - return left.size() == right.size() && left.entries().stream() - .allMatch(entry -> right.contains(entry.getKey(), entry.getValue(), true)); - } - } } diff --git a/src/test/java/org/prebid/server/bidder/adhese/AdheseBidderTest.java b/src/test/java/org/prebid/server/bidder/adhese/AdheseBidderTest.java index c601726f51b..58e9e7fc0bc 100644 --- a/src/test/java/org/prebid/server/bidder/adhese/AdheseBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/adhese/AdheseBidderTest.java @@ -34,7 +34,6 @@ import org.prebid.server.proto.openrtb.ext.response.BidType; import java.math.BigDecimal; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -173,7 +172,7 @@ public void makeHttpRequestsShouldModifyIncomingRequestWithIfaParameter() throws .slotname("_adhese_prebid_demo_-leaderboard") .build())) .parameters(new TreeMap<>(Collections.singletonMap( - "xz", Arrays.asList("ifaValue")))) + "xz", singletonList("ifaValue")))) .build())); } @@ -206,7 +205,7 @@ public void makeHttpRequestsShouldModifyIncomingRequestWithRefererParameter() th .slotname("_adhese_prebid_demo_-leaderboard") .build())) .parameters(new TreeMap<>(Collections.singletonMap( - "xf", Arrays.asList("pageValue")))) + "xf", singletonList("pageValue")))) .build())); } @@ -243,7 +242,7 @@ public void makeHttpRequestsShouldNotModifyIncomingRequestIfTargetsNotPresent() .slotname("_adhese_prebid_demo_-leaderboard") .build())) .parameters(new TreeMap<>(Collections.singletonMap( - "xt", Arrays.asList("dummy")))) + "xt", singletonList("dummy")))) .build())); } diff --git a/src/test/java/org/prebid/server/bidder/admixer/AdmixerBidderTest.java b/src/test/java/org/prebid/server/bidder/admixer/AdmixerBidderTest.java index 4c649318b0f..8d63117cdbf 100644 --- a/src/test/java/org/prebid/server/bidder/admixer/AdmixerBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/admixer/AdmixerBidderTest.java @@ -282,7 +282,7 @@ public void makeHttpRequestsShouldReturnBidFloorAsNullIfGivenBidFloorNullCustomF assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) - .containsExactly(givenImpWithParsedTagID(builder -> builder.bidfloor(null))); + .containsExactly(givenImpWithParsedTagID()); } @Test @@ -300,7 +300,7 @@ public void makeHttpRequestsShouldReturnBidFloorAsNullIfGivenBidFloorZeroCustomF assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) - .containsExactly(givenImpWithParsedTagID(builder -> builder.bidfloor(null))); + .containsExactly(givenImpWithParsedTagID()); } @Test @@ -322,10 +322,7 @@ public void makeHttpRequestsShouldReturnBidFloorAsNullIfGivenBidFloorZeroCustomF assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) - .containsExactly(givenImpWithParsedTagID(builder -> builder - .bidfloor(null) - .ext(mapper.valueToTree(ExtImpAdmixer.of(null, null, - givenCustomParams("foo1", singletonList("bar1"))))))); + .containsExactly(givenImpWithParsedTagID()); } @Test @@ -347,9 +344,7 @@ public void makeHttpRequestsShouldReturnBidFloorAsNullIfGivenBidFloorNullCustomF assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) - .containsExactly(givenImpWithParsedTagID(builder -> builder.bidfloor(null) - .ext(mapper.valueToTree(ExtImpAdmixer.of(null, null, - givenCustomParams("foo1", singletonList("bar1"))))))); + .containsExactly(givenImpWithParsedTagID()); } private static BidResponse givenBidResponse(Function bidCustomizer) { @@ -381,7 +376,7 @@ private static Imp givenImp(UnaryOperator impCustomizer) { } //method where zoneId cut from ext and passed to tagId field - private static Imp givenImpWithParsedTagID(UnaryOperator impCustomizer) { + private static Imp givenImpWithParsedTagID() { return givenImp(builder -> builder .tagid("veryVeryVerySuperLongZoneIdValue") .ext(mapper.valueToTree(ExtImpAdmixer.of(null, null, diff --git a/src/test/java/org/prebid/server/bidder/beachfront/BeachfrontBidderTest.java b/src/test/java/org/prebid/server/bidder/beachfront/BeachfrontBidderTest.java index b0bcc5b6fe3..b9898ddcf2f 100644 --- a/src/test/java/org/prebid/server/bidder/beachfront/BeachfrontBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/beachfront/BeachfrontBidderTest.java @@ -534,8 +534,6 @@ public void makeBidsShouldReturnExpectedBannerBid() throws JsonProcessingExcepti @Test public void makeBidsShouldReturnEmptyResultWhenResponseHasEmptySeatBids() throws JsonProcessingException { // given - final byte[] byteArray = mapper.writeValueAsBytes(BeachfrontVideoRequest.builder().build()); - final BeachfrontVideoRequest videoRequest = jacksonMapper.decodeValue(byteArray, BeachfrontVideoRequest.class); final HttpCall httpCall = givenHttpCall( mapper.writeValueAsBytes(BeachfrontVideoRequest.builder().build()), mapper.writeValueAsString(BidResponse.builder().id("some_id").build())); diff --git a/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java b/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java index eda5e2ab484..ed9cb4ef558 100644 --- a/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java @@ -624,7 +624,7 @@ public void makeBidsShouldUpdateBidWithUUIDIfGenerateBidIdIsTrue() throws JsonPr public void makeHttpRequestsShouldSetImpBidFloorFromImpExtIfPresentAndImpBidFloorIsInvalid() { // given final BidRequest bidRequest = givenBidRequest( - impBuilder -> impBuilder.bidfloor(new BigDecimal(-1.00)), + impBuilder -> impBuilder.bidfloor(BigDecimal.valueOf(-1.00)), extBuilder -> extBuilder.bidfloor(BigDecimal.ONE)); // when @@ -643,8 +643,8 @@ public void makeHttpRequestsShouldSetImpBidFloorFromImpExtIfPresentAndImpBidFloo public void makeHttpRequestsShouldNotSetImpBidFloorFromImpExt() { // given final BidRequest bidRequest = givenBidRequest( - impBuilder -> impBuilder.bidfloor(new BigDecimal(-1.00)), - extBuilder -> extBuilder.bidfloor(new BigDecimal(-2.00))); + impBuilder -> impBuilder.bidfloor(BigDecimal.valueOf(-1.00)), + extBuilder -> extBuilder.bidfloor(BigDecimal.valueOf(-2.00))); // when final Result>> result = conversantBidder.makeHttpRequests(bidRequest); @@ -655,7 +655,7 @@ public void makeHttpRequestsShouldNotSetImpBidFloorFromImpExt() { .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getBidfloor) - .containsExactly(new BigDecimal(-1.00)); + .containsExactly(BigDecimal.valueOf(-1.00)); } private static BidRequest givenBidRequest( diff --git a/src/test/java/org/prebid/server/bidder/facebook/FacebookBidderTest.java b/src/test/java/org/prebid/server/bidder/facebook/FacebookBidderTest.java index b5729da1740..fd429b94549 100644 --- a/src/test/java/org/prebid/server/bidder/facebook/FacebookBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/facebook/FacebookBidderTest.java @@ -409,8 +409,7 @@ public void makeHttpRequestsShouldModifyImpVideoAsExpected() { } @Test - public void makeHttpRequestsShouldModifyImpNativeByAddingWidthAndHeightAndRemovingRequestAndVerFields() - throws JsonProcessingException { + public void makeHttpRequestsShouldModifyImpNativeByAddingWidthAndHeightAndRemovingRequestAndVerFields() { // given final BidRequest bidRequest = givenBidRequest( impBuilder -> impBuilder diff --git a/src/test/java/org/prebid/server/bidder/invibes/InvibesBidderTest.java b/src/test/java/org/prebid/server/bidder/invibes/InvibesBidderTest.java index b85ca9d7c61..225a867e7c3 100644 --- a/src/test/java/org/prebid/server/bidder/invibes/InvibesBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/invibes/InvibesBidderTest.java @@ -141,7 +141,7 @@ public void makeHttpRequestsShouldReturnErrorWhenSiteIsNotPresent() { } @Test - public void shouldCreateRequestWithDataFromEveryImpression() throws JsonProcessingException { + public void shouldCreateRequestWithDataFromEveryImpression() { // given final List imps = Arrays.asList(givenImp( impBuilder -> impBuilder diff --git a/src/test/java/org/prebid/server/bidder/iqzone/IqzoneBidderTest.java b/src/test/java/org/prebid/server/bidder/iqzone/IqzoneBidderTest.java index 00dff444d1c..e16336093d9 100644 --- a/src/test/java/org/prebid/server/bidder/iqzone/IqzoneBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/iqzone/IqzoneBidderTest.java @@ -179,9 +179,7 @@ public void makeBidsShouldCorrectlyProceedWithVideo() throws JsonProcessingExcep // then assertThat(result.getValue()).hasSize(1) - .allSatisfy(value -> { - assertThat(value.getType()).isEqualTo(BidType.video); - }); + .allSatisfy(value -> assertThat(value.getType()).isEqualTo(BidType.video)); assertThat(result.getErrors()).isEmpty(); } @@ -197,9 +195,7 @@ public void makeBidsShouldCorrectlyProceedWithNative() throws JsonProcessingExce // then assertThat(result.getValue()).hasSize(1) - .allSatisfy(value -> { - assertThat(value.getType()).isEqualTo(BidType.xNative); - }); + .allSatisfy(value -> assertThat(value.getType()).isEqualTo(BidType.xNative)); assertThat(result.getErrors()).isEmpty(); } @@ -215,9 +211,7 @@ public void makeBidsShouldCorrectlyProceedWithBanner() throws JsonProcessingExce // then assertThat(result.getValue()).hasSize(1) - .allSatisfy(value -> { - assertThat(value.getType()).isEqualTo(BidType.banner); - }); + .allSatisfy(value -> assertThat(value.getType()).isEqualTo(BidType.banner)); assertThat(result.getErrors()).isEmpty(); } diff --git a/src/test/java/org/prebid/server/bidder/loopme/LoopmeBidderTest.java b/src/test/java/org/prebid/server/bidder/loopme/LoopmeBidderTest.java index 63d8048338e..19e57582ae3 100644 --- a/src/test/java/org/prebid/server/bidder/loopme/LoopmeBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/loopme/LoopmeBidderTest.java @@ -168,11 +168,6 @@ private static BidRequest givenBidRequest( .build(); } - private static BidRequest givenBidRequest( - Function impCustomizer) { - return givenBidRequest(impCustomizer, identity()); - } - private static Imp givenImp(Function impCustomizer) { return impCustomizer.apply(Imp.builder() .id("123")) diff --git a/src/test/java/org/prebid/server/bidder/marsmedia/MarsmediaBidderTest.java b/src/test/java/org/prebid/server/bidder/marsmedia/MarsmediaBidderTest.java index 9382d2188c4..a1bb6bacd7f 100644 --- a/src/test/java/org/prebid/server/bidder/marsmedia/MarsmediaBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/marsmedia/MarsmediaBidderTest.java @@ -104,7 +104,7 @@ public void makeHttpRequestsShouldResolveZoneFromJsonZoneIdField() { assertThat(result.getValue()) .extracting(HttpRequest::getUri) .allSatisfy(uri -> { - final String regex = "[a-zA-Z0-9\\:\\/\\._\\-\\?&\\=]+zone=(?[a-zA-Z0-9]+)"; + final String regex = "[a-zA-Z0-9:/._\\-?&=]+zone=(?[a-zA-Z0-9]+)"; final Matcher matcher = Pattern.compile(regex).matcher(uri); assertThat(matcher.find()).isTrue(); assertThat(matcher.group("zone")).isEqualTo("zoneId"); diff --git a/src/test/java/org/prebid/server/bidder/orbidder/OrbidderBidderTest.java b/src/test/java/org/prebid/server/bidder/orbidder/OrbidderBidderTest.java index 22d716976bf..c9f0d028368 100644 --- a/src/test/java/org/prebid/server/bidder/orbidder/OrbidderBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/orbidder/OrbidderBidderTest.java @@ -1,9 +1,7 @@ package org.prebid.server.bidder.orbidder; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; import com.iab.openrtb.request.BidRequest; -import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; import org.junit.Before; @@ -18,12 +16,9 @@ import java.util.Collections; import java.util.List; -import java.util.Map; -import java.util.function.Function; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -92,21 +87,10 @@ public void makeBidsShouldReturnErrorsWhenBidsEmptyList() .containsOnly(Collections.emptyList(), Collections.emptyList()); } - private static BidResponse givenBidResponse(Function bidCustomizer) { - return BidResponse.builder() - .seatbid(singletonList(SeatBid.builder().bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) - .build())) - .build(); - } - private static HttpCall givenHttpCall(String body) { return HttpCall.success( HttpRequest.builder().payload(null).build(), HttpResponse.of(200, null, body), null); } - - private static Map givenCustomParams(String key, Object values) { - return singletonMap(key, mapper.valueToTree(values)); - } } diff --git a/src/test/java/org/prebid/server/bidder/pubmatic/PubmaticBidderTest.java b/src/test/java/org/prebid/server/bidder/pubmatic/PubmaticBidderTest.java index f1f247f4f55..0c0393116f2 100644 --- a/src/test/java/org/prebid/server/bidder/pubmatic/PubmaticBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/pubmatic/PubmaticBidderTest.java @@ -37,7 +37,6 @@ import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidVideo; import org.prebid.server.util.HttpUtil; -import java.io.IOException; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -414,7 +413,7 @@ public void makeHttpRequestsShouldAddImpExtAddUnitKeyKeyWordFromAdServerAdSlotIf } @Test - public void makeHttpRequestsShouldSetImpExtFromKeywordsSkippingKeysWithEmptyValues() throws IOException { + public void makeHttpRequestsShouldSetImpExtFromKeywordsSkippingKeysWithEmptyValues() { // given final BidRequest bidRequest = givenBidRequest( identity(), @@ -885,7 +884,7 @@ private static BidRequest givenBidRequest( Function extCustomizer) { return bidRequestCustomizer.apply(BidRequest.builder() - .imp(singletonList(givenImp(impCustomizer, extCustomizer)))) + .imp(singletonList(givenImp(impCustomizer, extCustomizer)))) .build(); } @@ -905,13 +904,13 @@ private static Imp givenImp(Function impCustomiz ExtImpPubmatic.ExtImpPubmaticBuilder> extCustomizer) { return impCustomizer.apply(Imp.builder() - .id("123") - .banner(Banner.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of(null, - extCustomizer.apply(ExtImpPubmatic.builder() - .publisherId("pub id") - .adSlot("slot@300x250")) - .build())))) + .id("123") + .banner(Banner.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of(null, + extCustomizer.apply(ExtImpPubmatic.builder() + .publisherId("pub id") + .adSlot("slot@300x250")) + .build())))) .build(); } diff --git a/src/test/java/org/prebid/server/bidder/smilewanted/SmileWantedBidderTest.java b/src/test/java/org/prebid/server/bidder/smilewanted/SmileWantedBidderTest.java index b1905060bf0..e8b4ecc87f3 100644 --- a/src/test/java/org/prebid/server/bidder/smilewanted/SmileWantedBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/smilewanted/SmileWantedBidderTest.java @@ -28,7 +28,6 @@ import java.util.function.Function; import static java.util.Collections.singletonList; -import static java.util.function.Function.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.tuple; @@ -179,10 +178,6 @@ private static BidRequest givenBidRequest( .build(); } - private static BidRequest givenBidRequest(Function impCustomizer) { - return givenBidRequest(identity(), impCustomizer); - } - private static Imp givenImp(Function impCustomizer) { return impCustomizer.apply(Imp.builder() .id("123") diff --git a/src/test/java/org/prebid/server/bidder/ttx/TtxBidderTest.java b/src/test/java/org/prebid/server/bidder/ttx/TtxBidderTest.java index 47cb19c25bf..a5e499106f5 100644 --- a/src/test/java/org/prebid/server/bidder/ttx/TtxBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/ttx/TtxBidderTest.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.function.Function; -import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.function.Function.identity; import static org.assertj.core.api.Assertions.assertThat; @@ -108,8 +107,7 @@ public void makeHttpRequestsShouldNotCreateNewSiteIfSiteNotPresentInBidRequest() public void makeHttpRequestsShouldChangeOnlyFirstImpExt() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(asList( - givenImp(identity()))) + .imp(singletonList(givenImp(identity()))) .build(); // when diff --git a/src/test/java/org/prebid/server/deals/AlertHttpServiceTest.java b/src/test/java/org/prebid/server/deals/AlertHttpServiceTest.java index 9bbc5967cd0..3dd501bed23 100644 --- a/src/test/java/org/prebid/server/deals/AlertHttpServiceTest.java +++ b/src/test/java/org/prebid/server/deals/AlertHttpServiceTest.java @@ -227,7 +227,7 @@ private List getRequestPayload() throws JsonProcessingException { private List parseAlertEvents(String row) throws JsonProcessingException { return mapper.readValue(row, - new TypeReference>() { + new TypeReference<>() { }); } } diff --git a/src/test/java/org/prebid/server/deals/DeliveryProgressServiceTest.java b/src/test/java/org/prebid/server/deals/DeliveryProgressServiceTest.java index 92850f9f65c..21d3828f628 100644 --- a/src/test/java/org/prebid/server/deals/DeliveryProgressServiceTest.java +++ b/src/test/java/org/prebid/server/deals/DeliveryProgressServiceTest.java @@ -155,7 +155,6 @@ public void updateLineItemsShouldUpdateCurrentDeliveryReportIfUpdatedPlanUpdateT .containsOnly(tuple(1, 200, 40L)); } - @SuppressWarnings("unchecked") @Test public void processAuctionEventShouldUpdateCurrentPlan() { // given @@ -286,7 +285,7 @@ public void getLineItemStatusReportShouldReturnExpectedResult() { given(lineItemService.getLineItemById(anyString())).willReturn(lineItem); // when - final LineItemStatusReport report = deliveryProgressService.getLineItemStatusReport("lineItemId1", now); + final LineItemStatusReport report = deliveryProgressService.getLineItemStatusReport("lineItemId1"); // then assertThat(report).isEqualTo(LineItemStatusReport.builder() diff --git a/src/test/java/org/prebid/server/deals/PlannerServiceTest.java b/src/test/java/org/prebid/server/deals/PlannerServiceTest.java index 5620cdcf1a5..940f6c3628c 100644 --- a/src/test/java/org/prebid/server/deals/PlannerServiceTest.java +++ b/src/test/java/org/prebid/server/deals/PlannerServiceTest.java @@ -339,7 +339,7 @@ private static LineItemMetaData givenLineItemMetaData(String lineItemId, String } @SafeVarargs - private final void givenHttpClientReturnsResponses(Future... futureHttpClientResponses) { + private void givenHttpClientReturnsResponses(Future... futureHttpClientResponses) { BDDMockito.BDDMyOngoingStubbing> stubbing = given(httpClient.get(anyString(), any(), anyLong())); diff --git a/src/test/java/org/prebid/server/deals/UserServiceTest.java b/src/test/java/org/prebid/server/deals/UserServiceTest.java index 885f271adae..241e00d99d4 100644 --- a/src/test/java/org/prebid/server/deals/UserServiceTest.java +++ b/src/test/java/org/prebid/server/deals/UserServiceTest.java @@ -10,7 +10,6 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.prebid.server.VertxTest; -import org.prebid.server.analytics.model.NotificationEvent; import org.prebid.server.auction.model.AuctionContext; import org.prebid.server.cache.model.CacheHttpRequest; import org.prebid.server.cache.model.DebugHttpCall; @@ -504,10 +503,6 @@ public void processWinEventShouldCallMetricsPreparationFailedMetricWhenHttpClien @Test public void processWinEventShouldCallMetricsWinRequestWithFalseWhenStatusIsNot200() { // given - final NotificationEvent event = NotificationEvent.builder() - .bidId("bidId") - .lineItemId("lineItem1") - .build(); final List frequencyCaps = singletonList(FrequencyCap.builder().fcapId("213").build()); given(lineItemService.getLineItemById(any())).willReturn(LineItem.of( diff --git a/src/test/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandlerTest.java b/src/test/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandlerTest.java index 1ac3d1b8660..72069ad5f88 100644 --- a/src/test/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandlerTest.java +++ b/src/test/java/org/prebid/server/deals/simulation/DealsSimulationAdminHandlerTest.java @@ -58,12 +58,13 @@ public class DealsSimulationAdminHandlerTest extends VertxTest { @Mock private HttpServerResponse response; - private ZonedDateTime now = ZonedDateTime.now(Clock.fixed(Instant.parse("2019-10-10T00:00:00Z"), ZoneOffset.UTC)); + private ZonedDateTime now; private DealsSimulationAdminHandler dealsSimulationAdminHandler; @Before public void setUp() { + now = ZonedDateTime.now(Clock.fixed(Instant.parse("2019-10-10T00:00:00Z"), ZoneOffset.UTC)); dealsSimulationAdminHandler = new DealsSimulationAdminHandler(registerService, plannerService, deliveryProgressService, deliveryStatsService, httpBidderRequester, jacksonMapper, "endpoint"); diff --git a/src/test/java/org/prebid/server/execution/RemoteFileSyncerTest.java b/src/test/java/org/prebid/server/execution/RemoteFileSyncerTest.java index dcc4dc217e7..2abceab8ba0 100644 --- a/src/test/java/org/prebid/server/execution/RemoteFileSyncerTest.java +++ b/src/test/java/org/prebid/server/execution/RemoteFileSyncerTest.java @@ -41,7 +41,6 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -@SuppressWarnings("ResultOfMethodCallIgnored") public class RemoteFileSyncerTest extends VertxTest { private static final long TIMEOUT = 10000; diff --git a/src/test/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationServiceTest.java b/src/test/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationServiceTest.java index f7db104fad1..eeb897d4c02 100644 --- a/src/test/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationServiceTest.java +++ b/src/test/java/org/prebid/server/geolocation/CircuitBreakerSecuredGeoLocationServiceTest.java @@ -205,7 +205,7 @@ public void circuitBreakerGaugeShouldReportClosedWhenCircuitClosed(TestContext c } @SuppressWarnings("unchecked") - private void givenWrappedGeoLocationReturning(Future... results) { + private void givenWrappedGeoLocationReturning(Future... results) { BDDMockito.BDDMyOngoingStubbing> given = given(wrappedGeoLocationService.lookup(any(), any())); for (Future result : results) { diff --git a/src/test/java/org/prebid/server/handler/CustomizedAdminEndpointTest.java b/src/test/java/org/prebid/server/handler/CustomizedAdminEndpointTest.java index e4dcaf8b914..65a54d77a4c 100644 --- a/src/test/java/org/prebid/server/handler/CustomizedAdminEndpointTest.java +++ b/src/test/java/org/prebid/server/handler/CustomizedAdminEndpointTest.java @@ -41,7 +41,7 @@ public class CustomizedAdminEndpointTest extends VertxTest { @Mock private Route route; - private Map adminEndpointCredentials = Collections.singletonMap("user", "pass"); + private final Map adminEndpointCredentials = Collections.singletonMap("user", "pass"); @Before public void setUp() { diff --git a/src/test/java/org/prebid/server/handler/LineItemStatusHandlerTest.java b/src/test/java/org/prebid/server/handler/LineItemStatusHandlerTest.java index e4b286342ce..d05dbe49b76 100644 --- a/src/test/java/org/prebid/server/handler/LineItemStatusHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/LineItemStatusHandlerTest.java @@ -65,7 +65,7 @@ public void handleShouldRespondWithErrorIfNoLineItemIdSpecified() { @Test public void handleShouldRespondWithErrorIfProcessingFailed() { // given - given(deliveryProgressService.getLineItemStatusReport(any(), any())).willThrow(new PreBidException("error")); + given(deliveryProgressService.getLineItemStatusReport(any())).willThrow(new PreBidException("error")); // when handler.handle(routingContext); @@ -78,7 +78,7 @@ public void handleShouldRespondWithErrorIfProcessingFailed() { @Test public void handleShouldRespondWithErrorIfUnexpectedExceptionOccurred() { // given - given(deliveryProgressService.getLineItemStatusReport(any(), any())).willThrow(new RuntimeException("error")); + given(deliveryProgressService.getLineItemStatusReport(any())).willThrow(new RuntimeException("error")); // when handler.handle(routingContext); @@ -91,7 +91,7 @@ public void handleShouldRespondWithErrorIfUnexpectedExceptionOccurred() { @Test public void handleShouldRespondWithExpectedResult() { // given - given(deliveryProgressService.getLineItemStatusReport(any(), any())) + given(deliveryProgressService.getLineItemStatusReport(any())) .willReturn(LineItemStatusReport.builder().lineItemId("lineItemId").build()); // when diff --git a/src/test/java/org/prebid/server/handler/LoggerControlKnobHandlerTest.java b/src/test/java/org/prebid/server/handler/LoggerControlKnobHandlerTest.java index a215571e475..6d244c0a0bc 100644 --- a/src/test/java/org/prebid/server/handler/LoggerControlKnobHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/LoggerControlKnobHandlerTest.java @@ -16,6 +16,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.startsWith; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; @@ -86,7 +87,7 @@ public void shouldRespondWithErrorWhenLevelNotValid() { // then verify(httpResponse).setStatusCode(eq(400)); - verify(httpResponse).end(eq("Invalid 'level' parameter value, allowed values '[warn, debug, error, info]'")); + verify(httpResponse).end(startsWith("Invalid 'level' parameter value")); verifyNoInteractions(loggerControlKnob); } diff --git a/src/test/java/org/prebid/server/it/ApplicationTest.java b/src/test/java/org/prebid/server/it/ApplicationTest.java index 136bab3172a..6f4d72c5284 100644 --- a/src/test/java/org/prebid/server/it/ApplicationTest.java +++ b/src/test/java/org/prebid/server/it/ApplicationTest.java @@ -483,7 +483,7 @@ public void biddersParamsShouldReturnBidderSchemas() throws JSONException, IOExc // then final Map responseAsMap = jacksonMapper.decodeValue(response.asString(), - new TypeReference>() { + new TypeReference<>() { }); final List bidders = getBidderNamesFromParamFiles(); @@ -509,7 +509,7 @@ public void infoBiddersShouldReturnRegisteredActiveBidderNames() throws IOExcept // then final List responseAsList = jacksonMapper.decodeValue(response.asString(), - new TypeReference>() { + new TypeReference<>() { }); final List bidders = getBidderNamesFromParamFiles(); diff --git a/src/test/java/org/prebid/server/it/DealsSimulationTest.java b/src/test/java/org/prebid/server/it/DealsSimulationTest.java index b2898b22cf4..93c5b5c50b5 100644 --- a/src/test/java/org/prebid/server/it/DealsSimulationTest.java +++ b/src/test/java/org/prebid/server/it/DealsSimulationTest.java @@ -223,7 +223,7 @@ private static CustomComparator openrtbDeepDebugTimeComparator() { arrayValueMatchers.add(new Customization("ext.debug.trace.deals", arrayValueMatcher)); return new CustomComparator(JSONCompareMode.NON_EXTENSIBLE, - arrayValueMatchers.toArray(new Customization[arrayValueMatchers.size()])); + arrayValueMatchers.toArray(Customization[]::new)); } private void assertResponse(String expectedResponsePath, Response response, List bidders) diff --git a/src/test/java/org/prebid/server/it/SovrnTest.java b/src/test/java/org/prebid/server/it/SovrnTest.java index 0626e4de33f..2c56fafcf1d 100644 --- a/src/test/java/org/prebid/server/it/SovrnTest.java +++ b/src/test/java/org/prebid/server/it/SovrnTest.java @@ -18,8 +18,6 @@ @RunWith(SpringRunner.class) public class SovrnTest extends IntegrationTest { - private static final String SOVRN = "sovrn"; - @Test public void openrtb2AuctionShouldRespondWithBidsFromSovrn() throws IOException, JSONException { // given diff --git a/src/test/java/org/prebid/server/it/hooks/SampleItBidderRequestHook.java b/src/test/java/org/prebid/server/it/hooks/SampleItBidderRequestHook.java index c18f10bab56..32f2a7a2642 100644 --- a/src/test/java/org/prebid/server/it/hooks/SampleItBidderRequestHook.java +++ b/src/test/java/org/prebid/server/it/hooks/SampleItBidderRequestHook.java @@ -21,7 +21,7 @@ public Future> call( final BidRequest originalBidRequest = bidderRequestPayload.bidRequest(); - final BidRequest updatedBidRequest = updateBidRequest(originalBidRequest, invocationContext); + final BidRequest updatedBidRequest = updateBidRequest(originalBidRequest); return Future.succeededFuture(InvocationResultImpl.succeeded(payload -> BidderRequestPayloadImpl.of(payload.bidRequest().toBuilder() @@ -34,9 +34,7 @@ public String code() { return "bidder-request"; } - private BidRequest updateBidRequest( - BidRequest originalBidRequest, BidderInvocationContext bidderInvocationContext) { - + private BidRequest updateBidRequest(BidRequest originalBidRequest) { final List updatedImps = originalBidRequest.getImp().stream() .map(imp -> imp.toBuilder().tagid("tagid-from-bidder-request-hook").build()) .collect(Collectors.toList()); diff --git a/src/test/java/org/prebid/server/settings/service/HttpPeriodicRefreshServiceTest.java b/src/test/java/org/prebid/server/settings/service/HttpPeriodicRefreshServiceTest.java index d87d511465d..7184a1968b4 100644 --- a/src/test/java/org/prebid/server/settings/service/HttpPeriodicRefreshServiceTest.java +++ b/src/test/java/org/prebid/server/settings/service/HttpPeriodicRefreshServiceTest.java @@ -50,8 +50,8 @@ public class HttpPeriodicRefreshServiceTest extends VertxTest { private Vertx vertx; private HttpClientResponse updatedResponse; - private Map expectedRequests = singletonMap("id1", "{\"field1\":\"field-value1\"}"); - private Map expectedImps = singletonMap("id2", "{\"field2\":\"field-value2\"}"); + private final Map expectedRequests = singletonMap("id1", "{\"field1\":\"field-value1\"}"); + private final Map expectedImps = singletonMap("id2", "{\"field2\":\"field-value2\"}"); @Before public void setUp() throws JsonProcessingException { diff --git a/src/test/java/org/prebid/server/util/HttpUtilTest.java b/src/test/java/org/prebid/server/util/HttpUtilTest.java index c4b6fd6d760..ac09f82dbec 100644 --- a/src/test/java/org/prebid/server/util/HttpUtilTest.java +++ b/src/test/java/org/prebid/server/util/HttpUtilTest.java @@ -182,7 +182,7 @@ public void toSetCookieHeaderValueShouldReturnExpectedString() { public void executeSafelyShouldSkipResponseIfClientClosedConnection() { // given given(httpResponse.closed()).willReturn(true); - final Consumer responseConsumer = mock(Consumer.class); + final Consumer responseConsumer = mock(Consumer.class); // when HttpUtil.executeSafely(routingContext, "endpoint", responseConsumer); @@ -195,7 +195,7 @@ public void executeSafelyShouldSkipResponseIfClientClosedConnection() { @Test public void executeSafelyShouldRespondToClient() { // given - final Consumer responseConsumer = mock(Consumer.class); + final Consumer responseConsumer = mock(Consumer.class); // when final boolean result = HttpUtil.executeSafely(routingContext, "endpoint", responseConsumer); @@ -209,7 +209,7 @@ public void executeSafelyShouldRespondToClient() { @Test public void executeSafelyShouldReturnFalseIfResponseFailed() { // given - final Consumer responseConsumer = mock(Consumer.class); + final Consumer responseConsumer = mock(Consumer.class); doThrow(new RuntimeException("error")).when(responseConsumer).accept(any()); // when diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-appnexus-bid-request-1.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-appnexus-bid-request-1.json index aae470c6c65..09a971826b1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-appnexus-bid-request-1.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-appnexus-bid-request-1.json @@ -129,15 +129,7 @@ "bidder": "appnexus", "maxbids": 2 } - ], - "auctiontimestamp": 1000, - "events": {}, - "channel": { - "name": "web" - }, - "pbs": { - "endpoint": "/openrtb2/auction" - } + ] } } }