This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 43474313 Don't initialize an instance or static variable to its
default value
43474313 is described below
commit 43474313e06849dab14040c40d2055dd02067371
Author: Gary Gregory <[email protected]>
AuthorDate: Fri Oct 27 10:22:40 2023 -0400
Don't initialize an instance or static variable to its default value
---
src/main/config/checkstyle.xml | 1 +
.../java/org/apache/commons/jexl3/JexlBuilder.java | 18 +++++++++---------
.../java/org/apache/commons/jexl3/JexlOptions.java | 2 +-
.../apache/commons/jexl3/internal/ArrayBuilder.java | 4 ++--
.../org/apache/commons/jexl3/internal/Debugger.java | 10 +++++-----
.../java/org/apache/commons/jexl3/internal/Engine.java | 4 ++--
.../org/apache/commons/jexl3/internal/Interpreter.java | 6 +++---
.../apache/commons/jexl3/internal/InterpreterBase.java | 10 +++++-----
.../apache/commons/jexl3/internal/LexicalFrame.java | 2 +-
.../apache/commons/jexl3/internal/LexicalScope.java | 6 +++---
.../java/org/apache/commons/jexl3/internal/Scope.java | 6 +++---
.../org/apache/commons/jexl3/internal/SoftCache.java | 2 +-
.../jexl3/internal/introspection/IndexedType.java | 4 ++--
.../commons/jexl3/introspection/JexlSandbox.java | 4 ++--
.../org/apache/commons/jexl3/parser/ASTAnnotation.java | 2 +-
.../apache/commons/jexl3/parser/ASTArrayAccess.java | 2 +-
.../org/apache/commons/jexl3/parser/ASTIdentifier.java | 4 ++--
.../commons/jexl3/parser/ASTIdentifierAccess.java | 4 ++--
.../org/apache/commons/jexl3/parser/ASTJexlScript.java | 2 +-
.../apache/commons/jexl3/parser/ASTJxltLiteral.java | 2 +-
.../commons/jexl3/parser/ASTQualifiedIdentifier.java | 2 +-
.../apache/commons/jexl3/parser/ASTRegexLiteral.java | 2 +-
.../apache/commons/jexl3/parser/ASTStringLiteral.java | 2 +-
.../apache/commons/jexl3/parser/ExtensibleNode.java | 4 ++--
.../apache/commons/jexl3/parser/JexlLexicalNode.java | 2 +-
.../org/apache/commons/jexl3/parser/JexlParser.java | 14 +++++++-------
.../org/apache/commons/jexl3/parser/NumberParser.java | 4 ++--
.../commons/jexl3/scripting/JexlScriptEngine.java | 4 ++--
.../java/org/apache/commons/jexl3/AnnotationTest.java | 4 ++--
.../java/org/apache/commons/jexl3/ClassCreator.java | 10 +++++-----
.../org/apache/commons/jexl3/ClassCreatorTest.java | 4 ++--
.../org/apache/commons/jexl3/ContextNamespaceTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/Foo.java | 2 +-
.../java/org/apache/commons/jexl3/Issues200Test.java | 2 +-
.../java/org/apache/commons/jexl3/Issues300Test.java | 4 ++--
src/test/java/org/apache/commons/jexl3/JXLTTest.java | 4 ++--
src/test/java/org/apache/commons/jexl3/MethodTest.java | 4 ++--
.../java/org/apache/commons/jexl3/internal/Dumper.java | 2 +-
38 files changed, 84 insertions(+), 83 deletions(-)
diff --git a/src/main/config/checkstyle.xml b/src/main/config/checkstyle.xml
index 70850720..9815d5e7 100644
--- a/src/main/config/checkstyle.xml
+++ b/src/main/config/checkstyle.xml
@@ -54,6 +54,7 @@ limitations under the License.
</module>
<module name="TreeWalker">
+ <module name="ExplicitInitializationCheck" />
<module name="AvoidStarImport">
<property name="excludes"
value="org.junit.Assert,org.apache.commons.jexl3.parser"/>
</module>
diff --git a/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
b/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
index 256cd429..01656fef 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
@@ -100,25 +100,25 @@ public class JexlBuilder {
protected static final int CACHE_THRESHOLD = 64;
/** The JexlUberspect instance. */
- private JexlUberspect uberspect = null;
+ private JexlUberspect uberspect;
/** The {@link JexlUberspect} resolver strategy. */
- private JexlUberspect.ResolverStrategy strategy = null;
+ private JexlUberspect.ResolverStrategy strategy;
/** The set of permissions. */
private JexlPermissions permissions;
/** The sandbox. */
- private JexlSandbox sandbox = null;
+ private JexlSandbox sandbox;
/** The Log to which all JexlEngine messages will be logged. */
- private Log logger = null;
+ private Log logger;
/** Whether error messages will carry debugging information. */
- private Boolean debug = null;
+ private Boolean debug;
/** Whether interrupt throws JexlException.Cancel. */
- private Boolean cancellable = null;
+ private Boolean cancellable;
/** The options. */
private final JexlOptions options = new JexlOptions();
@@ -127,7 +127,7 @@ public class JexlBuilder {
private int collectMode = 1;
/** The {@link JexlArithmetic} instance. */
- private JexlArithmetic arithmetic = null;
+ private JexlArithmetic arithmetic;
/** The cache size. */
private int cache = -1;
@@ -142,10 +142,10 @@ public class JexlBuilder {
private Charset charset = Charset.defaultCharset();
/** The class loader. */
- private ClassLoader loader = null;
+ private ClassLoader loader;
/** The features. */
- private JexlFeatures features = null;
+ private JexlFeatures features;
/**
* Default constructor.
diff --git a/src/main/java/org/apache/commons/jexl3/JexlOptions.java
b/src/main/java/org/apache/commons/jexl3/JexlOptions.java
index 83f56104..a6b76c5f 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlOptions.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlOptions.java
@@ -65,7 +65,7 @@ public final class JexlOptions {
/** Default mask .*/
private static int DEFAULT = 1 /*<< CANCELLABLE*/ | 1 << STRICT | 1 <<
ANTISH | 1 << SAFE;
/** The arithmetic math context. */
- private MathContext mathContext = null;
+ private MathContext mathContext;
/** The arithmetic math scale. */
private int mathScale = Integer.MIN_VALUE;
/** The arithmetic strict math flag. */
diff --git a/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
b/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
index 30ee18cd..a7825b1c 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
@@ -55,7 +55,7 @@ public class ArrayBuilder implements
JexlArithmetic.ArrayBuilder {
}
/** The intended class array. */
- protected Class<?> commonClass = null;
+ protected Class<?> commonClass;
/** Whether the array stores numbers. */
protected boolean isNumber = true;
/** Whether we can try unboxing. */
@@ -63,7 +63,7 @@ public class ArrayBuilder implements
JexlArithmetic.ArrayBuilder {
/** The untyped list of items being added. */
protected final Object[] untyped;
/** Number of added items. */
- protected int added = 0;
+ protected int added;
/** Extended? */
protected final boolean extended;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
index 710cae8d..3889e131 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
@@ -128,13 +128,13 @@ public class Debugger extends ParserVisitor implements
JexlInfo.Detail {
/** The builder to compose messages. */
protected final StringBuilder builder = new StringBuilder();
/** The cause of the issue to debug. */
- protected JexlNode cause = null;
+ protected JexlNode cause;
/** The starting character location offset of the cause in the builder. */
- protected int start = 0;
+ protected int start;
/** The ending character location offset of the cause in the builder. */
- protected int end = 0;
+ protected int end;
/** The indentation level. */
- protected int indentLevel = 0;
+ protected int indentLevel;
/** Perform indentation?. */
protected int indent = 2;
/** accept() relative depth. */
@@ -144,7 +144,7 @@ public class Debugger extends ParserVisitor implements
JexlInfo.Detail {
/** EOL. */
protected String lf = "\n";
/** Pragmas out. */
- protected boolean outputPragmas = false;
+ protected boolean outputPragmas;
/**
* Creates a Debugger.
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
index 82cbcc9d..f381fff2 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -164,7 +164,7 @@ public class Engine extends JexlEngine {
/**
* The default jxlt engine.
*/
- protected volatile TemplateEngine jxlt = null;
+ protected volatile TemplateEngine jxlt;
/**
* Collect all or only dot references.
*/
@@ -824,7 +824,7 @@ public class Engine extends JexlEngine {
/**
* The node that started the collect.
*/
- private JexlNode root = null;
+ private JexlNode root;
/**
* Whether constant array-access is considered equivalent to
dot-access;
* if so, > 1 means collect any constant (set,map,...) instead of just
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
index e15880b7..2f99a7de 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
@@ -129,11 +129,11 @@ import org.apache.commons.jexl3.parser.JexlNode;
*/
public class Interpreter extends InterpreterBase {
/** Frame height. */
- protected int fp = 0;
+ protected int fp;
/** Symbol values. */
protected final Frame frame;
/** Block micro-frames. */
- protected LexicalFrame block = null;
+ protected LexicalFrame block;
/**
* The thread local interpreter.
@@ -2025,7 +2025,7 @@ public class Interpreter extends InterpreterBase {
/** The data. */
private final Object data;
/** Tracking whether we processed the annotation. */
- private boolean processed = false;
+ private boolean processed;
/**
* Simple ctor.
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
index 5152effb..55461117 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
@@ -833,15 +833,15 @@ public abstract class InterpreterBase extends
ParserVisitor {
/** Whether solution is cacheable. */
final boolean cacheable;
/** Whether arguments have been narrowed. */
- boolean narrow = false;
+ boolean narrow;
/** The method to call. */
- JexlMethod vm = null;
+ JexlMethod vm;
/** The method invocation target. */
- Object target = null;
+ Object target;
/** The actual arguments. */
- Object[] argv = null;
+ Object[] argv;
/** The cacheable funcall if any. */
- Funcall funcall = null;
+ Funcall funcall;
/**
* Dispatcher ctor.
diff --git a/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
b/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
index 59fd6315..13a0715e 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/LexicalFrame.java
@@ -35,7 +35,7 @@ public class LexicalFrame extends LexicalScope {
/**
* The stack of values in the lexical frame.
*/
- private Deque<Object> stack = null;
+ private Deque<Object> stack;
/**
* Lexical frame ctor.
diff --git a/src/main/java/org/apache/commons/jexl3/internal/LexicalScope.java
b/src/main/java/org/apache/commons/jexl3/internal/LexicalScope.java
index e798c51a..c43e0d42 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/LexicalScope.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/LexicalScope.java
@@ -45,15 +45,15 @@ public class LexicalScope {
/**
* Number of symbols.
*/
- protected int count = 0;
+ protected int count;
/**
* The mask of symbols in the scope.
*/
- protected long symbols = 0L;
+ protected long symbols;
/**
* Symbols after bit 64 (aka symbol 32 when 2 bits per symbol).
*/
- protected BitSet moreSymbols = null;
+ protected BitSet moreSymbols;
/**
* Create a scope.
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Scope.java
b/src/main/java/org/apache/commons/jexl3/internal/Scope.java
index dd88ce9a..6c239248 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Scope.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Scope.java
@@ -61,15 +61,15 @@ public final class Scope {
* Each parameter is associated to a symbol and is materialized as an
offset in the stacked array used
* during evaluation.
*/
- private Map<String, Integer> namedVariables = null;
+ private Map<String, Integer> namedVariables;
/**
* The map of local captured variables to parent scope variables, ie
closure.
*/
- private Map<Integer, Integer> capturedVariables = null;
+ private Map<Integer, Integer> capturedVariables;
/**
* Let symbols.
*/
- private LexicalScope lexicalVariables = null;
+ private LexicalScope lexicalVariables;
/**
* The empty string array.
diff --git a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
index 8c5d0aa5..ef5c740f 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
@@ -46,7 +46,7 @@ public class SoftCache<K, V> {
/**
* The soft reference to the cache map.
*/
- private SoftReference<Map<K, V>> ref = null;
+ private SoftReference<Map<K, V>> ref;
/**
* The cache r/w lock.
*/
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java
index 4363f05b..61798247 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java
@@ -37,11 +37,11 @@ public final class IndexedType implements JexlPropertyGet {
/** The array of getter methods. */
private final Method[] getters;
/** Last get method used. */
- private volatile Method get = null;
+ private volatile Method get;
/** The array of setter methods. */
private final Method[] setters;
/** Last set method used. */
- private volatile Method set = null;
+ private volatile Method set;
/**
* Attempts to find an indexed-property getter in an object.
diff --git
a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
index 88b4f33b..2f07d65b 100644
--- a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
+++ b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
@@ -326,7 +326,7 @@ public final class JexlSandbox {
*/
static class AllowSet extends Names {
/** The map of controlled names and aliases. */
- private Map<String, String> names = null;
+ private Map<String, String> names;
@Override
protected Names copy() {
@@ -370,7 +370,7 @@ public final class JexlSandbox {
*/
static class BlockSet extends Names {
/** The set of controlled names. */
- private Set<String> names = null;
+ private Set<String> names;
@Override
protected Names copy() {
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTAnnotation.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTAnnotation.java
index 1a357310..e126af70 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTAnnotation.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTAnnotation.java
@@ -24,7 +24,7 @@ public class ASTAnnotation extends JexlNode {
*
*/
private static final long serialVersionUID = 1L;
- private String name = null;
+ private String name;
ASTAnnotation(final int id) {
super(id);
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTArrayAccess.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTArrayAccess.java
index cbcb84e1..b15bb935 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTArrayAccess.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTArrayAccess.java
@@ -26,7 +26,7 @@ public class ASTArrayAccess extends JexlLexicalNode {
* However, an expression like 'a?[b]?[c]?...?[b0]' with 64 terms is very
unlikely
* to occur in real life and a bad idea anyhow.
*/
- private long safe = 0;
+ private long safe;
public ASTArrayAccess(final int id) {
super(id);
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
index 46ca88bc..b604cc30 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
@@ -24,9 +24,9 @@ public class ASTIdentifier extends JexlNode {
*
*/
private static final long serialVersionUID = 1L;
- protected String name = null;
+ protected String name;
protected int symbol = -1;
- protected int flags = 0;
+ protected int flags;
/** The redefined variable flag. */
private static final int REDEFINED = 0;
diff --git
a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
index 334ad288..2a35c5a2 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
@@ -25,8 +25,8 @@ public class ASTIdentifierAccess extends JexlNode {
*
*/
private static final long serialVersionUID = 1L;
- private String name = null;
- private Integer identifier = null;
+ private String name;
+ private Integer identifier;
ASTIdentifierAccess(final int id) {
super(id);
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
index 14bd25e0..e739482e 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTJexlScript.java
@@ -29,7 +29,7 @@ public class ASTJexlScript extends JexlLexicalNode {
/** serial uid.*/
private static final long serialVersionUID = 202112111533L;
/** The pragmas. */
- private Map<String, Object> pragmas = null;
+ private Map<String, Object> pragmas;
/** Features. */
private transient JexlFeatures features = null;
/** The script scope. */
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTJxltLiteral.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTJxltLiteral.java
index f4a3c8dd..bc574004 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTJxltLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTJxltLiteral.java
@@ -22,7 +22,7 @@ public final class ASTJxltLiteral extends JexlNode {
/** serial uid.*/
private static final long serialVersionUID = 1L;
/** The actual literal value. */
- private String literal = null;
+ private String literal;
/** The expression (parsed). */
private transient JxltEngine.Expression jxltExpression = null;
diff --git
a/src/main/java/org/apache/commons/jexl3/parser/ASTQualifiedIdentifier.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTQualifiedIdentifier.java
index 95667774..fda387f3 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTQualifiedIdentifier.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTQualifiedIdentifier.java
@@ -24,7 +24,7 @@ public class ASTQualifiedIdentifier extends JexlNode {
*
*/
private static final long serialVersionUID = 1L;
- protected String name = null;
+ protected String name;
ASTQualifiedIdentifier(final int id) {
super(id);
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTRegexLiteral.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTRegexLiteral.java
index 99d82c5e..81f2a1d7 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTRegexLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTRegexLiteral.java
@@ -26,7 +26,7 @@ public final class ASTRegexLiteral extends JexlNode
implements JexlNode.Constant
private static final long serialVersionUID = 1L;
/** The actual literal value; the inherited 'value' member may host a
cached getter. */
- private Pattern literal = null;
+ private Pattern literal;
ASTRegexLiteral(final int id) {
super(id);
diff --git
a/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java
b/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java
index 141a280e..c25b5a16 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java
@@ -22,7 +22,7 @@ public final class ASTStringLiteral extends JexlNode
implements JexlNode.Constan
*/
private static final long serialVersionUID = 1L;
/** The actual literal value; the inherited 'value' member may host a
cached getter. */
- private String literal = null;
+ private String literal;
ASTStringLiteral(final int id) {
super(id);
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ExtensibleNode.java
b/src/main/java/org/apache/commons/jexl3/parser/ExtensibleNode.java
index beb34039..c0c147e8 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ExtensibleNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ExtensibleNode.java
@@ -25,9 +25,9 @@ import org.apache.commons.jexl3.internal.Debugger;
*/
public class ExtensibleNode extends JexlNode {
/** Whether this array/set/map is constant or not. */
- protected boolean constant = false;
+ protected boolean constant;
/** Whether this array/set/map is extended or not. */
- private boolean extended = false;
+ private boolean extended;
public ExtensibleNode(final int id) {
super(id);
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
b/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
index 037f0a0c..00c005d3 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
@@ -25,7 +25,7 @@ import org.apache.commons.jexl3.internal.LexicalScope;
public abstract class JexlLexicalNode extends JexlNode implements
JexlParser.LexicalUnit {
private static final long serialVersionUID = 1L;
/** The local lexical scope, local information about let/const. */
- private LexicalScope lexicalScope = null;
+ private LexicalScope lexicalScope;
public JexlLexicalNode(final int id) {
super(id);
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
index d4b83137..a353c2fc 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
@@ -49,17 +49,17 @@ public abstract class JexlParser extends StringParser {
/**
* The basic source info.
*/
- protected JexlInfo info = null;
+ protected JexlInfo info;
/**
* The source being processed.
*/
- protected String source = null;
+ protected String source;
/**
* The map of named registers aka script parameters.
* <p>Each parameter is associated to a register and is materialized
* as an offset in the registers array used during evaluation.</p>
*/
- protected Scope scope = null;
+ protected Scope scope;
/**
* When parsing inner functions/lambda, need to stack the scope (sic).
*/
@@ -67,15 +67,15 @@ public abstract class JexlParser extends StringParser {
/**
* The list of pragma declarations.
*/
- protected Map<String, Object> pragmas = null;
+ protected Map<String, Object> pragmas;
/**
* The known namespaces.
*/
- protected Set<String> namespaces = null;
+ protected Set<String> namespaces;
/**
* The number of nested loops.
*/
- protected int loopCount = 0;
+ protected int loopCount;
/**
* Stack of parsing loop counts.
*/
@@ -83,7 +83,7 @@ public abstract class JexlParser extends StringParser {
/**
* The current lexical block.
*/
- protected LexicalUnit block = null;
+ protected LexicalUnit block;
/**
* Stack of lexical blocks.
*/
diff --git a/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
b/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
index 5bd2a285..ecb972b6 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
@@ -32,9 +32,9 @@ public final class NumberParser implements Serializable {
*/
private static final long serialVersionUID = 1L;
/** The type literal value. */
- private Number literal = null;
+ private Number literal;
/** The expected class. */
- private Class<? extends Number> clazz = null;
+ private Class<? extends Number> clazz;
/** JEXL locale-neutral big decimal format. */
static final DecimalFormat BIGDF = new DecimalFormat("0.0b", new
DecimalFormatSymbols(Locale.ENGLISH));
diff --git
a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
index 5dbfcdcc..48d1f390 100644
--- a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
@@ -69,12 +69,12 @@ public class JexlScriptEngine extends AbstractScriptEngine
implements Compilable
* The shared engine instance.
* <p>A single soft-reference JEXL engine and JexlUberspect is shared by
all instances of JexlScriptEngine.</p>
*/
- private static Reference<JexlEngine> ENGINE = null;
+ private static Reference<JexlEngine> ENGINE;
/**
* The permissions used to create the script engine.
*/
- private static JexlPermissions PERMISSIONS = null;
+ private static JexlPermissions PERMISSIONS;
/**
* Sets the permissions instance used to create the script engine.
* <p>Calling this method will force engine instance re-creation.</p>
diff --git a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
index 88d3f95f..d2939c2d 100644
--- a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
@@ -51,7 +51,7 @@ public class AnnotationTest extends JexlTestCase {
}
public static class AnnotationContext extends MapContext implements
JexlContext.AnnotationProcessor {
- private int count = 0;
+ private int count;
private final Set<String> names = new TreeSet<>();
@Override
@@ -318,7 +318,7 @@ public class AnnotationTest extends JexlTestCase {
* A counter whose inc method will misbehave if not mutex-ed.
*/
public static class Counter {
- private int value = 0;
+ private int value;
public void inc() {
final int v = value;
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreator.java
b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
index c1d2bb6e..4c0ecbab 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreator.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
@@ -41,12 +41,12 @@ public class ClassCreator {
//private final JexlEngine jexl;
private final File base;
- private File packageDir = null;
- private int seed = 0;
+ private File packageDir;
+ private int seed;
private String ctorBody = "";
- private String className = null;
- private String sourceName = null;
- private ClassLoader loader = null;
+ private String className;
+ private String sourceName;
+ private ClassLoader loader;
public static final boolean canRun = true;//comSunToolsJavacMain();
static final String JEXL_PACKAGE = "org.apache.commons.jexl3";
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
index e83ed761..fd1bb5b4 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
@@ -40,8 +40,8 @@ import org.junit.Test;
public class ClassCreatorTest extends JexlTestCase {
static final Log logger = LogFactory.getLog(JexlTestCase.class);
static final int LOOPS = 8;
- private File base = null;
- private JexlEngine jexl = null;
+ private File base;
+ private JexlEngine jexl;
public ClassCreatorTest() {
super("ClassCreatorTest");
diff --git a/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
b/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
index eee23108..ae9917a8 100644
--- a/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ContextNamespaceTest.java
@@ -57,7 +57,7 @@ public class ContextNamespaceTest extends JexlTestCase {
* A thread local context carrying a namespace and some inner constants.
*/
public static class TaxesContext extends MapContext implements
JexlContext.ThreadLocal, JexlContext.NamespaceResolver {
- private Taxes taxes = null;
+ private Taxes taxes;
private final double vat;
TaxesContext(final double vat) {
diff --git a/src/test/java/org/apache/commons/jexl3/Foo.java
b/src/test/java/org/apache/commons/jexl3/Foo.java
index ef4a29ea..3789c4a2 100644
--- a/src/test/java/org/apache/commons/jexl3/Foo.java
+++ b/src/test/java/org/apache/commons/jexl3/Foo.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
public class Foo {
- private boolean beenModified = false;
+ private boolean beenModified;
private String property1 = "some value";
public Foo() {}
public class Cheezy {
diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index b9ccadfa..50532944 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -305,7 +305,7 @@ public class Issues200Test extends JexlTestCase {
}
public static class Foo245 {
- private Object bar = null;
+ private Object bar;
void setBar(final Object bar) {
this.bar = bar;
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index c40383a6..2af0b46c 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -815,7 +815,7 @@ public class Issues300Test {
}
public static class Var370 {
- private String name = null;
+ private String name;
public void setName(final String s) {
name = s;
}
@@ -850,7 +850,7 @@ public class Issues300Test {
public static class TestObject374 {
private String name;
- private TestObject374 nested = null;
+ private TestObject374 nested;
public String getName() {
return name;
}
diff --git a/src/test/java/org/apache/commons/jexl3/JXLTTest.java
b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
index da68b04e..89e1a891 100644
--- a/src/test/java/org/apache/commons/jexl3/JXLTTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
@@ -48,7 +48,7 @@ import org.junit.runners.Parameterized;
public class JXLTTest extends JexlTestCase {
private static final Log LOGGER = LogFactory.getLog(JxltEngine.class);
private final MapContext vars = new MapContext();
- private JexlEvalContext context = null;
+ private JexlEvalContext context;
private final JexlBuilder BUILDER;
private final JexlEngine ENGINE;
private final JxltEngine JXLT;
@@ -845,7 +845,7 @@ public class JXLTTest extends JexlTestCase {
public static class Context311 extends MapContext
implements JexlContext.OptionsHandle, JexlContext.ThreadLocal {
- private JexlOptions options = null;
+ private JexlOptions options;
public void setOptions(final JexlOptions o) {
options = o;
diff --git a/src/test/java/org/apache/commons/jexl3/MethodTest.java
b/src/test/java/org/apache/commons/jexl3/MethodTest.java
index d9bbbeae..739e79dd 100644
--- a/src/test/java/org/apache/commons/jexl3/MethodTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MethodTest.java
@@ -175,8 +175,8 @@ public class MethodTest extends JexlTestCase {
}
public static class Functor {
- private boolean overKill = false;
- private String under = null;
+ private boolean overKill;
+ private String under;
void setKill(final boolean ok) {
overKill = ok;
diff --git a/src/test/java/org/apache/commons/jexl3/internal/Dumper.java
b/src/test/java/org/apache/commons/jexl3/internal/Dumper.java
index f539ee96..4a06cd79 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/Dumper.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/Dumper.java
@@ -26,7 +26,7 @@ import org.apache.commons.jexl3.parser.JexlNode;
*/
public class Dumper {
private final StringBuilder strb = new StringBuilder();
- private int indent = 0;
+ private int indent;
private void indent() {
for (int i = 0; i < indent; ++i) {
