Skip to content

[pull] master from prebid:master #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Sep 4, 2025
Merged

[pull] master from prebid:master #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c7fe2b
Dependencies: Bump Spring Boot and Vert.x minor version (#4164)
Net-burst Sep 4, 2025
3af4507
Smartadserver: Add second endpoint for programmatic guaranteed (#4163)
AntoxaAntoxic Sep 4, 2025
fc0fd73
Fix issue with invalid functional tests (#4172)
osulzhenko Sep 4, 2025
a526e37
Add profiles (#4007)
CTMBNara Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<checkstyle.version>10.17.0</checkstyle.version>

<!-- Project production dependency versions -->
<spring.boot.version>3.4.5</spring.boot.version>
<vertx.version>4.5.14</vertx.version>
<spring.boot.version>3.5.5</spring.boot.version>
<vertx.version>4.5.20</vertx.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<commons.collections.version>4.4</commons.collections.version>
<commons.compress.version>1.27.1</commons.compress.version>
Expand Down
1 change: 1 addition & 0 deletions sample/configs/prebid-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ settings:
settings-filename: sample/configs/sample-app-settings.yaml
stored-requests-dir: sample
stored-imps-dir: sample
profiles-dir: sample
stored-responses-dir: sample
categories-dir:
gdpr:
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/prebid/server/auction/BidResponseCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.prebid.server.auction.categorymapping.CategoryMappingService;
import org.prebid.server.auction.externalortb.StoredRequestProcessor;
import org.prebid.server.auction.model.AuctionContext;
import org.prebid.server.auction.model.AuctionParticipation;
import org.prebid.server.auction.model.BidInfo;
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/org/prebid/server/auction/ExchangeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.prebid.server.activity.Activity;
import org.prebid.server.activity.ComponentType;
import org.prebid.server.activity.infrastructure.ActivityInfrastructure;
Expand All @@ -31,6 +32,7 @@
import org.prebid.server.activity.infrastructure.payload.impl.BidRequestActivityInvocationPayload;
import org.prebid.server.auction.aliases.AlternateBidderCodesConfig;
import org.prebid.server.auction.aliases.BidderAliases;
import org.prebid.server.auction.externalortb.StoredResponseProcessor;
import org.prebid.server.auction.mediatypeprocessor.MediaTypeProcessingResult;
import org.prebid.server.auction.mediatypeprocessor.MediaTypeProcessor;
import org.prebid.server.auction.model.AuctionContext;
Expand Down Expand Up @@ -101,7 +103,6 @@
import org.prebid.server.util.ListUtil;
import org.prebid.server.util.PbsUtil;
import org.prebid.server.util.StreamUtil;
import org.apache.commons.lang3.tuple.Pair;

import java.math.BigDecimal;
import java.time.Clock;
Expand Down Expand Up @@ -570,10 +571,10 @@ private static List<String> firstPartyDataBidders(ExtRequest requestExt) {
}

private Map<String, Pair<User, Device>> prepareUsersAndDevices(List<String> bidders,
AuctionContext context,
BidderAliases aliases,
Map<String, ExtBidderConfigOrtb> biddersToConfigs,
Map<String, List<String>> eidPermissions) {
AuctionContext context,
BidderAliases aliases,
Map<String, ExtBidderConfigOrtb> biddersToConfigs,
Map<String, List<String>> eidPermissions) {

final BidRequest bidRequest = context.getBidRequest();
final List<String> firstPartyDataBidders = firstPartyDataBidders(bidRequest.getExt());
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/prebid/server/auction/SkippedAuctionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.prebid.server.auction.externalortb.StoredResponseProcessor;
import org.prebid.server.auction.model.AuctionContext;
import org.prebid.server.auction.model.StoredResponseResult;
import org.prebid.server.bidder.model.BidderError;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/prebid/server/auction/VideoStoredRequestProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ private static BidRequest readBidRequest(String defaultBidRequestPath,
: null;
}

private StoredDataResult updateMetrics(StoredDataResult storedDataResult,
Set<String> requestIds,
Set<String> impIds) {
private StoredDataResult<String> updateMetrics(StoredDataResult<String> storedDataResult,
Set<String> requestIds,
Set<String> impIds) {

requestIds.forEach(
id -> metrics.updateStoredRequestMetric(storedDataResult.getStoredIdToRequest().containsKey(id)));
Expand All @@ -142,7 +142,7 @@ private StoredDataResult updateMetrics(StoredDataResult storedDataResult,
return storedDataResult;
}

private WithPodErrors<BidRequest> toBidRequestWithPodErrors(StoredDataResult storedResult,
private WithPodErrors<BidRequest> toBidRequestWithPodErrors(StoredDataResult<String> storedResult,
BidRequestVideo videoRequest,
String storedBidRequestId) {

Expand All @@ -161,7 +161,7 @@ private WithPodErrors<BidRequest> toBidRequestWithPodErrors(StoredDataResult sto

private BidRequestVideo mergeBidRequest(BidRequestVideo originalRequest,
String storedRequestId,
StoredDataResult storedDataResult) {
StoredDataResult<String> storedDataResult) {

final String storedRequest = storedDataResult.getStoredIdToRequest().get(storedRequestId);
if (enforceStoredRequest && StringUtils.isBlank(storedRequest)) {
Expand Down
Loading
Loading