Merge branch 'master' into PREB-48

Author: andreacastello

extra/pom.xml

@@ -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>
@@ -50,7 +50,7 @@
         <metrics-influxdb.version>1.3.4</metrics-influxdb.version>
         <vertx.prometheus.version>0.16.0</vertx.prometheus.version>
         <iabtcf.version>2.0.10</iabtcf.version>
-        <gpp-encoder.version>3.2.3</gpp-encoder.version>
+        <gpp-encoder.version>3.2.4</gpp-encoder.version>
         <maxmind-client.version>4.2.1</maxmind-client.version>
         <protobuf.version>3.25.6</protobuf.version>
         <protoc.version>${protobuf.version}</protoc.version>

sample/configs/prebid-config.yaml

@@ -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:

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

@@ -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;

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

@@ -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;
@@ -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;
@@ -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;
@@ -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());

src/main/java/org/prebid/server/auction/SkippedAuctionService.java

@@ -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;

src/main/java/org/prebid/server/auction/VideoStoredRequestProcessor.java

@@ -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)));
@@ -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) {
 
@@ -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)) {