getNestedSizes(double minWidth,
+ double minHeight,
+ double maxWidth,
+ double maxHeight,
+ int count) {
+
return INTERSTITIAL_SIZES.stream()
.filter(size -> isNested(size, minWidth, minHeight, maxWidth, maxHeight))
.limit(count)
diff --git a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java
index 2896e153adf..4fb92910ebf 100644
--- a/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java
+++ b/src/main/java/org/prebid/server/auction/TargetingKeywordsCreator.java
@@ -271,7 +271,7 @@ private String truncateKey(String key) {
/**
* Helper for targeting keywords.
*
- * Brings a convenient way for creating keywords regarding to bidder and winning bid flag.
+ * Brings a convenient way for creating keywords regarding bidder and winning bid flag.
*/
private static class KeywordMap {
diff --git a/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java b/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java
index e9a7b7818a1..823c29d5bd2 100644
--- a/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java
+++ b/src/main/java/org/prebid/server/auction/categorymapping/BasicCategoryMappingService.java
@@ -150,7 +150,7 @@ private Future> makeBidderToBidCategory(List> categoryBidContextsPromise = Promise.promise();
- final CompositeFuture compositeFuture = CompositeFuture.join(bidderResponses.stream()
+ final CompositeFuture compositeFuture = Future.join(bidderResponses.stream()
.flatMap(bidderResponse -> makeFetchCategoryFutures(
bidderResponse, primaryAdServer, publisher, timeout, withCategory, translateCategories))
.collect(Collectors.toList()));
@@ -729,14 +729,6 @@ private static RejectedBid of(String bidId, String bidder, String errorMessage)
@Builder(toBuilder = true)
private static class CategoryBidContext {
- public static CategoryBidContext of(BidderBid bidderBid, String bidder, String category) {
- return CategoryBidContext.builder()
- .bidderBid(bidderBid)
- .bidder(bidder)
- .category(category)
- .build();
- }
-
BidderBid bidderBid;
String bidder;
@@ -750,6 +742,14 @@ public static CategoryBidContext of(BidderBid bidderBid, String bidder, String c
BigDecimal price;
boolean satisfiedPriority;
+
+ public static CategoryBidContext of(BidderBid bidderBid, String bidder, String category) {
+ return CategoryBidContext.builder()
+ .bidderBid(bidderBid)
+ .bidder(bidder)
+ .category(category)
+ .build();
+ }
}
@Value(staticConstructor = "of")
diff --git a/src/main/java/org/prebid/server/auction/model/BidderResponse.java b/src/main/java/org/prebid/server/auction/model/BidderResponse.java
index ddec8e38bff..dc74bb043b7 100644
--- a/src/main/java/org/prebid/server/auction/model/BidderResponse.java
+++ b/src/main/java/org/prebid/server/auction/model/BidderResponse.java
@@ -1,14 +1,12 @@
package org.prebid.server.auction.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
import org.prebid.server.bidder.model.BidderSeatBid;
/**
* Structure to pass {@link BidderSeatBid} along with bidder name and extra tracking data generated during bidding
*/
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class BidderResponse {
String bidder;
diff --git a/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java b/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java
index f02a9af5b72..0c251f9cfe6 100644
--- a/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java
+++ b/src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java
@@ -1,11 +1,9 @@
package org.prebid.server.auction.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
import org.prebid.server.bidder.model.BidderSeatBidInfo;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class BidderResponseInfo {
String bidder;
diff --git a/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java b/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java
index 4b3dfa736f3..8f72806ae92 100644
--- a/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java
+++ b/src/main/java/org/prebid/server/auction/model/StoredResponseResult.java
@@ -2,14 +2,12 @@
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.response.SeatBid;
-import lombok.AllArgsConstructor;
import lombok.Value;
import java.util.List;
import java.util.Map;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class StoredResponseResult {
List requiredRequestImps;
diff --git a/src/main/java/org/prebid/server/auction/model/Tuple2.java b/src/main/java/org/prebid/server/auction/model/Tuple2.java
index 16d641f40c3..560f5dab4fa 100644
--- a/src/main/java/org/prebid/server/auction/model/Tuple2.java
+++ b/src/main/java/org/prebid/server/auction/model/Tuple2.java
@@ -1,10 +1,8 @@
package org.prebid.server.auction.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class Tuple2 {
L left;
diff --git a/src/main/java/org/prebid/server/auction/model/Tuple3.java b/src/main/java/org/prebid/server/auction/model/Tuple3.java
deleted file mode 100644
index bb26c145dc3..00000000000
--- a/src/main/java/org/prebid/server/auction/model/Tuple3.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.prebid.server.auction.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Value;
-
-@AllArgsConstructor(staticName = "of")
-@Value
-public class Tuple3 {
-
- L left;
-
- M middle;
-
- R right;
-}
diff --git a/src/main/java/org/prebid/server/auction/model/WithPodErrors.java b/src/main/java/org/prebid/server/auction/model/WithPodErrors.java
index 6238637afd2..aa6582ff39c 100644
--- a/src/main/java/org/prebid/server/auction/model/WithPodErrors.java
+++ b/src/main/java/org/prebid/server/auction/model/WithPodErrors.java
@@ -1,13 +1,11 @@
package org.prebid.server.auction.model;
import com.iab.openrtb.request.video.PodError;
-import lombok.AllArgsConstructor;
import lombok.Value;
import java.util.List;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class WithPodErrors {
T data;
diff --git a/src/main/java/org/prebid/server/auction/model/debug/BidderDebugContext.java b/src/main/java/org/prebid/server/auction/model/debug/BidderDebugContext.java
deleted file mode 100644
index f3d2e07dd1a..00000000000
--- a/src/main/java/org/prebid/server/auction/model/debug/BidderDebugContext.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.prebid.server.auction.model.debug;
-
-import lombok.Value;
-
-@Value(staticConstructor = "of")
-public class BidderDebugContext {
-
- boolean debugEnabled;
-
- boolean shouldReturnAllBidStatuses;
-}
diff --git a/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java
index fe366d54cbc..6d2ac3ee72d 100644
--- a/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java
+++ b/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java
@@ -132,7 +132,7 @@ public AmpRequestFactory(Ortb2RequestFactory ortb2RequestFactory,
* Creates {@link AuctionContext} based on {@link RoutingContext}.
*/
public Future fromRequest(RoutingContext routingContext, long startTime) {
- final String body = routingContext.getBodyAsString();
+ final String body = routingContext.body().asString();
final AuctionContext initialAuctionContext = ortb2RequestFactory.createAuctionContext(
Endpoint.openrtb2_amp, MetricName.amp);
@@ -731,7 +731,7 @@ private ExtRequest extRequest(BidRequest bidRequest,
}
/**
- * Creates updated with default values bidrequest.ext.targeting {@link ExtRequestTargeting} if at least one of it's
+ * Creates updated with default values bidrequest.ext.targeting {@link ExtRequestTargeting} if at least one of its
* child properties is missed or entire targeting does not exist.
*/
private ExtRequestTargeting createTargetingWithDefaults(ExtRequestPrebid prebid, Account account) {
diff --git a/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java
index 0eb24dface1..1edf2fbed39 100644
--- a/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java
+++ b/src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java
@@ -157,7 +157,7 @@ public Future enrichAuctionContext(AuctionContext initialContext
}
private String extractAndValidateBody(RoutingContext routingContext) {
- final String body = routingContext.getBodyAsString();
+ final String body = routingContext.body().asString();
if (body == null) {
throw new InvalidRequestException("Incoming request has no body");
}
diff --git a/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java
index 4493fb9601e..2e41fd97a35 100644
--- a/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java
+++ b/src/main/java/org/prebid/server/auction/requestfactory/VideoRequestFactory.java
@@ -166,7 +166,7 @@ private WithPodErrors removeEmptyEids(WithPodErrors requ
}
private String extractAndValidateBody(RoutingContext routingContext) {
- final String body = routingContext.getBodyAsString();
+ final String body = routingContext.body().asString();
if (body == null) {
throw new InvalidRequestException("Incoming request has no body");
}
diff --git a/src/main/java/org/prebid/server/bidder/BidderCatalog.java b/src/main/java/org/prebid/server/bidder/BidderCatalog.java
index 3d8db57e941..cf7e8647f14 100644
--- a/src/main/java/org/prebid/server/bidder/BidderCatalog.java
+++ b/src/main/java/org/prebid/server/bidder/BidderCatalog.java
@@ -136,7 +136,7 @@ public boolean isDebugAllowed(String name) {
/**
* Returns an {@link BidderInfo} registered by the given name or null if there is none.
*
- * Therefore this method should be called only for names that previously passed validity check
+ * Therefore, this method should be called only for names that previously passed validity check
* through calling {@link #isValidName(String)}.
*/
public BidderInfo bidderInfoByName(String name) {
@@ -149,7 +149,7 @@ public BidderInfo bidderInfoByName(String name) {
/**
* Returns an VendorId registered by the given name or null if there is none.
*
- * Therefore this method should be called only for names that previously passed validity check
+ * Therefore, this method should be called only for names that previously passed validity check
* through calling {@link #isValidName(String)}.
*/
public Integer vendorIdByName(String name) {
@@ -217,7 +217,7 @@ public Set usersyncReadyBidders() {
/**
* Returns an {@link Bidder} registered by the given name or null if there is none.
*
- * Therefore this method should be called only for names that previously passed validity check
+ * Therefore, this method should be called only for names that previously passed validity check
* through calling {@link #isValidName(String)}.
*/
public Bidder> bidderByName(String name) {
diff --git a/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java b/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java
index 4aabd5960a5..0289d100f3d 100644
--- a/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java
+++ b/src/main/java/org/prebid/server/bidder/HttpBidderRequestEnricher.java
@@ -48,7 +48,7 @@ MultiMap enrichHeaders(
BidderAliases aliases,
BidRequest bidRequest) {
- // some bidders has headers on class level, so we create copy to not affect them
+ // some bidders have headers on class level, so we create copy to not affect them
final MultiMap bidderRequestHeadersCopy = copyMultiMap(bidderRequestHeaders);
addOriginalRequestHeaders(bidderRequestHeadersCopy, originalRequestHeaders);
diff --git a/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java b/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java
index 3a24683c774..5fed030cb41 100644
--- a/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java
+++ b/src/main/java/org/prebid/server/bidder/HttpBidderRequester.java
@@ -4,7 +4,6 @@
import io.netty.channel.ConnectTimeoutException;
import io.netty.handler.codec.http.HttpHeaderValues;
import io.netty.handler.codec.http.HttpResponseStatus;
-import io.vertx.core.CompositeFuture;
import io.vertx.core.Future;
import io.vertx.core.MultiMap;
import org.apache.commons.collections4.CollectionUtils;
@@ -131,8 +130,8 @@ public Future requestBids(Bidder bidder,
.map(httpCall -> processHttpCall(bidder, bidRequest, resultBuilder, httpCall)))
.toList();
- return CompositeFuture.any(
- CompositeFuture.join(new ArrayList<>(httpRequestFutures)),
+ return Future.any(
+ Future.join(httpRequestFutures),
completionTracker.future())
.map(ignored -> resultBuilder.toBidderSeatBid(debugEnabled))
.onSuccess(seatBid -> bidRejectionTracker.restoreFromRejection(seatBid.getBids()));
@@ -322,7 +321,7 @@ private static CompositeBidderResponse makeBids(Bidder bidder,
/**
* Replaces body of {@link HttpResponse} with empty JSON object if response HTTP status code is equal to 204.
*
- * Note: this will safe making bids by bidders from JSON parsing error.
+ * Note: this will save making bids by bidders from JSON parsing error.
*/
private static BidderCall toHttpCallWithSafeResponseBody(BidderCall httpCall) {
final HttpResponse response = httpCall.getResponse();
diff --git a/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java b/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java
index 1d56b5e8bcb..d8c6d0b615c 100644
--- a/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java
+++ b/src/main/java/org/prebid/server/bidder/adgeneration/model/AdgenerationResponse.java
@@ -2,14 +2,12 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.AllArgsConstructor;
import lombok.Value;
import java.math.BigDecimal;
import java.util.List;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AdgenerationResponse {
String locationid;
diff --git a/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java b/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java
index 29ee5177d40..4c72fd97760 100644
--- a/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java
+++ b/src/main/java/org/prebid/server/bidder/adhese/AdheseBidder.java
@@ -127,7 +127,7 @@ public Result> makeBids(BidderCall httpCall, BidRequ
}
final Bid bid = optionalBid.get();
- final AdheseOriginData originData = toObjectOfType(bid.getExt().get("adhese"), AdheseOriginData.class);
+ final AdheseOriginData originData = toAdheseOriginData(bid.getExt().get("adhese"));
final Bid modifiedBid = bid.toBuilder()
.ext(mapper.mapper().valueToTree(originData)) // unwrap from "adhese"
.build();
@@ -151,9 +151,9 @@ private static Optional getBid(BidResponse bidResponse) {
.findFirst();
}
- private T toObjectOfType(JsonNode jsonNode, Class clazz) {
+ private AdheseOriginData toAdheseOriginData(JsonNode jsonNode) {
try {
- return mapper.mapper().treeToValue(jsonNode, clazz);
+ return mapper.mapper().treeToValue(jsonNode, AdheseOriginData.class);
} catch (JsonProcessingException e) {
throw new PreBidException(e.getMessage(), e);
}
diff --git a/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java b/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java
index 2719b6d8f54..10ad9caac4a 100644
--- a/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java
+++ b/src/main/java/org/prebid/server/bidder/adhese/model/AdheseOriginData.java
@@ -1,11 +1,9 @@
package org.prebid.server.bidder.adhese.model;
import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AdheseOriginData {
String priority;
diff --git a/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java b/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java
index 44c3eaf45ab..c50b89b3417 100644
--- a/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java
+++ b/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java
@@ -218,31 +218,31 @@ private static BidRequest createBidRequest(List imps,
public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) {
try {
final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
- return Result.withValues(extractBids(httpCall.getRequest().getPayload(), bidResponse));
+ return Result.withValues(extractBids(bidResponse));
} catch (DecodeException | PreBidException e) {
return Result.withError(BidderError.badServerResponse(e.getMessage()));
}
}
- private static List extractBids(BidRequest bidRequest, BidResponse bidResponse) {
+ private static List extractBids(BidResponse bidResponse) {
if (bidResponse == null || bidResponse.getSeatbid() == null) {
return Collections.emptyList();
}
if (bidResponse.getSeatbid().size() != 1) {
throw new PreBidException("Invalid SeatBids count: " + bidResponse.getSeatbid().size());
}
- return bidsFromResponse(bidRequest, bidResponse);
+ return bidsFromResponse(bidResponse);
}
- private static List bidsFromResponse(BidRequest bidRequest, BidResponse bidResponse) {
+ private static List bidsFromResponse(BidResponse bidResponse) {
return bidResponse.getSeatbid().stream()
.map(SeatBid::getBid)
.flatMap(Collection::stream)
- .map(bid -> makeBidderBid(bid, bidRequest.getImp(), bidResponse.getCur()))
+ .map(bid -> makeBidderBid(bid, bidResponse.getCur()))
.toList();
}
- private static BidderBid makeBidderBid(Bid bid, List imps, String currency) {
+ private static BidderBid makeBidderBid(Bid bid, String currency) {
final Optional mfSuffix = getMfSuffix(bid.getImpid());
final Bid updatedBid = mfSuffix.map(suffix -> removeMfSuffixFromImpId(bid, suffix)).orElse(bid);
diff --git a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java
index ba9df1a3034..d773617f068 100644
--- a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java
+++ b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseAdsExt.java
@@ -1,10 +1,8 @@
package org.prebid.server.bidder.adoppler.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AdopplerResponseAdsExt {
AdopplerResponseVideoAdsExt video;
diff --git a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java
index 7165870d695..090ad5faaed 100644
--- a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java
+++ b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseExt.java
@@ -1,10 +1,8 @@
package org.prebid.server.bidder.adoppler.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AdopplerResponseExt {
AdopplerResponseAdsExt ads;
diff --git a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java
index 8ab0c5bee59..db64e1447e4 100644
--- a/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java
+++ b/src/main/java/org/prebid/server/bidder/adoppler/model/AdopplerResponseVideoAdsExt.java
@@ -1,10 +1,8 @@
package org.prebid.server.bidder.adoppler.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AdopplerResponseVideoAdsExt {
Integer duration;
diff --git a/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java b/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java
index a7bb6b85609..0880a2d667c 100644
--- a/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java
+++ b/src/main/java/org/prebid/server/bidder/adquery/model/response/AdQueryDataResponse.java
@@ -8,7 +8,7 @@
import java.util.List;
@Builder(toBuilder = true)
-@Value(staticConstructor = "of")
+@Value
public class AdQueryDataResponse {
@JsonProperty("requestId")
diff --git a/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java b/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java
index 1cd75e187bd..33f9025d415 100644
--- a/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java
+++ b/src/main/java/org/prebid/server/bidder/aja/proto/ExtImpAja.java
@@ -1,11 +1,9 @@
package org.prebid.server.bidder.aja.proto;
import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class ExtImpAja {
@JsonProperty("asi")
diff --git a/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java b/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java
index b2b02f4b3bb..301f1fec17d 100644
--- a/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java
+++ b/src/main/java/org/prebid/server/bidder/algorix/AlgorixBidder.java
@@ -50,8 +50,6 @@ public class AlgorixBidder implements Bidder {
private static final String URL_SID_MACRO = "{{SID}}";
private static final String URL_TOKEN_MACRO = "{{TOKEN}}";
- private static final int FIRST_INDEX = 0;
-
private final String endpointUrl;
private final JacksonMapper mapper;
diff --git a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java
index d1d515c506e..971850daeda 100644
--- a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java
+++ b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtCreative.java
@@ -1,10 +1,8 @@
package org.prebid.server.bidder.appnexus.proto;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AppnexusBidExtCreative {
AppnexusBidExtVideo video;
diff --git a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java
index b27703a2d84..bbfb38e5883 100644
--- a/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java
+++ b/src/main/java/org/prebid/server/bidder/appnexus/proto/AppnexusBidExtVideo.java
@@ -1,10 +1,8 @@
package org.prebid.server.bidder.appnexus.proto;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AppnexusBidExtVideo {
Integer duration;
diff --git a/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java b/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java
index 7440b4cd7d1..8b7d2634291 100644
--- a/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java
+++ b/src/main/java/org/prebid/server/bidder/audiencenetwork/proto/AudienceNetworkAdMarkup.java
@@ -1,9 +1,7 @@
package org.prebid.server.bidder.audiencenetwork.proto;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor
@Value
public class AudienceNetworkAdMarkup {
diff --git a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java
index 3c740531147..32484c75e90 100644
--- a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java
+++ b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetBidExtension.java
@@ -1,10 +1,8 @@
package org.prebid.server.bidder.avocet.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AvocetBidExtension {
Integer duration;
diff --git a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java
index 72a5cc4cf7c..75d5a91835d 100644
--- a/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java
+++ b/src/main/java/org/prebid/server/bidder/avocet/model/AvocetResponseExt.java
@@ -1,10 +1,8 @@
package org.prebid.server.bidder.avocet.model;
-import lombok.AllArgsConstructor;
import lombok.Value;
-@AllArgsConstructor(staticName = "of")
-@Value
+@Value(staticConstructor = "of")
public class AvocetResponseExt {
AvocetBidExtension avocet;
diff --git a/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java b/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java
index eb29c2d6271..265ce948214 100644
--- a/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java
+++ b/src/main/java/org/prebid/server/bidder/axis/AxisBidder.java
@@ -47,9 +47,8 @@ public Result>> makeHttpRequests(BidRequest request
final List> httpRequests = new ArrayList<>();
for (Imp imp : request.getImp()) {
- final ExtImpAxis extImpAxis;
try {
- extImpAxis = parseImpExt(imp);
+ validateImpExt(imp);
} catch (PreBidException e) {
continue;
}
@@ -59,9 +58,9 @@ public Result