Skip to content

Commit 7353e46

Browse files
CTMBNaraCTMBNara
committed
Remove PAAPI related code
1 parent 43d3fb9 commit 7353e46

59 files changed

Lines changed: 479 additions & 2587 deletions

File tree

Some content is hidden

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

‎src/main/java/org/prebid/server/auction/BidResponseCreator.java‎

Lines changed: 7 additions & 216 deletions
Large diffs are not rendered by default.

‎src/main/java/org/prebid/server/auction/ImpAdjuster.java‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.prebid.server.auction;
22

33
import com.fasterxml.jackson.databind.JsonNode;
4-
import com.fasterxml.jackson.databind.node.IntNode;
54
import com.fasterxml.jackson.databind.node.ObjectNode;
65
import com.iab.openrtb.request.Imp;
76
import org.apache.commons.lang3.StringUtils;
@@ -17,8 +16,6 @@
1716
public class ImpAdjuster {
1817

1918
private static final String IMP_EXT = "ext";
20-
private static final String EXT_AE = "ae";
21-
private static final String EXT_IGS = "igs";
2219
private static final String EXT_PREBID = "prebid";
2320
private static final String EXT_PREBID_BIDDER = "bidder";
2421
private static final String EXT_PREBID_IMP = "imp";
@@ -37,8 +34,6 @@ public ImpAdjuster(JacksonMapper jacksonMapper,
3734
}
3835

3936
public Imp adjust(Imp originalImp, String bidder, List<String> debugMessages) {
40-
setAeParams(originalImp.getExt());
41-
4237
final JsonNode impExtPrebidImp = bidderParamsFromImpExtPrebidImp(originalImp.getExt());
4338
if (impExtPrebidImp == null) {
4439
return originalImp;
@@ -71,26 +66,6 @@ public Imp adjust(Imp originalImp, String bidder, List<String> debugMessages) {
7166
}
7267
}
7368

74-
private void setAeParams(ObjectNode ext) {
75-
final int extAe = Optional.ofNullable(ext)
76-
.map(extNode -> extNode.get(EXT_AE))
77-
.filter(JsonNode::isInt)
78-
.map(JsonNode::asInt)
79-
.orElse(-1);
80-
81-
final boolean extIgsAePresent = Optional.ofNullable(ext)
82-
.map(extNode -> extNode.get(EXT_IGS))
83-
.map(igsNode -> igsNode.get(EXT_AE))
84-
.isPresent();
85-
86-
if (!extIgsAePresent && (extAe == 0 || extAe == 1)) {
87-
final ObjectNode igsNode = jacksonMapper.mapper().createObjectNode()
88-
.set(EXT_AE, IntNode.valueOf(extAe));
89-
90-
ext.set(EXT_IGS, igsNode);
91-
}
92-
}
93-
9469
private static JsonNode bidderParamsFromImpExtPrebidImp(ObjectNode ext) {
9570
return Optional.ofNullable(ext)
9671
.map(extNode -> extNode.get(EXT_PREBID))

‎src/main/java/org/prebid/server/auction/model/PaaFormat.java‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/main/java/org/prebid/server/auction/requestfactory/Ortb2ImplicitParametersResolver.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.apache.commons.lang3.BooleanUtils;
2525
import org.apache.commons.lang3.ObjectUtils;
2626
import org.apache.commons.lang3.StringUtils;
27-
import org.prebid.server.auction.aliases.BidderAliases;
2827
import org.prebid.server.auction.ImplicitParametersExtractor;
2928
import org.prebid.server.auction.IpAddressHelper;
3029
import org.prebid.server.auction.PriceGranularity;
3130
import org.prebid.server.auction.SecBrowsingTopicsResolver;
3231
import org.prebid.server.auction.TimeoutResolver;
32+
import org.prebid.server.auction.aliases.BidderAliases;
3333
import org.prebid.server.auction.model.AuctionContext;
3434
import org.prebid.server.auction.model.Endpoint;
3535
import org.prebid.server.auction.model.IpAddress;
@@ -89,7 +89,7 @@ public class Ortb2ImplicitParametersResolver {
8989
private static final String BIDDER_EXT = "bidder";
9090

9191
private static final Set<String> IMP_EXT_NON_BIDDER_FIELDS =
92-
Set.of(PREBID_EXT, "context", "all", "general", "skadn", "data", "gpid", "tid", "ae");
92+
Set.of(PREBID_EXT, "context", "all", "general", "skadn", "data", "gpid", "tid");
9393
private static final String OVERRIDE_SOURCE_ID_TEMPLATE = "{{UUID}}";
9494

9595
private final boolean shouldCacheOnlyWinningBids;
@@ -521,10 +521,10 @@ private User populateUser(User user, CaseInsensitiveMultiMap headers, boolean de
521521

522522
return populatedData != null
523523
? Optional.ofNullable(user)
524-
.map(User::toBuilder)
525-
.orElseGet(User::builder)
526-
.data(populatedData)
527-
.build()
524+
.map(User::toBuilder)
525+
.orElseGet(User::builder)
526+
.data(populatedData)
527+
.build()
528528
: null;
529529
}
530530

@@ -625,9 +625,9 @@ private static Set<String> newSegmentsIds(List<Segment> segments, Set<String> ne
625625
? SetUtils.difference(
626626
newIds,
627627
CollectionUtils.emptyIfNull(segments).stream()
628-
.filter(Objects::nonNull)
629-
.map(Segment::getId)
630-
.collect(Collectors.toSet()))
628+
.filter(Objects::nonNull)
629+
.map(Segment::getId)
630+
.collect(Collectors.toSet()))
631631
: newIds;
632632
}
633633

@@ -1030,10 +1030,10 @@ private Imp populateImp(Imp imp,
10301030

10311031
return ObjectUtils.anyNotNull(populatedImpId, populatedImpSecure, populatedImpExt)
10321032
? imp.toBuilder()
1033-
.id(populatedImpId != null ? populatedImpId : impId)
1034-
.secure(populatedImpSecure != null ? populatedImpSecure : impSecure)
1035-
.ext(populatedImpExt != null ? populatedImpExt : impExt)
1036-
.build()
1033+
.id(populatedImpId != null ? populatedImpId : impId)
1034+
.secure(populatedImpSecure != null ? populatedImpSecure : impSecure)
1035+
.ext(populatedImpExt != null ? populatedImpExt : impExt)
1036+
.build()
10371037
: null;
10381038
}
10391039

‎src/main/java/org/prebid/server/bidder/Bidder.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.iab.openrtb.request.BidRequest;
55
import org.prebid.server.bidder.model.BidderBid;
66
import org.prebid.server.bidder.model.BidderCall;
7-
import org.prebid.server.bidder.model.CompositeBidderResponse;
87
import org.prebid.server.bidder.model.HttpRequest;
98
import org.prebid.server.bidder.model.Result;
109

@@ -33,22 +32,6 @@ public interface Bidder<T> {
3332
*/
3433
Result<List<BidderBid>> makeBids(BidderCall<T> httpCall, BidRequest bidRequest);
3534

36-
/**
37-
* Compound Bidder response with bids and other data to be passed back.
38-
* <p>
39-
* The errors should contain a list of errors which explain why this bidder's bids will be
40-
* "subpar" in some way. For example: the server response didn't have the expected format.
41-
*/
42-
default CompositeBidderResponse makeBidderResponse(BidderCall<T> httpCall, BidRequest bidRequest) {
43-
final var result = makeBids(httpCall, bidRequest);
44-
return result != null
45-
? CompositeBidderResponse.builder()
46-
.bids(result.getValue())
47-
.errors(result.getErrors())
48-
.build()
49-
: null;
50-
}
51-
5235
/**
5336
* Extracts targeting from bidder-specific extension. It is safe to assume that {@code ext} is not null.
5437
*/

‎src/main/java/org/prebid/server/bidder/HttpBidderRequester.java‎

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.vertx.core.MultiMap;
99
import org.apache.commons.collections4.CollectionUtils;
1010
import org.apache.commons.lang3.StringUtils;
11-
import org.prebid.server.auction.aliases.BidderAliases;
1211
import org.prebid.server.auction.ExchangeService;
12+
import org.prebid.server.auction.aliases.BidderAliases;
1313
import org.prebid.server.auction.model.BidRejectionReason;
1414
import org.prebid.server.auction.model.BidRejectionTracker;
1515
import org.prebid.server.auction.model.BidderRequest;
@@ -18,7 +18,6 @@
1818
import org.prebid.server.bidder.model.BidderCallType;
1919
import org.prebid.server.bidder.model.BidderError;
2020
import org.prebid.server.bidder.model.BidderSeatBid;
21-
import org.prebid.server.bidder.model.CompositeBidderResponse;
2221
import org.prebid.server.bidder.model.HttpRequest;
2322
import org.prebid.server.bidder.model.HttpResponse;
2423
import org.prebid.server.bidder.model.Result;
@@ -30,8 +29,6 @@
3029
import org.prebid.server.log.LoggerFactory;
3130
import org.prebid.server.model.CaseInsensitiveMultiMap;
3231
import org.prebid.server.proto.openrtb.ext.response.ExtHttpCall;
33-
import org.prebid.server.proto.openrtb.ext.response.ExtIgi;
34-
import org.prebid.server.proto.openrtb.ext.response.FledgeAuctionConfig;
3532
import org.prebid.server.util.HttpUtil;
3633
import org.prebid.server.vertx.httpclient.HttpClient;
3734
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;
@@ -191,9 +188,7 @@ private Future<BidderSeatBid> emptyBidderSeatBidWithErrors(List<BidderError> bid
191188
"The bidder failed to generate any bid requests, but also failed to generate an error"))
192189
: bidderErrors;
193190

194-
return Future.succeededFuture(BidderSeatBid.builder()
195-
.errors(errors)
196-
.build());
191+
return Future.succeededFuture(BidderSeatBid.builder().errors(errors).build());
197192
}
198193

199194
/**
@@ -296,10 +291,7 @@ private <T> Void processHttpCall(Bidder<T> bidder,
296291
return null;
297292
}
298293

299-
/**
300-
* Returns result based on response status code, list of {@link BidderBid}s and other data from bidder.
301-
*/
302-
private static <T> CompositeBidderResponse makeBids(Bidder<T> bidder,
294+
private static <T> Result<List<BidderBid>> makeBids(Bidder<T> bidder,
303295
BidderCall<T> httpCall,
304296
BidRequest bidRequest) {
305297

@@ -309,13 +301,13 @@ private static <T> CompositeBidderResponse makeBids(Bidder<T> bidder,
309301

310302
final int statusCode = httpCall.getResponse().getStatusCode();
311303
if (statusCode == HttpResponseStatus.NO_CONTENT.code()) {
312-
return CompositeBidderResponse.empty();
304+
return Result.empty();
313305
}
314306
if (statusCode != HttpResponseStatus.OK.code()) {
315307
return null;
316308
}
317309

318-
return bidder.makeBidderResponse(toHttpCallWithSafeResponseBody(httpCall), bidRequest);
310+
return bidder.makeBids(toHttpCallWithSafeResponseBody(httpCall), bidRequest);
319311
}
320312

321313
/**
@@ -346,8 +338,6 @@ private static class ResultBuilder<T> {
346338
private final Map<HttpRequest<T>, BidderCall<T>> bidderCallsRecorded = new HashMap<>();
347339
private final List<BidderBid> bidsRecorded = new ArrayList<>();
348340
private final List<BidderError> errorsRecorded = new ArrayList<>();
349-
private final List<ExtIgi> igiRecorded = new ArrayList<>();
350-
private final List<FledgeAuctionConfig> fledgeRecorded = new ArrayList<>();
351341

352342
ResultBuilder(List<HttpRequest<T>> httpRequests,
353343
List<BidderError> previousErrors,
@@ -362,25 +352,23 @@ private static class ResultBuilder<T> {
362352
this.mapper = mapper;
363353
}
364354

365-
void addHttpCall(BidderCall<T> bidderCall, CompositeBidderResponse bidderResponse) {
355+
void addHttpCall(BidderCall<T> bidderCall, Result<List<BidderBid>> bidderResponse) {
366356
bidderCallsRecorded.put(bidderCall.getRequest(), bidderCall);
367357
handleBids(bidderResponse);
368358
handleBidderErrors(bidderResponse);
369359
handleBidderCallError(bidderCall);
370-
handleIgis(bidderResponse);
371-
handleFledgeAuctionConfigs(bidderResponse);
372360
}
373361

374-
private void handleBids(CompositeBidderResponse bidderResponse) {
375-
final List<BidderBid> bids = bidderResponse != null ? bidderResponse.getBids() : null;
362+
private void handleBids(Result<List<BidderBid>> bidderResponse) {
363+
final List<BidderBid> bids = bidderResponse != null ? bidderResponse.getValue() : null;
376364
if (bids != null) {
377365
bidsRecorded.addAll(bids);
378366
completionTracker.processBids(bids);
379367
bidRejectionTracker.succeed(bids);
380368
}
381369
}
382370

383-
private void handleBidderErrors(CompositeBidderResponse bidderResponse) {
371+
private void handleBidderErrors(Result<List<BidderBid>> bidderResponse) {
384372
final List<BidderError> bidderErrors = bidderResponse != null ? bidderResponse.getErrors() : null;
385373
if (bidderErrors != null) {
386374
errorsRecorded.addAll(bidderErrors);
@@ -425,18 +413,6 @@ private void handleBidderCallError(BidderCall<T> bidderCall) {
425413
bidRejectionTracker.rejectImps(requestedImpIds, reason);
426414
}
427415

428-
private void handleFledgeAuctionConfigs(CompositeBidderResponse bidderResponse) {
429-
Optional.ofNullable(bidderResponse)
430-
.map(CompositeBidderResponse::getFledgeAuctionConfigs)
431-
.ifPresent(fledgeRecorded::addAll);
432-
}
433-
434-
private void handleIgis(CompositeBidderResponse bidderResponse) {
435-
Optional.ofNullable(bidderResponse)
436-
.map(CompositeBidderResponse::getIgi)
437-
.ifPresent(igiRecorded::addAll);
438-
}
439-
440416
BidderSeatBid toBidderSeatBid(boolean debugEnabled) {
441417
final List<BidderCall<T>> httpCalls = new ArrayList<>(bidderCallsRecorded.values());
442418
httpRequests.stream()
@@ -454,8 +430,6 @@ BidderSeatBid toBidderSeatBid(boolean debugEnabled) {
454430
.bids(bidsRecorded)
455431
.httpCalls(extHttpCalls)
456432
.errors(errors)
457-
.igi(igiRecorded)
458-
.fledgeAuctionConfigs(fledgeRecorded)
459433
.build();
460434
}
461435

‎src/main/java/org/prebid/server/bidder/consumable/ConsumableBidder.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.prebid.server.bidder.model.BidderBid;
1818
import org.prebid.server.bidder.model.BidderCall;
1919
import org.prebid.server.bidder.model.BidderError;
20-
import org.prebid.server.bidder.model.CompositeBidderResponse;
2120
import org.prebid.server.bidder.model.HttpRequest;
2221
import org.prebid.server.bidder.model.Result;
2322
import org.prebid.server.exception.PreBidException;
@@ -112,23 +111,13 @@ private static MultiMap resolveHeaders() {
112111
}
113112

114113
@Override
115-
@Deprecated(since = "Not used, since Bidder.makeBidderResponse(...) was overridden.")
116114
public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
117-
return Result.withError(BidderError.generic("Invalid method call"));
118-
}
119-
120-
@Override
121-
public CompositeBidderResponse makeBidderResponse(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
122115
try {
123-
final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
124116
final List<BidderError> errors = new ArrayList<>();
125-
126-
return CompositeBidderResponse.builder()
127-
.bids(extractConsumableBids(bidRequest, bidResponse, errors))
128-
.errors(errors)
129-
.build();
117+
final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
118+
return Result.of(extractConsumableBids(bidRequest, bidResponse, errors), errors);
130119
} catch (DecodeException e) {
131-
return CompositeBidderResponse.withError(BidderError.badServerResponse(e.getMessage()));
120+
return Result.withError(BidderError.badServerResponse(e.getMessage()));
132121
}
133122
}
134123

‎src/main/java/org/prebid/server/bidder/criteo/CriteoBidResponse.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)