Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
public class ConfigRuleEvaluator {

public static final String CURRENT_TIME_KEY = "prefab.current-time";
public static final String REFORGE_CURRENT_TIME_KEY = "reforge.current-time";
private static final Logger LOG = LoggerFactory.getLogger(ConfigRuleEvaluator.class);

private final ConfigStore configStore;
Expand Down Expand Up @@ -242,7 +243,7 @@ private Optional<Prefab.ConfigValue> prop(
}
}
//TODO: move this current time injection into a ContextResolver class?
if (CURRENT_TIME_KEY.equals(key)) {
if (CURRENT_TIME_KEY.equals(key) || REFORGE_CURRENT_TIME_KEY.equals(key)) {
return Optional.of(
Prefab.ConfigValue.newBuilder().setInt(System.currentTimeMillis()).build()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,57 @@ public void testTimeAfterRange() {
assertThat(eval.isMatch()).isFalse();
}

@Test
public void testReforgeTimeInRange() {
// note this relies on ConfigRuleEvaluator on-demand adding the current time for reforge.current-time
final Prefab.Criterion intRangeCriterion = Prefab.Criterion
.newBuilder()
.setPropertyName(ConfigRuleEvaluator.REFORGE_CURRENT_TIME_KEY)
.setValueToMatch(
Prefab.ConfigValue.newBuilder().setIntRange(Prefab.IntRange.newBuilder().build())
)
.setOperator(Prefab.Criterion.CriterionOperator.IN_INT_RANGE)
.build();

final EvaluatedCriterion positiveEval = evaluator
.evaluateCriterionMatch(intRangeCriterion, LookupContext.EMPTY)
.stream()
.findFirst()
.get();

assertThat(positiveEval.isMatch()).isTrue();
}

@Test
public void testReforgeTimeAfterRange() {
// note this relies on ConfigRuleEvaluator on-demand adding the current time for reforge.current-time
long currentTime = System.currentTimeMillis();

final Prefab.Criterion intRangeCriterion = Prefab.Criterion
.newBuilder()
.setPropertyName(ConfigRuleEvaluator.REFORGE_CURRENT_TIME_KEY)
.setValueToMatch(
Prefab.ConfigValue
.newBuilder()
.setIntRange(
Prefab.IntRange
.newBuilder()
.setEnd(currentTime - TimeUnit.MINUTES.toMillis(2))
.build()
)
)
.setOperator(Prefab.Criterion.CriterionOperator.IN_INT_RANGE)
.build();

final EvaluatedCriterion eval = evaluator
.evaluateCriterionMatch(intRangeCriterion, LookupContext.EMPTY)
.stream()
.findFirst()
.get();

assertThat(eval.isMatch()).isFalse();
}

public static Stream<Arguments> comparisonArguments() {
return Stream.of(
Arguments.of(
Expand Down