Fix comments

prebid · Jan 7, 2025 · b481e3e · b481e3e
1 parent 8532f45
commit b481e3e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 27 deletions.
diff --git a/src/main/java/org/prebid/server/auction/BidderAliases.java b/src/main/java/org/prebid/server/auction/BidderAliases.java
@@ -35,15 +35,13 @@ public static BidderAliases of(Map<String, String> aliasToBidder,
     }
 
     public boolean isAliasDefined(String alias) {
-        return bidderCatalog.isValidName(alias) || aliasToBidder.containsKey(alias);
+        return aliasToBidder.containsKey(alias);
     }
 
     public String resolveBidder(String aliasOrBidder) {
-        if (bidderCatalog.isValidName(aliasOrBidder)) {
-            return aliasOrBidder;
-        }
-
-        return aliasToBidder.getOrDefault(aliasOrBidder, aliasOrBidder);
+        return bidderCatalog.isValidName(aliasOrBidder)
+                ? aliasOrBidder
+                : aliasToBidder.getOrDefault(aliasOrBidder, aliasOrBidder);
     }
 
     public boolean isSame(String bidder1, String bidder2) {

diff --git a/src/main/java/org/prebid/server/auction/ExchangeService.java b/src/main/java/org/prebid/server/auction/ExchangeService.java
@@ -455,14 +455,18 @@ private Future<List<AuctionParticipation>> extractAuctionParticipations(
     private Set<String> bidderNamesFromImpExt(Imp imp, BidderAliases aliases) {
         return Optional.ofNullable(bidderParamsFromImpExt(imp.getExt())).stream()
                 .flatMap(paramsNode -> StreamUtil.asStream(paramsNode.fieldNames()))
-                .filter(aliases::isAliasDefined)
+                .filter(bidder -> isValidBidder(bidder, aliases))
                 .collect(Collectors.toSet());
     }
 
     private static JsonNode bidderParamsFromImpExt(ObjectNode ext) {
         return ext.get(PREBID_EXT).get(BIDDER_EXT);
     }
 
+    private boolean isValidBidder(String bidder, BidderAliases aliases) {
+        return bidderCatalog.isValidName(bidder) || aliases.isAliasDefined(bidder);
+    }
+
     private static boolean isBidderCallActivityAllowed(String bidder, AuctionContext auctionContext) {
         final ActivityInfrastructure activityInfrastructure = auctionContext.getActivityInfrastructure();
         final ActivityInvocationPayload activityInvocationPayload = BidRequestActivityInvocationPayload.of(

diff --git a/src/test/java/org/prebid/server/auction/BidderAliasesTest.java b/src/test/java/org/prebid/server/auction/BidderAliasesTest.java
@@ -36,16 +36,6 @@ public void isAliasDefinedShouldReturnFalseWhenNoAliasesInRequest() {
         assertThat(aliases.isAliasDefined("alias")).isFalse();
     }
 
-    @Test
-    public void isAliasDefinedShouldReturnTrueWhenNoAliasesInRequestButAliasIsValidInBidderCatalog() {
-        // given
-        given(bidderCatalog.isValidName("alias")).willReturn(true);
-        final BidderAliases aliases = BidderAliases.of(null, null, bidderCatalog);
-
-        // when and then
-        assertThat(aliases.isAliasDefined("alias")).isTrue();
-    }
-
     @Test
     public void isAliasDefinedShouldReturnFalseWhenAliasIsNotDefinedInRequest() {
         // given
@@ -55,16 +45,6 @@ public void isAliasDefinedShouldReturnFalseWhenAliasIsNotDefinedInRequest() {
         assertThat(aliases.isAliasDefined("alias")).isFalse();
     }
 
-    @Test
-    public void isAliasDefinedShouldReturnTrueWhenAliasIsNotDefinedInRequestButAliasIsValidInBidderCatalog() {
-        // given
-        given(bidderCatalog.isValidName("alias")).willReturn(true);
-        final BidderAliases aliases = BidderAliases.of(singletonMap("anotherAlias", "bidder"), null, bidderCatalog);
-
-        // when and then
-        assertThat(aliases.isAliasDefined("alias")).isTrue();
-    }
-
     @Test
     public void isAliasDefinedShouldDetectAliasInRequest() {
         // given