Fix conflicts

AntoxaAntoxic · AntoxaAntoxic · commit a53098198d54 · 2025-06-26T15:25:09.000+02:00
diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java
@@ -8,8 +8,6 @@
 import org.prebid.server.geolocation.CountryCodeMapper;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.core.FilterService;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.core.GreenbidsInferenceDataService;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.GreenbidsInvocationService;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.GreenbidsInferenceDataService;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ModelCache;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerFactory;
diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationResultCreator.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationResultCreator.java
@@ -49,7 +49,9 @@ public static GreenbidsInvocationResult create(GreenbidsConfig greenbidsConfig,
     }
 
     private static boolean isExploration(GreenbidsConfig greenbidsConfig, String greenbidsId) {
-        final double explorationRate = ObjectUtils.defaultIfNull(greenbidsConfig.getExplorationRate(), DEFAULT_EXPLORATION_RATE);
+        final double explorationRate = ObjectUtils.defaultIfNull(
+                greenbidsConfig.getExplorationRate(),
+                DEFAULT_EXPLORATION_RATE);
         final int hashInt = Integer.parseInt(greenbidsId.substring(greenbidsId.length() - 4), 16);
         return hashInt < explorationRate * RANGE_16_BIT_INTEGER_DIVISION_BASIS;
     }
diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java
diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java
@@ -156,7 +156,8 @@ private Future<InvocationResult<AuctionRequestPayload>> toInvocationResult(
         return Future.succeededFuture(InvocationResultImpl.<AuctionRequestPayload>builder()
                 .status(InvocationStatus.success)
                 .action(invocationResult.getInvocationAction())
-                .payloadUpdate(payload -> AuctionRequestPayloadImpl.of(GreenbidsPayloadUpdater.update(bidRequest, impsBiddersFilterMap)))
+                .payloadUpdate(payload -> AuctionRequestPayloadImpl.of(
+                        GreenbidsPayloadUpdater.update(bidRequest, impsBiddersFilterMap)))
                 .analyticsTags(toAnalyticsTags(invocationResult.getAnalyticsResult()))
                 .rejections(toRejections(impsBiddersFilterMap))
                 .build());
diff --git a/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataServiceTest.java b/extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataServiceTest.java
@@ -25,9 +25,7 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
-import java.util.function.UnaryOperator;
 
-import static java.util.function.UnaryOperator.identity;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlockerTest.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlockerTest.java
@@ -33,9 +33,6 @@
 import static java.util.Collections.singletonMap;
 import static java.util.function.UnaryOperator.identity;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.prebid.server.auction.model.BidRejectionReason.RESPONSE_REJECTED_ADVERTISER_BLOCKED;
 import static org.prebid.server.auction.model.BidRejectionReason.RESPONSE_REJECTED_INVALID_CREATIVE;
 
@@ -665,7 +662,6 @@ private BidsBlocker bidsBlocker(List<BidderBid> bids,
                                     BlockedAttributes blockedAttributes,
                                     boolean debugEnabled) {
 
-        return BidsBlocker.create(
-                bids, "bidder1", ortbVersion, accountConfig, blockedAttributes, bidRejectionTracker, debugEnabled);
+        return BidsBlocker.create(bids, "bidder1", ortbVersion, accountConfig, blockedAttributes, debugEnabled);
     }
 }
diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/Ortb2BlockingRawBidderResponseHookTest.java
@@ -8,10 +8,8 @@
 import io.vertx.core.Future;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.auction.model.AuctionContext;
-import org.prebid.server.auction.model.BidRejectionTracker;
 import org.prebid.server.auction.model.RejectedBid;
 import org.prebid.server.bidder.model.BidderBid;
 import org.prebid.server.hooks.execution.v1.InvocationResultImpl;
@@ -38,12 +36,10 @@
 import org.prebid.server.proto.openrtb.ext.response.BidType;
 
 import java.util.List;
-import java.util.Map;
 import java.util.function.UnaryOperator;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static java.util.function.UnaryOperator.identity;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
diff --git a/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/model/BidderInvocationContextImpl.java b/extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/v1/model/BidderInvocationContextImpl.java
@@ -6,7 +6,6 @@
 import lombok.Value;
 import lombok.experimental.Accessors;
 import org.prebid.server.auction.model.AuctionContext;
-import org.prebid.server.auction.model.BidRejectionTracker;
 import org.prebid.server.execution.timeout.Timeout;
 import org.prebid.server.hooks.v1.bidder.BidderInvocationContext;
 import org.prebid.server.model.Endpoint;
diff --git a/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHookTest.java b/extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHookTest.java
@@ -65,7 +65,6 @@ public class PbRichmediaFilterAllProcessedBidResponsesHookTest {
 
     private PbRichmediaFilterAllProcessedBidResponsesHook target;
 
-
     @BeforeEach
     public void setUp() {
         target = new PbRichmediaFilterAllProcessedBidResponsesHook(
diff --git a/src/main/java/org/prebid/server/analytics/reporter/greenbids/GreenbidsAnalyticsReporter.java b/src/main/java/org/prebid/server/analytics/reporter/greenbids/GreenbidsAnalyticsReporter.java
@@ -382,8 +382,8 @@ private static Map<String, NonBid> getSeatsWithNonBids(AuctionContext auctionCon
     }
 
     private static SeatNonBid toSeatNonBid(String bidder, BidRejectionTracker bidRejectionTracker) {
-        final List<NonBid> nonBids = bidRejectionTracker.getRejectedImps().stream()
-                .map(rejectedImp -> NonBid.of(rejectedImp.impId(), rejectedImp.reason().getRight()))
+        final List<NonBid> nonBids = bidRejectionTracker.getRejected().stream()
+                .map(rejectedImp -> NonBid.of(rejectedImp.impId(), rejectedImp.reason()))
                 .toList();
 
         return SeatNonBid.of(bidder, nonBids);
diff --git a/src/main/java/org/prebid/server/auction/BidResponseCreator.java b/src/main/java/org/prebid/server/auction/BidResponseCreator.java
@@ -35,6 +35,7 @@
 import org.prebid.server.auction.model.CategoryMappingResult;
 import org.prebid.server.auction.model.MultiBidConfig;
 import org.prebid.server.auction.model.PaaFormat;
+import org.prebid.server.auction.model.Rejected;
 import org.prebid.server.auction.model.TargetingInfo;
 import org.prebid.server.auction.model.debug.DebugContext;
 import org.prebid.server.auction.requestfactory.Ortb2ImplicitParametersResolver;
@@ -1949,12 +1950,10 @@ private static BidResponse populateSeatNonBid(AuctionContext auctionContext, Bid
         }
 
         final List<SeatNonBid> seatNonBids = auctionContext.getBidRejectionTrackers().values().stream()
-                .flatMap(bidRejectionTracker -> bidRejectionTracker.getRejectedImps().entrySet().stream())
+                .flatMap(bidRejectionTracker -> bidRejectionTracker.getRejected().stream())
                 .collect(Collectors.groupingBy(
-                        entry -> entry.getValue().getLeft(),
-                        Collectors.mapping(
-                                entry -> NonBid.of(entry.getKey(), entry.getValue().getRight()),
-                                Collectors.toList())))
+                        Rejected::seat,
+                        Collectors.mapping(entry -> NonBid.of(entry.impId(), entry.reason()), Collectors.toList())))
                 .entrySet().stream()
                 .filter(entry -> !entry.getValue().isEmpty())
                 .map(entry -> SeatNonBid.of(entry.getKey(), entry.getValue()))
diff --git a/src/main/java/org/prebid/server/auction/model/BidRejectionTracker.java b/src/main/java/org/prebid/server/auction/model/BidRejectionTracker.java
@@ -87,6 +87,7 @@ public void reject(Rejected rejected) {
         if (rejected instanceof RejectedImp && rejected.reason().getValue() >= 300) {
             logger.warn("The rejected imp {} with the code {} equal to or higher than 300 assumes "
                     + "that there is a rejected bid that shouldn't be lost");
+            return;
         }
 
         final String impId = rejected.impId();
@@ -96,7 +97,10 @@ public void reject(Rejected rejected) {
                         MULTIPLE_REJECTIONS_WARNING_TEMPLATE.formatted(bidder, impId), logSamplingRate);
             }
 
-            rejectedBids.computeIfAbsent(impId, key -> new ArrayList<>()).add(rejected);
+            rejectedBids.computeIfAbsent(impId, key -> new ArrayList<>())
+                    .add(rejected instanceof RejectedImp
+                            ? RejectedImp.of(bidder, rejected.impId(), rejected.reason())
+                            : rejected);
 
             if (succeededBidsIds.containsKey(impId)) {
                 final String bidId = rejected instanceof RejectedBid ? ((RejectedBid) rejected).bidId() : null;
@@ -119,20 +123,20 @@ public void rejectAll(BidRejectionReason reason) {
         involvedImpIds.forEach(impId -> reject(RejectedImp.of(impId, reason)));
     }
 
-    public Set<RejectedImp> getRejectedImps() {
-        final Set<RejectedImp> rejectedImpIds = new HashSet<>();
+    public Set<Rejected> getRejected() {
+        final Set<Rejected> rejectedResult = new HashSet<>();
         for (String impId : involvedImpIds) {
             final Set<String> succeededBids = succeededBidsIds.getOrDefault(impId, Collections.emptySet());
             if (succeededBids.isEmpty()) {
                 if (rejectedBids.containsKey(impId)) {
-                    rejectedImpIds.add(RejectedImp.of(impId, rejectedBids.get(impId).getFirst().reason()));
+                    rejectedResult.add(rejectedBids.get(impId).getFirst());
                 } else {
-                    rejectedImpIds.add(RejectedImp.of(impId, BidRejectionReason.NO_BID));
+                    rejectedResult.add(RejectedImp.of(bidder, impId, BidRejectionReason.NO_BID));
                 }
             }
         }
 
-        return rejectedImpIds;
+        return rejectedResult;
     }
 
     public Map<String, List<Rejected>> getAllRejected() {
@@ -141,7 +145,7 @@ public Map<String, List<Rejected>> getAllRejected() {
             final Set<String> succeededBids = succeededBidsIds.getOrDefault(impId, Collections.emptySet());
             if (succeededBids.isEmpty() && !rejectedBids.containsKey(impId)) {
                 missingImpIds.computeIfAbsent(impId, key -> new ArrayList<>())
-                        .add(RejectedImp.of(impId, BidRejectionReason.NO_BID));
+                        .add(RejectedImp.of(bidder, impId, BidRejectionReason.NO_BID));
             }
         }
 
diff --git a/src/main/java/org/prebid/server/auction/model/Rejected.java b/src/main/java/org/prebid/server/auction/model/Rejected.java
@@ -2,6 +2,8 @@
 
 public interface Rejected {
 
+    String seat();
+
     String impId();
 
     BidRejectionReason reason();
diff --git a/src/main/java/org/prebid/server/auction/model/RejectedBid.java b/src/main/java/org/prebid/server/auction/model/RejectedBid.java
@@ -20,6 +20,11 @@ public BidRejectionReason reason() {
         return reason;
     }
 
+    @Override
+    public String seat() {
+        return bid.getSeat();
+    }
+
     public String bidId() {
         return bid.getBid().getId();
     }
diff --git a/src/main/java/org/prebid/server/auction/model/RejectedImp.java b/src/main/java/org/prebid/server/auction/model/RejectedImp.java
@@ -7,8 +7,14 @@
 @Accessors(fluent = true)
 public class RejectedImp implements Rejected {
 
+    String seat;
+
     String impId;
 
     BidRejectionReason reason;
 
+    public static RejectedImp of(String impId, BidRejectionReason reason) {
+        return RejectedImp.of(null, impId, reason);
+    }
+
 }
diff --git a/src/main/java/org/prebid/server/validation/ResponseBidValidator.java b/src/main/java/org/prebid/server/validation/ResponseBidValidator.java
@@ -166,7 +166,7 @@ private void validateSeat(BidderBid bid,
 
             final String message = "invalid bidder code %s was set by the adapter %s for the account %s"
                     .formatted(bid.getSeat(), bidder, account.getId());
-            bidRejectionTracker.rejectBid(bid, BidRejectionReason.RESPONSE_REJECTED_GENERAL);
+            bidRejectionTracker.reject(RejectedBid.of(bid, BidRejectionReason.RESPONSE_REJECTED_GENERAL));
             metrics.updateSeatValidationMetrics(bidder);
             alternateBidderCodeLogger.warn(message, logSamplingRate);
             throw new ValidationException(message);
diff --git a/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java b/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java
@@ -21,7 +21,6 @@
 import com.iab.openrtb.response.SeatBid;
 import io.vertx.core.Future;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -4393,7 +4392,7 @@ public void shouldDropFledgeResponsesReferencingUnknownImps() {
     public void shouldPopulateExtPrebidSeatNonBidWhenReturnAllBidStatusFlagIsTrue() {
         // given
         final BidRejectionTracker bidRejectionTracker = mock(BidRejectionTracker.class);
-        given(bidRejectionTracker.getRejectedImps()).willReturn(singleton(RejectedImp.of("impId2", NO_BID)));
+        given(bidRejectionTracker.getRejected()).willReturn(singleton(RejectedImp.of("someBidder", "impId2", NO_BID)));
 
         final Bid bid = Bid.builder().id("bidId").price(BigDecimal.valueOf(3.67)).impid("impId").build();
         final List<BidderResponse> bidderResponses = singletonList(
diff --git a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java
diff --git a/src/test/java/org/prebid/server/auction/model/BidRejectionTrackerTest.java b/src/test/java/org/prebid/server/auction/model/BidRejectionTrackerTest.java
diff --git a/src/test/java/org/prebid/server/hooks/execution/HookStageExecutorTest.java b/src/test/java/org/prebid/server/hooks/execution/HookStageExecutorTest.java
diff --git a/src/test/java/org/prebid/server/validation/ResponseBidValidatorTest.java b/src/test/java/org/prebid/server/validation/ResponseBidValidatorTest.java

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ public static GreenbidsInvocationResult create(GreenbidsConfig greenbidsConfig,`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private static boolean isExploration(GreenbidsConfig greenbidsConfig, String greenbidsId) {`
`52`		`- final double explorationRate = ObjectUtils.defaultIfNull(greenbidsConfig.getExplorationRate(), DEFAULT_EXPLORATION_RATE);`
	`52`	`+ final double explorationRate = ObjectUtils.defaultIfNull(`
	`53`	`+ greenbidsConfig.getExplorationRate(),`
	`54`	`+ DEFAULT_EXPLORATION_RATE);`
`53`	`55`	`final int hashInt = Integer.parseInt(greenbidsId.substring(greenbidsId.length() - 4), 16);`
`54`	`56`	`return hashInt < explorationRate * RANGE_16_BIT_INTEGER_DIVISION_BASIS;`
`55`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,8 +382,8 @@ private static Map<String, NonBid> getSeatsWithNonBids(AuctionContext auctionCon`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`private static SeatNonBid toSeatNonBid(String bidder, BidRejectionTracker bidRejectionTracker) {`
`385`		`- final List<NonBid> nonBids = bidRejectionTracker.getRejectedImps().stream()`
`386`		`- .map(rejectedImp -> NonBid.of(rejectedImp.impId(), rejectedImp.reason().getRight()))`
	`385`	`+ final List<NonBid> nonBids = bidRejectionTracker.getRejected().stream()`
	`386`	`+ .map(rejectedImp -> NonBid.of(rejectedImp.impId(), rejectedImp.reason()))`
`387`	`387`	`.toList();`
`388`	`388`
`389`	`389`	`return SeatNonBid.of(bidder, nonBids);`