Skip to content

Commit cb7aeaf

Browse files
committed
Minor fixes.
1 parent bbd7a9b commit cb7aeaf

3 files changed

Lines changed: 14 additions & 5 deletions

File tree

extra/modules/pb-rule-engine/src/main/java/org/prebid/server/hooks/modules/rule/engine/core/config/RuleParser.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.github.benmanes.caffeine.cache.Caffeine;
66
import io.vertx.core.Future;
77
import io.vertx.core.Vertx;
8-
import org.prebid.server.exception.PreBidException;
8+
import org.apache.commons.lang3.ObjectUtils;
99
import org.prebid.server.execution.retry.RetryPolicy;
1010
import org.prebid.server.execution.retry.Retryable;
1111
import org.prebid.server.hooks.modules.rule.engine.core.rules.PerStageRule;
@@ -67,9 +67,7 @@ public Future<PerStageRule> parseForAccount(String accountId, ObjectNode config)
6767
}
6868

6969
parseConfig(accountId, config);
70-
return cachedRule == null
71-
? Future.failedFuture(new PreBidException("Rule for account " + accountId + " is not ready"))
72-
: Future.succeededFuture(cachedRule);
70+
return Future.succeededFuture(ObjectUtils.defaultIfNull(cachedRule, PerStageRule.noOp()));
7371
}
7472

7573
private Instant getConfigTimestamp(ObjectNode config) {

extra/modules/pb-rule-engine/src/main/java/org/prebid/server/hooks/modules/rule/engine/core/rules/PerStageRule.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,16 @@
1313
@Value(staticConstructor = "of")
1414
public class PerStageRule {
1515

16+
private static final PerStageRule NO_OP = PerStageRule.builder()
17+
.processedAuctionRequestRule(NoOpRule.create())
18+
.build();
19+
1620
Instant timestamp;
1721

1822
Rule<BidRequest, RequestRuleContext> processedAuctionRequestRule;
23+
24+
public static PerStageRule noOp() {
25+
return NO_OP;
26+
}
1927
}
2028

extra/modules/pb-rule-engine/src/main/java/org/prebid/server/hooks/modules/rule/engine/v1/PbRuleEngineProcessedAuctionRequestHook.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ private static List<Rejection> toRejections(SeatNonBid seatNonBid) {
9292

9393
private static Map<String, List<Rejection>> toRejections(List<SeatNonBid> seatNonBids) {
9494
return seatNonBids.stream()
95-
.collect(Collectors.toMap(SeatNonBid::getSeat, PbRuleEngineProcessedAuctionRequestHook::toRejections));
95+
.collect(Collectors.groupingBy(SeatNonBid::getSeat,
96+
Collectors.flatMapping(
97+
seatNonBid -> toRejections(seatNonBid).stream(),
98+
Collectors.toList())));
9699
}
97100

98101
private static Future<InvocationResult<AuctionRequestPayload>> failure(Throwable error) {

0 commit comments

Comments
 (0)