Skip to content

Commit e95f416

Browse files
AntoxaAntoxicAntoxaAntoxic
committed
Fix comments
1 parent 5ff5b60 commit e95f416

File tree

45 files changed

+136
-185
lines changed

Some content is hidden

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

45 files changed

+136
-185
lines changed

‎extra/modules/ortb2-blocking/src/main/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingBidderRequestHook.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.iab.openrtb.request.BidRequest;
44
import io.vertx.core.Future;
5-
import org.prebid.server.auction.BidderAliases;
5+
import org.prebid.server.auction.aliases.BidderAliases;
66
import org.prebid.server.auction.versionconverter.OrtbVersion;
77
import org.prebid.server.bidder.BidderCatalog;
88
import org.prebid.server.hooks.execution.v1.InvocationResultImpl;

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.commons.lang3.BooleanUtils;
2424
import org.apache.commons.lang3.ObjectUtils;
2525
import org.apache.commons.lang3.StringUtils;
26+
import org.prebid.server.auction.aliases.BidderAliases;
2627
import org.prebid.server.auction.categorymapping.CategoryMappingService;
2728
import org.prebid.server.auction.model.AuctionContext;
2829
import org.prebid.server.auction.model.AuctionParticipation;
@@ -769,24 +770,16 @@ private static List<BidInfo> injectTargeting(List<BidInfo> bidderImpIdBidInfos,
769770
final int multiBidSize = bidderImpIdBidInfos.size();
770771
for (int i = 0; i < multiBidSize; i++) {
771772
// first bid have the highest value and can't be extra bid
772-
final boolean isFirstBid = i == 0;
773-
final String targetingBidderCode = isFirstBid
774-
? bidder
775-
: bidderCodePrefix == null ? null : bidderCodePrefix + (i + 1);
776-
773+
final String targetingBidderCode = targetingCode(bidder, bidderCodePrefix, i);
777774
final BidInfo bidInfo = bidderImpIdBidInfos.get(i);
778775

779-
final String targetingSeat = isFirstBid
780-
? bidInfo.getSeat()
781-
: bidderCodePrefix == null ? null : bidderCodePrefix + (i + 1);
782-
783776
final TargetingInfo targetingInfo = TargetingInfo.builder()
784777
.isTargetingEnabled(targetingBidderCode != null)
785778
.isBidderWinningBid(winningBidsByBidder.contains(bidInfo))
786779
.isWinningBid(winningBids.contains(bidInfo))
787780
.isAddTargetBidderCode(targetingBidderCode != null && multiBidSize > 1)
788781
.bidderCode(targetingBidderCode)
789-
.seat(targetingSeat)
782+
.seat(targetingCode(bidInfo.getSeat(), bidderCodePrefix, i))
790783
.build();
791784

792785
final BidInfo modifiedBidInfo = bidInfo.toBuilder().targetingInfo(targetingInfo).build();
@@ -796,6 +789,14 @@ private static List<BidInfo> injectTargeting(List<BidInfo> bidderImpIdBidInfos,
796789
return result;
797790
}
798791

792+
private static String targetingCode(String base, String prefix, int i) {
793+
if (i == 0) {
794+
return base;
795+
}
796+
797+
return prefix != null ? prefix + (i + 1) : null;
798+
}
799+
799800
/**
800801
* Returns {@link ExtBidResponse} object, populated with response time, errors and debug info (if requested)
801802
* from all bidders.

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.iab.openrtb.request.BidRequest;
44
import com.iab.openrtb.response.Bid;
5+
import org.prebid.server.auction.aliases.BidderAliases;
56
import org.prebid.server.auction.model.AuctionContext;
67
import org.prebid.server.auction.model.AuctionParticipation;
78
import org.prebid.server.auction.model.BidderResponse;
@@ -43,11 +44,7 @@ public List<AuctionParticipation> validateAndAdjustBids(List<AuctionParticipatio
4344
BidderAliases aliases) {
4445

4546
return auctionParticipations.stream()
46-
.map(auctionParticipation -> validBidderResponse(
47-
auctionParticipation,
48-
auctionContext,
49-
aliases))
50-
47+
.map(auctionParticipation -> validBidderResponse(auctionParticipation, auctionContext, aliases))
5148
.map(auctionParticipation -> bidAdjustmentsProcessor.enrichWithAdjustedBids(
5249
auctionParticipation,
5350
auctionContext.getBidRequest(),

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

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import org.prebid.server.activity.infrastructure.payload.ActivityInvocationPayload;
2929
import org.prebid.server.activity.infrastructure.payload.impl.ActivityInvocationPayloadImpl;
3030
import org.prebid.server.activity.infrastructure.payload.impl.BidRequestActivityInvocationPayload;
31+
import org.prebid.server.auction.aliases.AlternateBidderCodesConfig;
32+
import org.prebid.server.auction.aliases.BidderAliases;
3133
import org.prebid.server.auction.mediatypeprocessor.MediaTypeProcessingResult;
3234
import org.prebid.server.auction.mediatypeprocessor.MediaTypeProcessor;
3335
import org.prebid.server.auction.model.AuctionContext;
@@ -271,10 +273,8 @@ private Future<AuctionContext> runAuction(AuctionContext receivedContext) {
271273
context.getBidRejectionTrackers()))
272274
.map(auctionParticipations -> dropZeroNonDealBids(
273275
auctionParticipations, debugWarnings, debugEnabled))
274-
.map(auctionParticipations -> bidsAdjuster.validateAndAdjustBids(
275-
auctionParticipations,
276-
context,
277-
aliases))
276+
.map(auctionParticipations ->
277+
bidsAdjuster.validateAndAdjustBids(auctionParticipations, context, aliases))
278278
.map(auctionParticipations -> updateResponsesMetrics(auctionParticipations, account, aliases))
279279
.map(context::with))
280280
// produce response from bidder results
@@ -297,9 +297,11 @@ private BidderAliases aliases(BidRequest bidRequest, Account account) {
297297
? prebid.getAlternateBidderCodes()
298298
: null;
299299

300-
return alternateBidderCodes != null
301-
? BidderAliases.of(aliases, aliasgvlids, bidderCatalog, alternateBidderCodes)
302-
: BidderAliases.of(aliases, aliasgvlids, bidderCatalog, account.getAlternateBidderCodes());
300+
final AlternateBidderCodesConfig alternateBidderCodesConfig = ObjectUtils.defaultIfNull(
301+
alternateBidderCodes,
302+
account.getAlternateBidderCodes());
303+
304+
return BidderAliases.of(aliases, aliasgvlids, bidderCatalog, alternateBidderCodesConfig);
303305
}
304306

305307
private static ExtRequestTargeting targeting(BidRequest bidRequest) {
@@ -1246,42 +1248,31 @@ private BidderSeatBid populateBidderCode(BidderSeatBid seatBid, String bidderNam
12461248
.seat(ObjectUtils.defaultIfNull(bidderBid.getSeat(), bidderName))
12471249
.bid(bidderBid.getBid().toBuilder()
12481250
.ext(prepareBidExt(
1249-
bidderBid.getBid(),
1251+
bidderBid.getBid().getExt(),
12501252
bidderCatalog.configuredName(resolvedBidderName)))
12511253
.build())
12521254
.build())
12531255
.toList());
12541256
}
12551257

1256-
private ObjectNode prepareBidExt(Bid bid, String bidderName) {
1257-
final ObjectNode bidExt = bid.getExt();
1258-
final ObjectNode extPrebid = bidExt != null ? (ObjectNode) bidExt.get(PREBID_EXT) : null;
1259-
final ExtBidPrebidMeta meta = extPrebid != null
1260-
? getExtPrebidMeta(extPrebid.get(PREBID_META_EXT))
1261-
: null;
1258+
private ObjectNode prepareBidExt(ObjectNode bidExt, String bidderName) {
1259+
final ObjectNode updatedBidExt = bidExt != null ? bidExt : mapper.mapper().createObjectNode();
12621260

1263-
final ExtBidPrebidMeta updatedMeta = Optional.ofNullable(meta)
1264-
.map(ExtBidPrebidMeta::toBuilder)
1265-
.orElseGet(ExtBidPrebidMeta::builder)
1266-
.adapterCode(bidderName)
1267-
.build();
1261+
final ObjectNode extPrebid = objectNodeFromOrNew(updatedBidExt, PREBID_EXT);
1262+
final ObjectNode extPrebidMeta = objectNodeFromOrNew(extPrebid, PREBID_META_EXT);
12681263

1269-
final ObjectNode updatedBidExt = bidExt != null ? bidExt : mapper.mapper().createObjectNode();
1270-
final ObjectNode updatedBidExtPrebid = extPrebid != null ? extPrebid : mapper.mapper().createObjectNode();
1271-
updatedBidExtPrebid.set(PREBID_META_EXT, mapper.mapper().valueToTree(updatedMeta));
1272-
updatedBidExt.set(PREBID_EXT, mapper.mapper().valueToTree(updatedBidExtPrebid));
1264+
final ObjectNode newData = mapper.mapper().valueToTree(
1265+
ExtBidPrebidMeta.builder().adapterCode(bidderName).build());
1266+
extPrebidMeta.setAll(newData);
12731267

12741268
return updatedBidExt;
12751269
}
12761270

1277-
private ExtBidPrebidMeta getExtPrebidMeta(JsonNode bidExtPrebidMeta) {
1278-
try {
1279-
return bidExtPrebidMeta != null
1280-
? mapper.mapper().convertValue(bidExtPrebidMeta, ExtBidPrebidMeta.class)
1281-
: null;
1282-
} catch (IllegalArgumentException e) {
1283-
return null;
1284-
}
1271+
private ObjectNode objectNodeFromOrNew(ObjectNode parent, String key) {
1272+
final JsonNode childNode = parent.get(key);
1273+
return childNode == null || !childNode.isObject()
1274+
? parent.putObject(key)
1275+
: (ObjectNode) childNode;
12851276
}
12861277

12871278
private BidRequest adjustTmax(BidRequest bidRequest,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.fasterxml.jackson.databind.node.IntNode;
55
import com.fasterxml.jackson.databind.node.ObjectNode;
66
import com.iab.openrtb.request.Imp;
7+
import org.prebid.server.auction.aliases.BidderAliases;
78
import org.prebid.server.json.JacksonMapper;
89
import org.prebid.server.json.JsonMerger;
910
import org.prebid.server.validation.ImpValidator;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.iab.openrtb.request.User;
44
import org.apache.commons.collections4.map.CaseInsensitiveMap;
55
import org.apache.commons.lang3.StringUtils;
6+
import org.prebid.server.auction.aliases.BidderAliases;
67
import org.prebid.server.auction.model.AuctionContext;
78
import org.prebid.server.bidder.BidderCatalog;
89
import org.prebid.server.cookie.UidsCookie;

src/main/java/org/prebid/server/proto/openrtb/ext/request/AlternateBidder.java renamed to src/main/java/org/prebid/server/auction/aliases/AlternateBidder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.proto.openrtb.ext.request;
1+
package org.prebid.server.auction.aliases;
22

33
import java.util.Set;
44

‎src/main/java/org/prebid/server/auction/aliases/AlternateBidderCodesConfig.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.prebid.server.auction.aliases;
2+
3+
import java.util.Map;
4+
5+
public interface AlternateBidderCodesConfig {
6+
7+
Boolean getEnabled();
8+
9+
<T extends AlternateBidder> Map<String, T> getBidders();
10+
}

src/main/java/org/prebid/server/auction/BidderAliases.java renamed to src/main/java/org/prebid/server/auction/aliases/BidderAliases.java

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
package org.prebid.server.auction;
1+
package org.prebid.server.auction.aliases;
22

33
import org.apache.commons.collections4.MapUtils;
44
import org.apache.commons.collections4.map.CaseInsensitiveMap;
55
import org.apache.commons.lang3.BooleanUtils;
66
import org.apache.commons.lang3.StringUtils;
77
import org.prebid.server.bidder.BidderCatalog;
8-
import org.prebid.server.proto.openrtb.ext.request.AlternateBidder;
9-
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidAlternateBidderCodes;
10-
import org.prebid.server.settings.model.AccountAlternateBidderCodes;
118

129
import java.util.Collection;
1310
import java.util.Collections;
@@ -16,7 +13,6 @@
1613
import java.util.Optional;
1714
import java.util.Set;
1815
import java.util.TreeSet;
19-
import java.util.function.Function;
2016
import java.util.stream.Collectors;
2117

2218
/**
@@ -55,27 +51,13 @@ public static BidderAliases of(Map<String, String> aliasToBidder,
5551
public static BidderAliases of(Map<String, String> aliasToBidder,
5652
Map<String, Integer> aliasToVendorId,
5753
BidderCatalog bidderCatalog,
58-
AccountAlternateBidderCodes alternateBidderCodes) {
54+
AlternateBidderCodesConfig alternateBidderCodes) {
5955

60-
final Map<String, Set<String>> bidderToAllowedSeats = resolveAlternateBidderCodes(
61-
alternateBidderCodes,
62-
AccountAlternateBidderCodes::getEnabled,
63-
AccountAlternateBidderCodes::getBidders);
64-
65-
return new BidderAliases(aliasToBidder, aliasToVendorId, bidderToAllowedSeats, bidderCatalog);
66-
}
67-
68-
public static BidderAliases of(Map<String, String> aliasToBidder,
69-
Map<String, Integer> aliasToVendorId,
70-
BidderCatalog bidderCatalog,
71-
ExtRequestPrebidAlternateBidderCodes alternateBidderCodes) {
72-
73-
final Map<String, Set<String>> bidderToAllowedSeats = resolveAlternateBidderCodes(
74-
alternateBidderCodes,
75-
ExtRequestPrebidAlternateBidderCodes::getEnabled,
76-
ExtRequestPrebidAlternateBidderCodes::getBidders);
77-
78-
return new BidderAliases(aliasToBidder, aliasToVendorId, bidderToAllowedSeats, bidderCatalog);
56+
return new BidderAliases(
57+
aliasToBidder,
58+
aliasToVendorId,
59+
resolveAlternateBidderCodes(alternateBidderCodes),
60+
bidderCatalog);
7961
}
8062

8163
public boolean isAliasDefined(String alias) {
@@ -108,13 +90,11 @@ public boolean isAllowedAlternateBidderCode(String bidder, String alternateBidde
10890
}
10991

11092
private static <T> Map<String, Set<String>> resolveAlternateBidderCodes(
111-
T alternateBidderCodes,
112-
Function<T, Boolean> isEnabled,
113-
Function<T, Map<String, ? extends AlternateBidder>> getBidders) {
93+
AlternateBidderCodesConfig alternateBidderCodes) {
11494

11595
return Optional.ofNullable(alternateBidderCodes)
116-
.filter(codes -> BooleanUtils.isTrue(isEnabled.apply(codes)))
117-
.map(getBidders::apply)
96+
.filter(config -> BooleanUtils.isTrue(config.getEnabled()))
97+
.map(AlternateBidderCodesConfig::getBidders)
11898
.map(Map::entrySet)
11999
.stream()
120100
.flatMap(Collection::stream)
@@ -129,8 +109,13 @@ private static <T> Map<String, Set<String>> resolveAlternateBidderCodes(
129109

130110
private static Set<String> allowedBidderCodes(AlternateBidder alternateBidder) {
131111
final Set<String> allowedBidderCodes = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
132-
Optional.ofNullable(alternateBidder.getAllowedBidderCodes())
133-
.ifPresentOrElse(allowedBidderCodes::addAll, () -> allowedBidderCodes.add(WILDCARD));
112+
final Set<String> alternateCodes = alternateBidder.getAllowedBidderCodes();
113+
114+
if (alternateCodes == null) {
115+
allowedBidderCodes.add(WILDCARD);
116+
} else {
117+
allowedBidderCodes.addAll(alternateCodes);
118+
}
134119
return allowedBidderCodes;
135120
}
136121
}

‎src/main/java/org/prebid/server/auction/mediatypeprocessor/BidderMediaTypeProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.iab.openrtb.request.BidRequest;
44
import com.iab.openrtb.request.Imp;
55
import org.apache.commons.collections4.SetUtils;
6-
import org.prebid.server.auction.BidderAliases;
6+
import org.prebid.server.auction.aliases.BidderAliases;
77
import org.prebid.server.bidder.BidderCatalog;
88
import org.prebid.server.bidder.BidderInfo;
99
import org.prebid.server.bidder.model.BidderError;

0 commit comments

Comments
 (0)