Update setuid endpoint to accept only bidder name

Author: Lightwood13

src/main/java/org/prebid/server/auction/model/SetuidContext.java

@@ -27,7 +27,7 @@ public class SetuidContext {
 
     Account account;
 
-    String bidderQueryParam;
+    String bidder;
 
     @JsonIgnore
     Usersyncer usersyncer;

src/main/java/org/prebid/server/handler/SetuidHandler.java

@@ -58,7 +58,6 @@
 import org.prebid.server.vertx.verticles.server.application.ApplicationResource;
 
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -89,7 +88,6 @@ public class SetuidHandler implements ApplicationResource {
     private final Metrics metrics;
     private final TimeoutFactory timeoutFactory;
     private final Map<String, Usersyncer> bidderToUsersyncer;
-    private final Map<String, Usersyncer> cookieNameToUsersyncer;
 
     public SetuidHandler(long defaultTimeout,
                          UidsCookieService uidsCookieService,
@@ -113,9 +111,14 @@ public SetuidHandler(long defaultTimeout,
         this.analyticsDelegator = Objects.requireNonNull(analyticsDelegator);
         this.metrics = Objects.requireNonNull(metrics);
         this.timeoutFactory = Objects.requireNonNull(timeoutFactory);
+        this.bidderToUsersyncer = collectUsersyncers(bidderCatalog);
+    }
+
+    private static Map<String, Usersyncer> collectUsersyncers(BidderCatalog bidderCatalog) {
         validateUsersyncersDuplicates(bidderCatalog);
-        this.bidderToUsersyncer = collectUsersyncersByBidderName(bidderCatalog);
-        this.cookieNameToUsersyncer = collectUsersyncersByCookieName(bidderCatalog);
+        return bidderCatalog.usersyncReadyBidders().stream()
+                .map(bidder -> bidderCatalog.usersyncerByName(bidder).orElseThrow())
+                .collect(Collectors.toMap(Usersyncer::getBidder, Function.identity()));
     }
 
     private static void validateUsersyncersDuplicates(BidderCatalog bidderCatalog) {
@@ -146,20 +149,6 @@ private static boolean isAliasWithRootCookieFamilyName(BidderCatalog bidderCatal
                 && parentCookieFamilyName.equals(bidderCookieFamilyName);
     }
 
-    private static Map<String, Usersyncer> collectUsersyncersByBidderName(BidderCatalog bidderCatalog) {
-        return bidderCatalog.usersyncReadyBidders().stream()
-                .map(bidder -> bidderCatalog.usersyncerByName(bidder).orElseThrow())
-                .collect(Collectors.toMap(Usersyncer::getBidder, Function.identity()));
-    }
-
-    private static Map<String, Usersyncer> collectUsersyncersByCookieName(BidderCatalog bidderCatalog) {
-        return bidderCatalog.usersyncReadyBidders().stream()
-                .sorted(Comparator.comparing(bidderName -> BooleanUtils.toInteger(bidderCatalog.isAlias(bidderName))))
-                .filter(StreamUtil.distinctBy(bidderCatalog::cookieFamilyName))
-                .map(bidderName -> bidderCatalog.usersyncerByName(bidderName).orElseThrow())
-                .collect(Collectors.toMap(Usersyncer::getCookieFamilyName, Function.identity()));
-    }
-
     @Override
     public List<HttpEndpoint> endpoints() {
         return Collections.singletonList(HttpEndpoint.of(HttpMethod.GET, Endpoint.setuid.value()));
@@ -175,13 +164,10 @@ public void handle(RoutingContext routingContext) {
     private Future<SetuidContext> toSetuidContext(RoutingContext routingContext) {
         final UidsCookie uidsCookie = uidsCookieService.parseFromRequest(routingContext);
         final HttpServerRequest httpRequest = routingContext.request();
-        final String bidderQueryParam = httpRequest.getParam(BIDDER_PARAM);
+        final String bidder = httpRequest.getParam(BIDDER_PARAM);
         final String requestAccount = httpRequest.getParam(ACCOUNT_PARAM);
         final Timeout timeout = timeoutFactory.create(defaultTimeout);
-
-        final Usersyncer usersyncer = ObjectUtils.firstNonNull(
-                bidderToUsersyncer.get(bidderQueryParam),
-                cookieNameToUsersyncer.get(bidderQueryParam));
+        final Usersyncer usersyncer = bidderToUsersyncer.get(bidder);
 
         return accountById(requestAccount, timeout)
                 .compose(account -> setuidPrivacyContextFactory.contextFrom(httpRequest, account, timeout)
@@ -190,7 +176,7 @@ private Future<SetuidContext> toSetuidContext(RoutingContext routingContext) {
                                 .uidsCookie(uidsCookie)
                                 .timeout(timeout)
                                 .account(account)
-                                .bidderQueryParam(bidderQueryParam)
+                                .bidder(bidder)
                                 .usersyncer(usersyncer)
                                 .privacyContext(privacyContext)
                                 .build()))
@@ -239,7 +225,7 @@ private void processSetuidContext(SetuidContext setuidContext, RoutingContext ro
     }
 
     private void validateSetuidContext(SetuidContext setuidContext) {
-        if (StringUtils.isBlank(setuidContext.getBidderQueryParam())) {
+        if (StringUtils.isBlank(setuidContext.getBidder())) {
             throw new InvalidRequestException("\"bidder\" query param is required");
         }
 

src/test/java/org/prebid/server/handler/SetuidHandlerTest.java

@@ -473,32 +473,7 @@ public void shouldRespondWithCookieFromRequestParam() throws IOException {
     }
 
     @Test
-    public void shouldRespondWithCookieFromRequestParamWhenBidderAndCookieFamilyAreDifferentWhenCookieFamilyNameIsUsed()
-            throws IOException {
-
-        // given
-        final UidsCookie uidsCookie = emptyUidsCookie();
-        given(uidsCookieService.parseFromRequest(any(RoutingContext.class)))
-                .willReturn(uidsCookie);
-        given(uidsCookieService.updateUidsCookie(uidsCookie, ADNXS, "J5VLCWQP-26-CWFT"))
-                .willReturn(updated(uidsCookie.updateUid(ADNXS, "J5VLCWQP-26-CWFT")));
-
-        given(httpRequest.getParam("bidder")).willReturn(ADNXS);
-        given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT");
-
-        // when
-        setuidHandler.handle(routingContext);
-
-        // then
-        verify(routingContext, never()).addCookie(any(Cookie.class));
-        final String encodedUidsCookie = getUidsCookie();
-        final Uids decodedUids = decodeUids(encodedUidsCookie);
-        assertThat(decodedUids.getUids()).hasSize(1);
-        assertThat(decodedUids.getUids().get(ADNXS).getUid()).isEqualTo("J5VLCWQP-26-CWFT");
-    }
-
-    @Test
-    public void shouldRespondWithCookieFromRequestParamWhenBidderAndCookieFamilyAreDifferentWhenBidderNameIsUsed()
+    public void shouldRespondWithCookieFromRequestParamWhenBidderAndCookieFamilyAreDifferent()
             throws IOException {
 
         // given
@@ -744,7 +719,7 @@ public void shouldReturnMultipleCookies() throws IOException {
     public void shouldRespondWithCookieIfUserIsNotInGdprScope() throws IOException {
         // given
         given(tcfDefinerService.resultForVendorIds(anySet(), any()))
-                .willReturn(Future.succeededFuture(TcfResponse.of(false, emptyMap(), null)));
+                .willReturn(Future.succeededFuture(TcfResponse.<Integer>of(false, emptyMap(), null)));
 
         final UidsCookie uidsCookie = emptyUidsCookie();
         given(uidsCookieService.parseFromRequest(any(RoutingContext.class)))