prebid · Compile-Ninja · Oct 16, 2024 · Sep 30, 2024 · Sep 30, 2024 · Oct 1, 2024
diff --git a/extra/bundle/pom.xml b/extra/bundle/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid</groupId>
  <artifactId>prebid-server-aggregator</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  <relativePath>../../extra/pom.xml</relativePath>
  </parent>
 

diff --git a/extra/modules/confiant-ad-quality/pom.xml b/extra/modules/confiant-ad-quality/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid.server.hooks.modules</groupId>
  <artifactId>all-modules</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>confiant-ad-quality</artifactId>

diff --git a/extra/modules/fiftyone-devicedetection/pom.xml b/extra/modules/fiftyone-devicedetection/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid.server.hooks.modules</groupId>
  <artifactId>all-modules</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>fiftyone-devicedetection</artifactId>

diff --git a/extra/modules/ortb2-blocking/pom.xml b/extra/modules/ortb2-blocking/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid.server.hooks.modules</groupId>
  <artifactId>all-modules</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>ortb2-blocking</artifactId>

diff --git a/extra/modules/pb-response-correction/pom.xml b/extra/modules/pb-response-correction/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid.server.hooks.modules</groupId>
  <artifactId>all-modules</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>pb-response-correction</artifactId>

diff --git a/extra/modules/pb-richmedia-filter/pom.xml b/extra/modules/pb-richmedia-filter/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid.server.hooks.modules</groupId>
  <artifactId>all-modules</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>pb-richmedia-filter</artifactId>

diff --git a/extra/modules/pom.xml b/extra/modules/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid</groupId>
  <artifactId>prebid-server-aggregator</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  <relativePath>../../extra/pom.xml</relativePath>
  </parent>
 

diff --git a/extra/pom.xml b/extra/pom.xml
@@ -4,7 +4,7 @@
 
  <groupId>org.prebid</groupId>
  <artifactId>prebid-server-aggregator</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  <packaging>pom</packaging>
 
  <scm>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.prebid</groupId>
  <artifactId>prebid-server-aggregator</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
  <relativePath>extra/pom.xml</relativePath>
  </parent>
 

diff --git a/src/main/java/com/iab/openrtb/request/Eid.java b/src/main/java/com/iab/openrtb/request/Eid.java
@@ -1,33 +1,24 @@
 package com.iab.openrtb.request;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.Builder;
 import lombok.Value;
 
 import java.util.List;
 
-/**
- * Extended identifiers support in the OpenRTB specification allows buyers
- * to use audience data in real-time bidding. This object can contain one
- * or more {@link Uid}s from a single source or a technology provider. The
- * exchange should ensure that business agreements allow for the sending
- * of this data.
- */
-@Value(staticConstructor = "of")
+@Value
+@Builder(toBuilder = true)
 public class Eid {
 
- /**
- * Source or technology provider responsible for the set of included IDs. Expressed as a top-level domain.
- */
  String source;
 
- /**
- * Array of extended ID {@link Uid} objects from the given source.
- * Refer to 3.2.28 Extended Identifier UIDs
- */
  List<Uid> uids;
 
- /**
- * Placeholder for vendor specific extensions to this object
- */
+ String inserter;
+
+ String matcher;
+
+ Integer mm;
+
  ObjectNode ext;
 }
diff --git a/src/main/java/com/iab/openrtb/request/Uid.java b/src/main/java/com/iab/openrtb/request/Uid.java
@@ -1,14 +1,16 @@
 package com.iab.openrtb.request;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.Builder;
 import lombok.Value;
 
 /**
  * This object contains a single user identifier provided as part of
  * extended identifiers. The exchange should ensure that business
  * agreements allow for the sending of this data.
  */
-@Value(staticConstructor = "of")
+@Value
+@Builder(toBuilder = true)
 public class Uid {
 
  /**

diff --git a/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java b/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java
@@ -239,8 +239,12 @@ private boolean isNotAllowedAdapterByGlobalOrAccountAnalyticsConfig(String adapt
 
  if (modules != null && modules.containsKey(adapter)) {
  final ObjectNode moduleConfig = modules.get(adapter);
- return moduleConfig == null || !moduleConfig.has("enabled")
- || !moduleConfig.get("enabled").asBoolean();
+
+ if (moduleConfig == null || !moduleConfig.has("enabled")) {
+ return false;
+ }
+
+ return !moduleConfig.get("enabled").asBoolean();
  }
 
  return !globalEnabledAdapters.contains(adapter);
@@ -421,12 +425,13 @@ private AuctionContext updateAuctionContext(AuctionContext context, String adapt
  if (modules != null && modules.containsKey(adapterName)) {
  final ObjectNode moduleConfig = modules.get(adapterName);
  if (moduleConfigContainsAdapterSpecificData(moduleConfig)) {
- final JsonNode analyticsNode = Optional.ofNullable(context.getBidRequest())
+ final ExtRequestPrebid extRequestPrebid = Optional.ofNullable(context.getBidRequest())
  .map(BidRequest::getExt)
  .map(ExtRequest::getPrebid)
- .map(ExtRequestPrebid::getAnalytics)
  .orElse(null);
 
+ final JsonNode analyticsNode = extRequestPrebid != null ? extRequestPrebid.getAnalytics() : null;
+
  if (analyticsNode != null && analyticsNode.isObject()) {
  final ObjectNode adapterNode = Optional.ofNullable((ObjectNode) analyticsNode.get(adapterName))
  .orElse(mapper.mapper().createObjectNode());
@@ -439,7 +444,7 @@ private AuctionContext updateAuctionContext(AuctionContext context, String adapt
  });
 
  ((ObjectNode) analyticsNode).set(adapterName, adapterNode);
- final ExtRequestPrebid updatedPrebid = ExtRequestPrebid.builder()
+ final ExtRequestPrebid updatedPrebid = extRequestPrebid.toBuilder()
  .analytics(analyticsNode)
  .build();
  final ExtRequest updatedExtRequest = ExtRequest.of(updatedPrebid);

diff --git a/src/main/java/org/prebid/server/auction/BidResponseCreator.java b/src/main/java/org/prebid/server/auction/BidResponseCreator.java
@@ -18,6 +18,7 @@
 import io.vertx.core.CompositeFuture;
 import io.vertx.core.Future;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -191,10 +192,11 @@ Future<BidResponse> createOnSkippedAuction(AuctionContext auctionContext, List<S
  .tmaxrequest(bidRequest.getTmax())
  .build();
 
+ final List<String> cur = bidRequest.getCur();
  final BidResponse bidResponse = BidResponse.builder()
  .id(bidRequest.getId())
- .cur(Stream.ofNullable(bidRequest.getCur()).flatMap(Collection::stream).findFirst().orElse(null))
- .seatbid(Optional.ofNullable(seatBids).orElse(Collections.emptyList()))
+ .cur(CollectionUtils.isNotEmpty(cur) ? cur.getFirst() : null)
+ .seatbid(ListUtils.emptyIfNull(seatBids))
  .ext(extBidResponse)
  .build();
 

diff --git a/src/main/java/org/prebid/server/auction/BidsAdjuster.java b/src/main/java/org/prebid/server/auction/BidsAdjuster.java
@@ -95,8 +95,9 @@ private AuctionParticipation validBidderResponse(AuctionParticipation auctionPar
 
  final List<String> requestCurrencies = bidRequest.getCur();
  if (requestCurrencies.size() > 1) {
- errors.add(BidderError.badInput("Cur parameter contains more than one currency. %s will be used"
- .formatted(requestCurrencies.getFirst())));
+ warnings.add(BidderError.badInput(
+ "a single currency (" + requestCurrencies.getFirst() + ") has been chosen for the request. "
+ + "ORTB 2.6 requires that all responses are in the same currency."));
  }
 
  final List<BidderBid> bids = seatBid.getBids();
@@ -118,9 +119,7 @@ private AuctionParticipation validBidderResponse(AuctionParticipation auctionPar
  }
  }
 
- final BidderResponse resultBidderResponse = errors.size() == seatBid.getErrors().size()
- ? bidderResponse
- : bidderResponse.with(
+ final BidderResponse resultBidderResponse = bidderResponse.with(
  seatBid.toBuilder()
  .bids(validBids)
  .errors(errors)