Remove unused code declarations (prebid#1645)

travisbeale · Dec 20, 2021 · 90baabe · 90baabe
1 parent 69091b2
commit 90baabe
Show file tree

Hide file tree

Showing 210 changed files with 282 additions and 847 deletions.
diff --git 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
@@ -422,7 +422,7 @@ private Set<String> extractCcpaEnforcedBidders(List<String> 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
@@ -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<List<SeatBid>> SEATBID_LIST_TYPE = new TypeReference<List<SeatBid>>() {
-    };
+    private static final TypeReference<List<SeatBid>> 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
@@ -204,7 +204,7 @@ private Map<String, String> 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
@@ -80,10 +80,6 @@ public AuctionContext with(BidResponse bidResponse) {
         return this.toBuilder().bidResponse(bidResponse).build();
     }
 
-    public AuctionContext with(BidRequest bidRequest, List<String> errors) {
-        return this.toBuilder().bidRequest(bidRequest).prebidErrors(errors).build();
-    }
-
     public AuctionContext with(List<AuctionParticipation> 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
@@ -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
diff --git 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
@@ -106,10 +106,8 @@ public Future<WithPodErrors<AuctionContext>> 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
@@ -17,7 +17,7 @@
  */
 public class DisabledBidder implements Bidder<Void> {
 
-    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
@@ -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
@@ -31,7 +31,7 @@
 public class AceexBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAceex>> ACEEX_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAceex>>() {
+            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
@@ -34,7 +34,7 @@
 public class AcuityadsBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAcuityads>> ACUITYADS_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAcuityads>>() {
+            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
@@ -46,7 +46,7 @@ public class AdgenerationBidder implements Bidder<Void> {
             Pattern.CASE_INSENSITIVE);
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdgeneration>> ADGENERATION_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdgeneration>>() {
+            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
@@ -49,7 +49,7 @@
 public class AdheseBidder implements Bidder<AdheseRequestBody> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdhese>> ADHESE_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdhese>>() {
+            new TypeReference<>() {
             };
 
     private static final String ORIGIN_BID = "JERLICIA";
@@ -212,12 +212,12 @@ public Result<List<BidderBid>> makeBids(HttpCall<AdheseRequestBody> 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
@@ -37,7 +37,7 @@
 public class AdkernelBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdkernel>> ADKERNEL_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdkernel>>() {
+            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
@@ -40,7 +40,7 @@
 public class AdkernelAdnBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdkernelAdn>> ADKERNELADN_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdkernelAdn>>() {
+            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
@@ -37,7 +37,7 @@
 public class AdmixerBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdmixer>> ADMIXER_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdmixer>>() {
+            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
@@ -52,7 +52,7 @@
 public class AdoceanBidder implements Bidder<Void> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdocean>> ADOCEAN_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdocean>>() {
+            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
diff --git 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<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdoppler>> ADOPPLER_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdoppler>>() {
+            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
@@ -36,7 +36,7 @@
 public class AdprimeBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdprime>> ADPRIME_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdprime>>() {
+            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
@@ -39,7 +39,7 @@
 public class AdtargetBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdtarget>> ADTARGET_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdtarget>>() {
+            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
@@ -42,7 +42,7 @@
 public class AdtelligentBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdtelligent>> ADTELLIGENT_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdtelligent>>() {
+            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
@@ -38,8 +38,8 @@
 
 public class AdvangelistsBidder implements Bidder<BidRequest> {
 
-    private static final TypeReference<ExtPrebid<?, ExtImpAdvangelists>> ADVANGELISTS_EXT_TYPE_REFERENCE = new
-            TypeReference<ExtPrebid<?, ExtImpAdvangelists>>() {
+    private static final TypeReference<ExtPrebid<?, ExtImpAdvangelists>> 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
@@ -37,7 +37,7 @@
 public class AdviewBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdview>> ADVIEW_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdview>>() {
+            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
@@ -32,9 +32,8 @@
 public class AdyoulikeBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAdyoulike>> ADYOULIKE_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAdyoulike>>() {
+            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
@@ -34,7 +34,7 @@
 public class AjaBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAja>> AJA_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAja>>() {
+            new TypeReference<>() {
             };
 
     private final String endpointUrl;
@@ -72,10 +72,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
 
         for (final String tagId : tagIds) {
             final Imp imp = impsByTagID.get(tagId);
-            final HttpRequest<BidRequest> singleRequest = createSingleRequest(imp, bidRequest, endpointUrl, errors);
-            if (singleRequest == null) {
-                continue;
-            }
+            final HttpRequest<BidRequest> singleRequest = createSingleRequest(imp, bidRequest, endpointUrl);
             result.add(singleRequest);
         }
 
@@ -93,11 +90,8 @@ private ExtImpAja parseExtAJA(Imp imp, List<BidderError> errors) {
         return null;
     }
 
-    private HttpRequest<BidRequest> createSingleRequest(Imp imp, BidRequest request, String url,
-                                                        List<BidderError> errors) {
-        final BidRequest outgoingRequest = request.toBuilder()
-                .imp(Collections.singletonList(imp))
-                .build();
+    private HttpRequest<BidRequest> createSingleRequest(Imp imp, BidRequest request, String url) {
+        final BidRequest outgoingRequest = request.toBuilder().imp(Collections.singletonList(imp)).build();
 
         return HttpRequest.<BidRequest>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
@@ -37,7 +37,7 @@
 public class AlgorixBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAlgorix>> ALGORIX_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAlgorix>>() {
+            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
@@ -39,7 +39,7 @@
 public class AmxBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpAmx>> AMX_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAmx>>() {
+            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
@@ -35,7 +35,7 @@
 public class ApplogyBidder implements Bidder<BidRequest> {
 
     private static final TypeReference<ExtPrebid<?, ExtImpApplogy>> APPLOGY_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpApplogy>>() {
+            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
@@ -74,7 +74,7 @@ public class AppnexusBidder implements Bidder<BidRequest> {
     private static final Map<Integer, String> IAB_CATEGORIES = new HashMap<>();
 
     private static final TypeReference<ExtPrebid<?, ExtImpAppnexus>> APPNEXUS_EXT_TYPE_REFERENCE =
-            new TypeReference<ExtPrebid<?, ExtImpAppnexus>>() {
+            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
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
@@ -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;
 }