Skip to content

Commit bbd7a9b

Browse files
committed
Minor fixes.
1 parent 2cbeb01 commit bbd7a9b

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ private Rule<T, C> combineRules(Rule<T, C> left, Rule<T, C> right) {
167167
} else if (left != null && right != null) {
168168
return AlternativeActionRule.of(left, right);
169169
} else if (left != null) {
170-
return left;
170+
return AlternativeActionRule.of(left, NoOpRule.create());
171171
}
172172

173-
return right;
173+
return AlternativeActionRule.of(right, NoOpRule.create());
174174
}
175175
}

extra/modules/pb-rule-engine/src/main/java/org/prebid/server/hooks/modules/rule/engine/core/request/result/functions/filter/FilterBiddersFunctionConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class FilterBiddersFunctionConfig {
1919
@JsonProperty("seatnonbid")
2020
BidRejectionReason seatNonBid = BidRejectionReason.REQUEST_BLOCKED_OPTIMIZED;
2121

22+
@JsonProperty("ifSyncedId")
2223
Boolean ifSyncedId;
2324

2425
@JsonProperty("analyticsValue")

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.prebid.server.hooks.modules.rule.engine.core.config.model.SchemaFunctionConfig;
1515
import org.prebid.server.hooks.modules.rule.engine.core.rules.AlternativeActionRule;
1616
import org.prebid.server.hooks.modules.rule.engine.core.rules.CompositeRule;
17-
import org.prebid.server.hooks.modules.rule.engine.core.rules.DefaultActionRule;
1817
import org.prebid.server.hooks.modules.rule.engine.core.rules.ConditionalRuleFactory;
18+
import org.prebid.server.hooks.modules.rule.engine.core.rules.DefaultActionRule;
1919
import org.prebid.server.hooks.modules.rule.engine.core.rules.NoOpRule;
2020
import org.prebid.server.hooks.modules.rule.engine.core.rules.RandomWeightedRule;
2121
import org.prebid.server.hooks.modules.rule.engine.core.rules.Rule;
@@ -126,8 +126,9 @@ public void parseShouldCombineModelGroupRulesUnderSameRuleSetIntoRandomWeightedR
126126
// when and then
127127
final RandomWeightedRule<Object, Object> weightedRule = RandomWeightedRule.of(
128128
randomGenerator,
129-
new WeightedList<>(
130-
List.of(WeightedEntry.of(1, matchingRule), WeightedEntry.of(2, matchingRule))));
129+
new WeightedList<>(List.of(
130+
WeightedEntry.of(1, AlternativeActionRule.of(matchingRule, NoOpRule.create())),
131+
WeightedEntry.of(2, AlternativeActionRule.of(matchingRule, NoOpRule.create())))));
131132

132133
assertThat(target.parse(accountConfig)).isEqualTo(
133134
CompositeRule.of(Collections.singletonList(weightedRule)));
@@ -196,8 +197,10 @@ public void parseShouldBuildRuleTreeAndCreateAppropriateMatchingRule() {
196197
final AccountConfig accountConfig = givenAccountConfig(modelGroupConfig);
197198

198199
// when and then
200+
final AlternativeActionRule<Object, Object> alternativeRule = AlternativeActionRule.of(
201+
matchingRule, NoOpRule.create());
199202
final RandomWeightedRule<Object, Object> weightedRule = RandomWeightedRule.of(
200-
randomGenerator, new WeightedList<>(List.of(WeightedEntry.of(1, matchingRule))));
203+
randomGenerator, new WeightedList<>(List.of(WeightedEntry.of(1, alternativeRule))));
201204

202205
assertThat(target.parse(accountConfig)).isEqualTo(
203206
CompositeRule.of(Collections.singletonList(weightedRule)));

0 commit comments

Comments
 (0)