short circuit rules condition checking

This commit is contained in:
gnembon committed 2021-07-10 21:49:50 -03:00
1 parent 9e86407323
commit 7d4eeb464b
1 file changed
+5 -8
@@ -139,28 +139,25 @@ public class SettingsManager
*/ */
public void parseSettingsClass(Class settingsClass) public void parseSettingsClass(Class settingsClass)
{ {
for (Field f : settingsClass.getDeclaredFields()) rule: for (Field f : settingsClass.getDeclaredFields())
{ {
Rule rule = f.getAnnotation(Rule.class); Rule rule = f.getAnnotation(Rule.class);
if (rule == null) continue; if (rule == null) continue;
ParsedRule parsed = new ParsedRule(f, rule, this); ParsedRule<?> parsed = new ParsedRule<>(f, rule, this);
List<Boolean> conditions = new ArrayList<>();
for (Class<? extends Condition> condition : rule.condition()) { for (Class<? extends Condition> condition : rule.condition()) {
try try
{ {
Constructor<?> constr = condition.getDeclaredConstructor(); Constructor<?> constr = condition.getDeclaredConstructor();
constr.setAccessible(true); constr.setAccessible(true);
conditions.add(((Condition) constr.newInstance()).isTrue()); if (!((Condition) constr.newInstance()).isTrue())
continue rule;
} }
catch (ReflectiveOperationException e) catch (ReflectiveOperationException e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
rules.put(parsed.name, parsed);
if (rule.condition().length == 0 || conditions.stream().allMatch(Boolean::valueOf))
rules.put(parsed.name, parsed);
} }
} }