From 00603574667ab78cdb14d401bfb3e26955cf4288 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Mon, 11 May 2020 00:05:52 +0200 Subject: [PATCH] Mark fields final where appropriate --- .../java/org/jeasy/rules/core/ActionMethodOrderBean.java | 4 ++-- .../src/main/java/org/jeasy/rules/core/DefaultRule.java | 5 ++--- .../main/java/org/jeasy/rules/core/InferenceRulesEngine.java | 2 +- .../main/java/org/jeasy/rules/core/NoSuchFactException.java | 2 +- .../src/main/java/org/jeasy/rules/core/RuleBuilder.java | 2 +- .../src/main/java/org/jeasy/rules/core/RuleProxy.java | 4 ++-- .../src/main/java/org/jeasy/rules/mvel/MVELAction.java | 4 ++-- .../src/main/java/org/jeasy/rules/mvel/MVELCondition.java | 2 +- .../src/main/java/org/jeasy/rules/mvel/MVELRule.java | 2 +- .../src/main/java/org/jeasy/rules/spel/SpELRule.java | 2 +- .../org/jeasy/rules/support/composite/CompositeRule.java | 2 +- .../jeasy/rules/support/reader/JsonRuleDefinitionReader.java | 2 +- .../jeasy/rules/support/reader/YamlRuleDefinitionReader.java | 2 +- 13 files changed, 17 insertions(+), 18 deletions(-) diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/core/ActionMethodOrderBean.java b/easy-rules-core/src/main/java/org/jeasy/rules/core/ActionMethodOrderBean.java index 61fb28d..47832b2 100644 --- a/easy-rules-core/src/main/java/org/jeasy/rules/core/ActionMethodOrderBean.java +++ b/easy-rules-core/src/main/java/org/jeasy/rules/core/ActionMethodOrderBean.java @@ -32,9 +32,9 @@ import java.lang.reflect.Method; */ class ActionMethodOrderBean implements Comparable { - private Method method; + private final Method method; - private int order; + private final int order; ActionMethodOrderBean(final Method method, final int order) { this.method = method; diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/core/DefaultRule.java b/easy-rules-core/src/main/java/org/jeasy/rules/core/DefaultRule.java index a3210b6..da7a766 100644 --- a/easy-rules-core/src/main/java/org/jeasy/rules/core/DefaultRule.java +++ b/easy-rules-core/src/main/java/org/jeasy/rules/core/DefaultRule.java @@ -27,13 +27,12 @@ import org.jeasy.rules.api.Action; import org.jeasy.rules.api.Condition; import org.jeasy.rules.api.Facts; -import java.util.ArrayList; import java.util.List; class DefaultRule extends BasicRule { - private Condition condition = Condition.FALSE; - private List actions = new ArrayList<>(); + private final Condition condition; + private final List actions; DefaultRule(String name, String description, int priority, Condition condition, List actions) { super(name, description, priority); diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/core/InferenceRulesEngine.java b/easy-rules-core/src/main/java/org/jeasy/rules/core/InferenceRulesEngine.java index 282e0d7..614b985 100644 --- a/easy-rules-core/src/main/java/org/jeasy/rules/core/InferenceRulesEngine.java +++ b/easy-rules-core/src/main/java/org/jeasy/rules/core/InferenceRulesEngine.java @@ -42,7 +42,7 @@ public final class InferenceRulesEngine extends AbstractRulesEngine { private static final Logger LOGGER = LoggerFactory.getLogger(InferenceRulesEngine.class); - private DefaultRulesEngine delegate; + private final DefaultRulesEngine delegate; /** * Create a new inference rules engine with default parameters. diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/core/NoSuchFactException.java b/easy-rules-core/src/main/java/org/jeasy/rules/core/NoSuchFactException.java index 28119da..bd077b6 100644 --- a/easy-rules-core/src/main/java/org/jeasy/rules/core/NoSuchFactException.java +++ b/easy-rules-core/src/main/java/org/jeasy/rules/core/NoSuchFactException.java @@ -25,7 +25,7 @@ package org.jeasy.rules.core; class NoSuchFactException extends RuntimeException { - private String missingFact; + private final String missingFact; public NoSuchFactException(String message, String missingFact) { super(message); diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleBuilder.java b/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleBuilder.java index 28e9957..60c0090 100644 --- a/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleBuilder.java +++ b/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleBuilder.java @@ -42,7 +42,7 @@ public class RuleBuilder { private int priority = Rule.DEFAULT_PRIORITY; private Condition condition = Condition.FALSE; - private List actions = new ArrayList<>(); + private final List actions = new ArrayList<>(); /** * Set rule name. diff --git a/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleProxy.java b/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleProxy.java index d87665d..bdf8ef5 100644 --- a/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleProxy.java +++ b/easy-rules-core/src/main/java/org/jeasy/rules/core/RuleProxy.java @@ -48,7 +48,7 @@ import static java.lang.String.format; */ public class RuleProxy implements InvocationHandler { - private Object target; + private final Object target; private String name; private String description; private Integer priority; @@ -59,7 +59,7 @@ public class RuleProxy implements InvocationHandler { private Method toStringMethod; private org.jeasy.rules.annotation.Rule annotation; - private static RuleDefinitionValidator ruleDefinitionValidator = new RuleDefinitionValidator(); + private static final RuleDefinitionValidator ruleDefinitionValidator = new RuleDefinitionValidator(); private static final Logger LOGGER = LoggerFactory.getLogger(RuleProxy.class); diff --git a/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELAction.java b/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELAction.java index 7c1b424..9aa5dc2 100644 --- a/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELAction.java +++ b/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELAction.java @@ -41,8 +41,8 @@ public class MVELAction implements Action { private static final Logger LOGGER = LoggerFactory.getLogger(MVELAction.class); - private String expression; - private Serializable compiledExpression; + private final String expression; + private final Serializable compiledExpression; /** * Create a new {@link MVELAction}. diff --git a/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELCondition.java b/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELCondition.java index a2ed706..cb11268 100644 --- a/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELCondition.java +++ b/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELCondition.java @@ -37,7 +37,7 @@ import java.io.Serializable; */ public class MVELCondition implements Condition { - private Serializable compiledExpression; + private final Serializable compiledExpression; /** * Create a new {@link MVELCondition}. diff --git a/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELRule.java b/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELRule.java index 4078644..6a4cec6 100644 --- a/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELRule.java +++ b/easy-rules-mvel/src/main/java/org/jeasy/rules/mvel/MVELRule.java @@ -41,7 +41,7 @@ import java.util.List; public class MVELRule extends BasicRule { private Condition condition = Condition.FALSE; - private List actions = new ArrayList<>(); + private final List actions = new ArrayList<>(); private final ParserContext parserContext; /** diff --git a/easy-rules-spel/src/main/java/org/jeasy/rules/spel/SpELRule.java b/easy-rules-spel/src/main/java/org/jeasy/rules/spel/SpELRule.java index 2bd1f10..8d9251c 100644 --- a/easy-rules-spel/src/main/java/org/jeasy/rules/spel/SpELRule.java +++ b/easy-rules-spel/src/main/java/org/jeasy/rules/spel/SpELRule.java @@ -43,7 +43,7 @@ import java.util.List; public class SpELRule extends BasicRule { private Condition condition = Condition.FALSE; - private List actions = new ArrayList<>(); + private final List actions = new ArrayList<>(); private final ParserContext parserContext; private BeanResolver beanResolver; diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java index ea1a2bf..efbd749 100644 --- a/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java +++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/composite/CompositeRule.java @@ -45,7 +45,7 @@ public abstract class CompositeRule extends BasicRule { */ protected Set rules; - private Map proxyRules; + private final Map proxyRules; /** * Create a new {@link CompositeRule}. diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/JsonRuleDefinitionReader.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/JsonRuleDefinitionReader.java index 886c578..f690b8c 100644 --- a/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/JsonRuleDefinitionReader.java +++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/JsonRuleDefinitionReader.java @@ -44,7 +44,7 @@ import java.util.Map; @SuppressWarnings("unchecked") public class JsonRuleDefinitionReader extends AbstractRuleDefinitionReader { - private ObjectMapper objectMapper; + private final ObjectMapper objectMapper; /** * Create a new {@link JsonRuleDefinitionReader}. diff --git a/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/YamlRuleDefinitionReader.java b/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/YamlRuleDefinitionReader.java index dbc5ee3..b5273fb 100644 --- a/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/YamlRuleDefinitionReader.java +++ b/easy-rules-support/src/main/java/org/jeasy/rules/support/reader/YamlRuleDefinitionReader.java @@ -46,7 +46,7 @@ import java.util.Map; @SuppressWarnings("unchecked") public class YamlRuleDefinitionReader extends AbstractRuleDefinitionReader { - private Yaml yaml; + private final Yaml yaml; /** * Create a new {@link YamlRuleDefinitionReader}.