New Adapter: 360playvid

extra/bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid</groupId>
         <artifactId>prebid-server-aggregator</artifactId>
-        <version>3.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
         <relativePath>../../extra/pom.xml</relativePath>
     </parent>
 

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.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>confiant-ad-quality</artifactId>

extra/modules/fiftyone-devicedetection/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>fiftyone-devicedetection</artifactId>

extra/modules/greenbids-real-time-data/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>greenbids-real-time-data</artifactId>

extra/modules/live-intent-omni-channel-identity/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>live-intent-omni-channel-identity</artifactId>

extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/model/config/LiveIntentOmniChannelProperties.java

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 
-import java.util.List;
+import java.util.Set;
 
 @Data
 public final class LiveIntentOmniChannelProperties {
@@ -15,5 +15,5 @@ public final class LiveIntentOmniChannelProperties {
 
     float treatmentRate;
 
-    List<String> targetBidders;
+    Set<String> targetBidders;
 }

extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/hooks/LiveIntentOmniChannelIdentityProcessedAuctionRequestHook.java

@@ -9,6 +9,7 @@
 import io.vertx.core.MultiMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.collections4.SetUtils;
 import org.prebid.server.activity.Activity;
 import org.prebid.server.activity.ComponentType;
 import org.prebid.server.activity.infrastructure.ActivityInfrastructure;
@@ -40,18 +41,15 @@
 import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions;
 import org.prebid.server.util.HttpUtil;
 import org.prebid.server.util.ListUtil;
-import org.prebid.server.util.StreamUtil;
 import org.prebid.server.vertx.httpclient.HttpClient;
 import org.prebid.server.vertx.httpclient.model.HttpClientResponse;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class LiveIntentOmniChannelIdentityProcessedAuctionRequestHook implements ProcessedAuctionRequestHook {
 
@@ -65,7 +63,7 @@ public class LiveIntentOmniChannelIdentityProcessedAuctionRequestHook implements
     private final HttpClient httpClient;
     private final UserFpdActivityMask userFpdActivityMask;
     private final double logSamplingRate;
-    private final List<String> targetBidders;
+    private final Set<String> targetBidders;
 
     public LiveIntentOmniChannelIdentityProcessedAuctionRequestHook(LiveIntentOmniChannelProperties config,
                                                                     UserFpdActivityMask userFpdActivityMask,
@@ -79,7 +77,7 @@ public LiveIntentOmniChannelIdentityProcessedAuctionRequestHook(LiveIntentOmniCh
         this.httpClient = Objects.requireNonNull(httpClient);
         this.logSamplingRate = logSamplingRate;
         this.userFpdActivityMask = Objects.requireNonNull(userFpdActivityMask);
-        this.targetBidders = ListUtils.emptyIfNull(config.getTargetBidders());
+        this.targetBidders = SetUtils.emptyIfNull(config.getTargetBidders());
     }
 
     @Override
@@ -202,14 +200,22 @@ private AuctionRequestPayload updatedPayload(AuctionRequestPayload requestPayloa
     }
 
     private BidRequest updateAllowedBidders(BidRequest bidRequest, List<Eid> resolvedEids) {
-        if (targetBidders.isEmpty()) {
+        if (CollectionUtils.isEmpty(targetBidders) || CollectionUtils.isEmpty(resolvedEids)) {
             return bidRequest;
         }
 
         final ExtRequest ext = bidRequest.getExt();
         final ExtRequestPrebid extPrebid = ext != null ? ext.getPrebid() : null;
         final ExtRequestPrebidData extPrebidData = extPrebid != null ? extPrebid.getData() : null;
 
+        final List<ExtRequestPrebidDataEidPermissions> existingPerms = extPrebidData != null
+                ? extPrebidData.getEidPermissions()
+                : null;
+
+        if (CollectionUtils.isEmpty(existingPerms)) {
+            return bidRequest;
+        }
+
         final ExtRequestPrebid updatedExtPrebid = Optional.ofNullable(extPrebid)
                 .map(ExtRequestPrebid::toBuilder)
                 .orElseGet(ExtRequestPrebid::builder)
@@ -225,35 +231,38 @@ private BidRequest updateAllowedBidders(BidRequest bidRequest, List<Eid> resolve
     }
 
     private ExtRequestPrebidData updatePrebidData(ExtRequestPrebidData extPrebidData, List<Eid> resolvedEids) {
-        final List<String> prebidDataBidders = extPrebidData != null ? extPrebidData.getBidders() : null;
-        final List<String> updatedPrebidDataBidders = prebidDataBidders != null
-                ? (List<String>) CollectionUtils.union(targetBidders, prebidDataBidders)
-                : targetBidders;
-
-        final Set<String> resolvedSources = resolvedEids.stream().map(Eid::getSource).collect(Collectors.toSet());
-
-        final List<ExtRequestPrebidDataEidPermissions> initialPermissions = Optional.ofNullable(extPrebidData)
-                .map(ExtRequestPrebidData::getEidPermissions)
-                .orElse(Collections.emptyList());
-        final List<ExtRequestPrebidDataEidPermissions> updatedPermissions = Stream.concat(
-                        initialPermissions.stream()
-                                .map(permission -> updateEidPermission(permission, resolvedSources)),
-                        resolvedSources.stream()
-                                .map(source -> ExtRequestPrebidDataEidPermissions.of(source, targetBidders)))
-                .filter(StreamUtil.distinctBy(ExtRequestPrebidDataEidPermissions::getSource))
+        final List<String> originalBidders = extPrebidData != null ? extPrebidData.getBidders() : null;
+
+        final Set<String> resolvedSources = resolvedEids.stream()
+                .map(Eid::getSource)
+                .collect(Collectors.toSet());
+
+        final List<ExtRequestPrebidDataEidPermissions> updatedPermissions = extPrebidData.getEidPermissions().stream()
+                .map(permission -> restrictEidPermission(permission, resolvedSources))
+                .filter(Objects::nonNull)
                 .toList();
 
-        return ExtRequestPrebidData.of(updatedPrebidDataBidders, updatedPermissions);
+        return ExtRequestPrebidData.of(originalBidders, updatedPermissions);
     }
 
-    private ExtRequestPrebidDataEidPermissions updateEidPermission(ExtRequestPrebidDataEidPermissions permission,
-                                                                   Set<String> resolvedSources) {
+    private ExtRequestPrebidDataEidPermissions restrictEidPermission(ExtRequestPrebidDataEidPermissions permission,
+                                                                     Set<String> resolvedSources) {
 
-        return resolvedSources.contains(permission.getSource())
-                ? ExtRequestPrebidDataEidPermissions.of(
-                permission.getSource(),
-                (List<String>) CollectionUtils.union(permission.getBidders(), targetBidders))
-                : permission;
+        if (!resolvedSources.contains(permission.getSource())) {
+            return permission;
+        }
+
+        final List<String> finalBidders = ListUtils.emptyIfNull(permission.getBidders()).stream()
+                .filter(targetBidders::contains)
+                .toList();
+
+        return CollectionUtils.isEmpty(finalBidders)
+                ? null
+                : ExtRequestPrebidDataEidPermissions
+                .builder()
+                .bidders(finalBidders)
+                .source(permission.getSource())
+                .build();
     }
 
     @Override

extra/modules/live-intent-omni-channel-identity/src/test/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/LiveIntentOmniChannelIdentityProcessedAuctionRequestHookTest.java

@@ -36,6 +36,7 @@
 import org.prebid.server.vertx.httpclient.model.HttpClientResponse;
 
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeoutException;
 
 import static java.util.Collections.singletonList;
@@ -74,11 +75,11 @@ public class LiveIntentOmniChannelIdentityProcessedAuctionRequestHookTest {
 
     private LiveIntentOmniChannelIdentityProcessedAuctionRequestHook target;
 
-    private List<String> configuredBidders;
+    private Set<String> configuredBidders;
 
     @BeforeEach
     public void setUp() {
-        configuredBidders = List.of("bidder1", "bidder2");
+        configuredBidders = Set.of("bidder1", "bidder2");
         given(properties.getRequestTimeoutMs()).willReturn(5L);
         given(properties.getIdentityResolutionEndpoint()).willReturn("https://test.com/idres");
         given(properties.getAuthToken()).willReturn("auth_token");
@@ -375,14 +376,38 @@ public void callShouldReturnFailureWhenRequestingEidsIsFailed() {
     }
 
     @Test
-    public void biddersConfiguredRestrictionShouldBeRespected() {
+    public void shouldRestrictExistingEidPermissionsByIntersectionAndKeepGlobalBiddersUnchanged() {
+        // given
         final Uid givenUid = Uid.builder().id("id1").atype(2).build();
         final Eid givenEid = Eid.builder().source("some.source.com").uids(singletonList(givenUid)).build();
         final User givenUser = User.builder().eids(singletonList(givenEid)).build();
-        final BidRequest givenBidRequest = BidRequest.builder().id("request").user(givenUser).build();
 
-        final ExtRequestPrebidData expectedData = ExtRequestPrebidData.of(configuredBidders, List.of(
-                ExtRequestPrebidDataEidPermissions.of("liveintent.com", configuredBidders)));
+        final ExtRequestPrebidDataEidPermissions otherBidder = ExtRequestPrebidDataEidPermissions.builder()
+                .source("some.other-source.com")
+                .bidders(singletonList("bidderY"))
+                .build();
+
+        final ExtRequestPrebidDataEidPermissions liBidder2 = ExtRequestPrebidDataEidPermissions.builder()
+                .source("liveintent.com")
+                .bidders(singletonList("bidder2"))
+                .build();
+        final ExtRequestPrebidDataEidPermissions liBidder23 = ExtRequestPrebidDataEidPermissions.builder()
+                .source("liveintent.com")
+                .bidders(List.of("bidder2", "bidder3"))
+                .build();
+
+        final ExtRequestPrebidData givenData = ExtRequestPrebidData.of(singletonList("bidderX"),
+                List.of(otherBidder, liBidder23));
+
+        final BidRequest givenBidRequest = BidRequest.builder()
+                .id("request")
+                .user(givenUser)
+                .ext(ExtRequest.of(ExtRequestPrebid.builder().data(givenData).build()))
+                .build();
+
+        final ExtRequestPrebidData expectedData = ExtRequestPrebidData.of(
+                List.of("bidderX"),
+                List.of(otherBidder, liBidder2));
 
         final Eid expectedEid = Eid.builder().source("liveintent.com").build();
 
@@ -418,23 +443,31 @@ public void biddersConfiguredRestrictionShouldBeRespected() {
     }
 
     @Test
-    public void biddersConfiguredRestrictionShouldBeMergedWithProvided() {
+    public void shouldNotAddNewEidPermissionsOrModifyGlobalBiddersWhenSourceNotPresent() {
         // given
         final Uid givenUid = Uid.builder().id("id1").atype(2).build();
         final Eid givenEid = Eid.builder().source("some.source.com").uids(singletonList(givenUid)).build();
         final User givenUser = User.builder().eids(singletonList(givenEid)).build();
-        final BidRequest givenBidRequest = BidRequest.builder().id("request").user(givenUser).ext(ExtRequest.of(
-                ExtRequestPrebid.builder().data(ExtRequestPrebidData.of(List.of("bidder3"), List.of(
-                        ExtRequestPrebidDataEidPermissions.of("some.other-source.com", List.of("bidder3")),
-                        ExtRequestPrebidDataEidPermissions.of("some.source.com", List.of("bidder3"))))
-                ).build())).build();
+        final ExtRequestPrebidDataEidPermissions bidder1 = ExtRequestPrebidDataEidPermissions.builder()
+                .source("some.other-source.com")
+                .bidders(singletonList("bidder3"))
+                .build();
+        final ExtRequestPrebidDataEidPermissions bidder2 = ExtRequestPrebidDataEidPermissions.builder()
+                .source("some.source.com")
+                .bidders(singletonList("bidder3"))
+                .build();
 
-        final List<String> expectedBidders = List.of("bidder3", "bidder2", "bidder1");
+        final List<ExtRequestPrebidDataEidPermissions> bidders = List.of(bidder1, bidder2);
 
-        final ExtRequestPrebidData expectedData = ExtRequestPrebidData.of(expectedBidders, List.of(
-                ExtRequestPrebidDataEidPermissions.of("some.other-source.com", List.of("bidder3")),
-                ExtRequestPrebidDataEidPermissions.of("some.source.com", List.of("bidder3")),
-                ExtRequestPrebidDataEidPermissions.of("liveintent.com", configuredBidders)));
+        final BidRequest givenBidRequest = BidRequest.builder()
+                .id("request")
+                .user(givenUser)
+                .ext(ExtRequest.of(ExtRequestPrebid.builder()
+                        .data(ExtRequestPrebidData.of(singletonList("bidder3"), bidders))
+                        .build()))
+                .build();
+
+        final ExtRequestPrebidData expectedData = ExtRequestPrebidData.of(List.of("bidder3"), bidders);
 
         final Eid expectedEid = Eid.builder().source("liveintent.com").build();
 
@@ -468,4 +501,69 @@ public void biddersConfiguredRestrictionShouldBeMergedWithProvided() {
                 eq(MAPPER.encodeToString(givenBidRequest)),
                 eq(5L));
     }
+
+    @Test
+    public void shouldRemovePermissionWhenIntersectionIsEmpty() {
+        // given
+        final Uid givenUid = Uid.builder().id("id1").atype(2).build();
+        final Eid givenEid = Eid.builder().source("some.source.com").uids(singletonList(givenUid)).build();
+        final User givenUser = User.builder().eids(singletonList(givenEid)).build();
+
+        final ExtRequestPrebidData givenData = ExtRequestPrebidData.of(
+                List.of("bidderGlobal"),
+                List.of(
+                        ExtRequestPrebidDataEidPermissions.builder()
+                                .source("liveintent.com")
+                                .bidders(singletonList("not-allowed"))
+                                .build(),
+                        ExtRequestPrebidDataEidPermissions.builder()
+                                .source("keep.com")
+                                .bidders(singletonList("bidderGlobal"))
+                                .build()));
+
+        final BidRequest givenBidRequest = BidRequest.builder()
+                .id("request")
+                .user(givenUser)
+                .ext(ExtRequest.of(ExtRequestPrebid.builder().data(givenData).build()))
+                .build();
+
+        final Eid expectedEid = Eid.builder().source("liveintent.com").build();
+        final String responseBody = MAPPER.encodeToString(IdResResponse.of(List.of(expectedEid)));
+        given(httpClient.post(any(), any(), any(), anyLong()))
+                .willReturn(Future.succeededFuture(HttpClientResponse.of(200, null, responseBody)));
+
+        given(auctionInvocationContext.auctionContext()).willReturn(auctionContext);
+        given(auctionContext.getActivityInfrastructure()).willReturn(activityInfrastructure);
+        given(activityInfrastructure.isAllowed(any(), any())).willReturn(true);
+        given(userFpdActivityMask.maskUser(any(), eq(false), eq(false)))
+                .willAnswer(invocation -> invocation.getArgument(0));
+        given(userFpdActivityMask.maskDevice(any(), eq(false), eq(false)))
+                .willAnswer(invocation -> invocation.getArgument(0));
+
+        // when
+        final InvocationResult<AuctionRequestPayload> result =
+                target.call(AuctionRequestPayloadImpl.of(givenBidRequest), auctionInvocationContext).result();
+
+        // then
+        final ExtRequestPrebidData expectedData = ExtRequestPrebidData.of(
+                List.of("bidderGlobal"),
+                List.of(ExtRequestPrebidDataEidPermissions.builder()
+                        .source("keep.com")
+                        .bidders(singletonList("bidderGlobal"))
+                        .build()));
+
+        assertThat(result.status()).isEqualTo(InvocationStatus.success);
+        assertThat(result.payloadUpdate().apply(AuctionRequestPayloadImpl.of(givenBidRequest)))
+                .extracting(AuctionRequestPayload::bidRequest)
+                .extracting(BidRequest::getExt)
+                .extracting(ExtRequest::getPrebid)
+                .extracting(ExtRequestPrebid::getData)
+                .isEqualTo(expectedData);
+
+        verify(httpClient).post(
+                eq("https://test.com/idres"),
+                argThat(headers -> headers.contains("Authorization", "Bearer auth_token", true)),
+                eq(MAPPER.encodeToString(givenBidRequest)),
+                eq(5L));
+    }
 }

extra/modules/optable-targeting/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>optable-targeting</artifactId>

extra/modules/ortb2-blocking/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ortb2-blocking</artifactId>

extra/modules/pb-request-correction/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.prebid.server.hooks.modules</groupId>
         <artifactId>all-modules</artifactId>
-        <version>3.39.0-SNAPSHOT</version>
+        <version>3.40.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pb-request-correction</artifactId>