You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/28 19:17:34 UTC
[commons-jexl] branch master updated (ad4984cc -> 62a8bde7)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
from ad4984cc Fix PMD issues
new 2796ddd3 Use Java diamonds
new d5e243b3 No need to nest
new 9608dcbd Access field directly
new 46615291 Remove unused imports
new 4e7c3b4a Add missing @Deprecated
new 5d57f322 Remove unused imports
new 70bb4752 Add missing serialVersionUID
new c3548fec Use try-with-resources
new 1d9eaa45 Access method directly
new ce339aee Add missing @Override
new 0b484f39 Add missing serialVersionUID
new 2553bdfa Remove unused imports
new ffccfddb Add missing @Override
new 658a8520 Add missing @Override
new 62a8bde7 Remove unused label
The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/commons/jexl3/JexlArithmetic.java | 4 +-
.../java/org/apache/commons/jexl3/JexlContext.java | 1 +
.../org/apache/commons/jexl3/JexlException.java | 5 ++
.../java/org/apache/commons/jexl3/MapContext.java | 2 +-
.../commons/jexl3/internal/ArrayBuilder.java | 4 +-
.../commons/jexl3/internal/InterpreterBase.java | 4 +-
.../apache/commons/jexl3/internal/MapBuilder.java | 2 +-
.../apache/commons/jexl3/internal/Operators.java | 11 ++---
.../apache/commons/jexl3/internal/SetBuilder.java | 2 +-
.../apache/commons/jexl3/internal/SoftCache.java | 6 +--
.../commons/jexl3/internal/TemplateEngine.java | 2 +-
.../jexl3/internal/introspection/Introspector.java | 2 +-
.../jexl3/internal/introspection/Permissions.java | 3 +-
.../jexl3/internal/introspection/Uberspect.java | 19 ++++----
.../commons/jexl3/introspection/JexlSandbox.java | 6 +--
.../apache/commons/jexl3/parser/ASTAmbiguous.java | 5 ++
.../apache/commons/jexl3/parser/ASTAnnotation.java | 4 ++
.../commons/jexl3/parser/ASTArrayLiteral.java | 4 ++
.../org/apache/commons/jexl3/parser/ASTBlock.java | 5 ++
.../commons/jexl3/parser/ASTForeachStatement.java | 4 ++
.../apache/commons/jexl3/parser/ASTIdentifier.java | 5 ++
.../commons/jexl3/parser/ASTIdentifierAccess.java | 4 ++
.../jexl3/parser/ASTIdentifierAccessJxlt.java | 4 ++
.../jexl3/parser/ASTIdentifierAccessSafe.java | 5 ++
.../jexl3/parser/ASTIdentifierAccessSafeJxlt.java | 5 ++
.../apache/commons/jexl3/parser/ASTJexlLambda.java | 5 ++
.../commons/jexl3/parser/ASTJxltLiteral.java | 4 ++
.../apache/commons/jexl3/parser/ASTMapLiteral.java | 4 ++
.../jexl3/parser/ASTNamespaceIdentifier.java | 4 ++
.../commons/jexl3/parser/ASTNumberLiteral.java | 4 ++
.../jexl3/parser/ASTQualifiedIdentifier.java | 4 ++
.../jexl3/parser/ASTReferenceExpression.java | 5 ++
.../commons/jexl3/parser/ASTRegexLiteral.java | 4 ++
.../apache/commons/jexl3/parser/ASTSetLiteral.java | 4 ++
.../commons/jexl3/parser/ASTStringLiteral.java | 4 ++
.../org/apache/commons/jexl3/parser/ASTVar.java | 5 ++
.../commons/jexl3/parser/JexlLexicalNode.java | 4 ++
.../org/apache/commons/jexl3/parser/JexlNode.java | 8 ++--
.../apache/commons/jexl3/parser/JexlParser.java | 9 ++--
.../apache/commons/jexl3/parser/NumberParser.java | 4 ++
.../apache/commons/jexl3/parser/SimpleNode.java | 4 ++
.../org/apache/commons/jexl3/AnnotationTest.java | 2 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 4 +-
.../org/apache/commons/jexl3/Arithmetic360.java | 8 ++++
.../commons/jexl3/ArithmeticOperatorTest.java | 12 ++---
.../org/apache/commons/jexl3/ArithmeticTest.java | 2 +-
.../org/apache/commons/jexl3/ArrayAccessTest.java | 10 ++--
.../java/org/apache/commons/jexl3/CacheTest.java | 10 ++--
.../java/org/apache/commons/jexl3/CaptureLog.java | 2 +-
.../org/apache/commons/jexl3/ClassCreator.java | 56 +++++++++++-----------
.../org/apache/commons/jexl3/ClassCreatorTest.java | 8 ++--
.../org/apache/commons/jexl3/ExceptionTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/Foo.java | 2 +-
.../java/org/apache/commons/jexl3/ForEachTest.java | 1 -
.../org/apache/commons/jexl3/Issues100Test.java | 4 +-
.../org/apache/commons/jexl3/Issues200Test.java | 24 +++++-----
.../org/apache/commons/jexl3/Issues300Test.java | 6 ++-
.../java/org/apache/commons/jexl3/IssuesTest.java | 4 +-
.../java/org/apache/commons/jexl3/JXLTTest.java | 4 --
.../java/org/apache/commons/jexl3/JexlTest.java | 22 ++++-----
.../java/org/apache/commons/jexl3/LexicalTest.java | 2 +-
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 14 +++---
.../apache/commons/jexl3/PropertyAccessTest.java | 9 ++--
.../apache/commons/jexl3/ScriptCallableTest.java | 2 +-
.../java/org/apache/commons/jexl3/ScriptTest.java | 12 ++---
.../org/apache/commons/jexl3/SetLiteralTest.java | 2 +-
.../org/apache/commons/jexl3/SideEffectTest.java | 10 ++--
.../org/apache/commons/jexl3/StrategyTest.java | 2 +-
.../commons/jexl3/SynchronizedArithmetic.java | 2 +-
.../commons/jexl3/SynchronizedOverloadsTest.java | 6 +--
.../java/org/apache/commons/jexl3/VarTest.java | 22 ++++-----
.../apache/commons/jexl3/examples/ArrayTest.java | 2 +-
.../org/apache/commons/jexl3/internal/Util.java | 2 +-
.../internal/introspection/DiscoveryTest.java | 4 +-
.../internal/introspection/MethodKeyTest.java | 4 +-
.../introspection/MiscIntrospectionTest.java | 8 ----
.../commons/jexl3/introspection/SandboxTest.java | 3 +-
.../commons/jexl3/jexl342/OptionalNullMethod.java | 1 -
.../apache/commons/jexl3/jexl342/OptionalTest.java | 2 -
.../org/apache/commons/jexl3/junit/Asserter.java | 2 +-
81 files changed, 293 insertions(+), 197 deletions(-)
[commons-jexl] 14/15: Add missing @Override
Posted by gg...@apache.org.
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
commit 658a8520695fe42a87af1c52ec760a016c0bdd83
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:12:43 2022 -0500
Add missing @Override
---
src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java | 1 +
1 file changed, 1 insertion(+)
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 f1877646..acb46c6d 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
@@ -121,6 +121,7 @@ public class ASTIdentifier extends JexlNode {
flags = set(LEXICAL, flags, f);
}
+ @Override
public boolean isConstant() {
return isSet(CONST, flags);
}
[commons-jexl] 09/15: Access method directly
Posted by gg...@apache.org.
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
commit 1d9eaa454529f280f8b6641e095e10a4697e9b05
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:05:04 2022 -0500
Access method directly
---
src/test/java/org/apache/commons/jexl3/VarTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java b/src/test/java/org/apache/commons/jexl3/VarTest.java
index 010bc930..a93836b4 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import org.apache.commons.jexl3.parser.JexlParser;
+import org.apache.commons.jexl3.parser.StringParser;
import org.junit.Assert;
import org.junit.Test;
import org.apache.commons.logging.Log;
@@ -484,7 +485,7 @@ public class VarTest extends JexlTestCase {
}
else if (c == '\'' || c == '"') {
strb.append(c);
- final int l = JexlParser.readString(strb, str, i + 1, c);
+ final int l = StringParser.readString(strb, str, i + 1, c);
if (l > 0) {
id = strb.substring(1, strb.length() - 1);
strb.delete(0, l + 1);
[commons-jexl] 12/15: Remove unused imports
Posted by gg...@apache.org.
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
commit 2553bdfa0fe384532134aa465b4f35bc14fcd262
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:08:38 2022 -0500
Remove unused imports
---
src/test/java/org/apache/commons/jexl3/VarTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java b/src/test/java/org/apache/commons/jexl3/VarTest.java
index a93836b4..27bdf5e6 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -27,12 +27,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
-import org.apache.commons.jexl3.parser.JexlParser;
+
import org.apache.commons.jexl3.parser.StringParser;
-import org.junit.Assert;
-import org.junit.Test;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Tests local variables.
[commons-jexl] 02/15: No need to nest
Posted by gg...@apache.org.
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
commit d5e243b331e9ac9c109a1805dcb74b96f275c16a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:54:47 2022 -0500
No need to nest
---
src/main/java/org/apache/commons/jexl3/internal/Operators.java | 3 +--
.../apache/commons/jexl3/internal/introspection/Permissions.java | 3 +--
.../java/org/apache/commons/jexl3/introspection/JexlSandbox.java | 6 ++----
src/main/java/org/apache/commons/jexl3/parser/JexlParser.java | 9 ++++-----
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Operators.java b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
index b81d1540..831b1ad6 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Operators.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
@@ -102,9 +102,8 @@ public class Operators {
// check operator only once if it is not strict
if (arithmetic.isStrict(operator)) {
throw new JexlArithmetic.NullOperand();
- } else {
- break;
}
+ break;
}
}
}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
index 02788748..95879ff8 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
@@ -118,9 +118,8 @@ public class Permissions implements JexlPermissions {
if (keyb != null) {
keyb.append(clazz.getSimpleName());
return keyb.toString();
- } else {
- return clazz.getSimpleName();
}
+ return clazz.getSimpleName();
}
/**
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 1bdadfbb..fa8438b3 100644
--- a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
+++ b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
@@ -651,9 +651,8 @@ public final class JexlSandbox {
if (permissions != null) {
if (permissions.isInheritable()) {
break;
- } else {
- permissions = null;
}
+ permissions = null;
}
}
// nothing defined yet, find first superclass that defines permissions
@@ -666,9 +665,8 @@ public final class JexlSandbox {
if (permissions != null) {
if (permissions.isInheritable()) {
break;
- } else {
- permissions = null;
}
+ permissions = null;
}
zuper = zuper.getSuperclass();
}
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 a86119dc..56f65876 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
@@ -537,12 +537,11 @@ public abstract class JexlParser extends StringParser {
if (previous instanceof Set<?>) {
((Set<Object>) previous).add(newValue);
return previous;
- } else {
- Set<Object> values = new LinkedHashSet<>();
- values.add(previous);
- values.add(newValue);
- return values;
}
+ Set<Object> values = new LinkedHashSet<>();
+ values.add(previous);
+ values.add(newValue);
+ return values;
});
}
[commons-jexl] 15/15: Remove unused label
Posted by gg...@apache.org.
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
commit 62a8bde7749a60562ef7f8a473904c2b7734321f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:17:20 2022 -0500
Remove unused label
---
.../java/org/apache/commons/jexl3/internal/introspection/Uberspect.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
index 44365262..a7ca53d0 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
@@ -454,7 +454,6 @@ public class Uberspect implements JexlUberspect {
for (final JexlOperator op : JexlOperator.values()) {
final Method[] methods = getMethods(arithmetic.getClass(), op.getMethodName());
if (methods != null) {
- mloop:
for (final Method method : methods) {
final Class<?>[] parms = method.getParameterTypes();
if (parms.length != op.getArity()) {
[commons-jexl] 07/15: Add missing serialVersionUID
Posted by gg...@apache.org.
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
commit 70bb4752a2dc04d428ec8d53027e033234f403e4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:59:55 2022 -0500
Add missing serialVersionUID
---
src/main/java/org/apache/commons/jexl3/JexlArithmetic.java | 4 +++-
src/main/java/org/apache/commons/jexl3/JexlException.java | 5 +++++
src/main/java/org/apache/commons/jexl3/parser/ASTAmbiguous.java | 5 +++++
src/main/java/org/apache/commons/jexl3/parser/ASTAnnotation.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTBlock.java | 5 +++++
.../java/org/apache/commons/jexl3/parser/ASTForeachStatement.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java | 4 ++++
.../java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java | 4 ++++
.../org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java | 4 ++++
.../org/apache/commons/jexl3/parser/ASTIdentifierAccessSafe.java | 5 +++++
.../org/apache/commons/jexl3/parser/ASTIdentifierAccessSafeJxlt.java | 5 +++++
src/main/java/org/apache/commons/jexl3/parser/ASTJexlLambda.java | 5 +++++
src/main/java/org/apache/commons/jexl3/parser/ASTJxltLiteral.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java | 4 ++++
.../java/org/apache/commons/jexl3/parser/ASTNamespaceIdentifier.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java | 4 ++++
.../java/org/apache/commons/jexl3/parser/ASTQualifiedIdentifier.java | 4 ++++
.../java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java | 5 +++++
src/main/java/org/apache/commons/jexl3/parser/ASTRegexLiteral.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTSetLiteral.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/ASTVar.java | 5 +++++
src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/JexlNode.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/NumberParser.java | 4 ++++
src/main/java/org/apache/commons/jexl3/parser/SimpleNode.java | 4 ++++
27 files changed, 115 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java b/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
index 487d4c17..937069a7 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
@@ -60,7 +60,9 @@ import static java.lang.StrictMath.floor;
public class JexlArithmetic {
/** Marker class for null operand exceptions. */
- public static class NullOperand extends ArithmeticException {}
+ public static class NullOperand extends ArithmeticException {
+
+ private static final long serialVersionUID = 1L;}
/** Double.MAX_VALUE as BigDecimal. */
protected static final BigDecimal BIGD_DOUBLE_MAX_VALUE = BigDecimal.valueOf(Double.MAX_VALUE);
diff --git a/src/main/java/org/apache/commons/jexl3/JexlException.java b/src/main/java/org/apache/commons/jexl3/JexlException.java
index 19f73d45..0bf9ef60 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlException.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlException.java
@@ -989,6 +989,11 @@ public class JexlException extends RuntimeException {
* @since 3.0
*/
public static class Cancel extends JexlException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a new instance of Cancel.
*
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTAmbiguous.java b/src/main/java/org/apache/commons/jexl3/parser/ASTAmbiguous.java
index f5699f85..cfc47d0d 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTAmbiguous.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTAmbiguous.java
@@ -18,6 +18,11 @@ package org.apache.commons.jexl3.parser;
public final class ASTAmbiguous extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
ASTAmbiguous(final int id) {
super(id);
}
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 a7dc4578..02ecf2a5 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTAnnotation.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTAnnotation.java
@@ -20,6 +20,10 @@ package org.apache.commons.jexl3.parser;
* Annotation.
*/
public class ASTAnnotation extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private String name = null;
ASTAnnotation(final int id) {
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java b/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java
index abe9b347..febbbc4a 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTArrayLiteral.java
@@ -22,6 +22,10 @@ import org.apache.commons.jexl3.internal.Debugger;
* An array literal.
*/
public final class ASTArrayLiteral extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** Whether this array is constant or not. */
private boolean constant = false;
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTBlock.java b/src/main/java/org/apache/commons/jexl3/parser/ASTBlock.java
index 428495c7..83e54898 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTBlock.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTBlock.java
@@ -21,6 +21,11 @@ package org.apache.commons.jexl3.parser;
*/
public class ASTBlock extends JexlLexicalNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public ASTBlock(final int id) {
super(id);
}
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTForeachStatement.java b/src/main/java/org/apache/commons/jexl3/parser/ASTForeachStatement.java
index 200371d2..b9afbc01 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTForeachStatement.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTForeachStatement.java
@@ -20,6 +20,10 @@ package org.apache.commons.jexl3.parser;
* Declares a for each loop.
*/
public class ASTForeachStatement extends JexlLexicalNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private int loopForm;
void setLoopForm(int form) {
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 944b5915..f1877646 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifier.java
@@ -20,6 +20,10 @@ package org.apache.commons.jexl3.parser;
* Identifiers, variables, ie symbols.
*/
public class ASTIdentifier extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
protected String name = null;
protected int symbol = -1;
protected int flags = 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 05b42312..0beb6262 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
@@ -21,6 +21,10 @@ package org.apache.commons.jexl3.parser;
* Identifiers, variables and registers.
*/
public class ASTIdentifierAccess extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private String name = null;
private Integer identifier = null;
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java
index 73af1772..bca98709 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java
@@ -23,6 +23,10 @@ import org.apache.commons.jexl3.JxltEngine;
* x.`expr`.
*/
public class ASTIdentifierAccessJxlt extends ASTIdentifierAccess {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
protected JxltEngine.Expression jxltExpr;
ASTIdentifierAccessJxlt(final int id) {
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafe.java b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafe.java
index 151a14ca..137bbb97 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafe.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafe.java
@@ -21,6 +21,11 @@ package org.apache.commons.jexl3.parser;
* x?.identifier .
*/
public class ASTIdentifierAccessSafe extends ASTIdentifierAccess {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
ASTIdentifierAccessSafe(final int id) {
super(id);
}
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafeJxlt.java b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafeJxlt.java
index 912021d4..bc453c6a 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafeJxlt.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessSafeJxlt.java
@@ -21,6 +21,11 @@ package org.apache.commons.jexl3.parser;
* x?.`expr` .
*/
public class ASTIdentifierAccessSafeJxlt extends ASTIdentifierAccessJxlt {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
ASTIdentifierAccessSafeJxlt(final int id) {
super(id);
}
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTJexlLambda.java b/src/main/java/org/apache/commons/jexl3/parser/ASTJexlLambda.java
index 3d883c4d..1451fe35 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTJexlLambda.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTJexlLambda.java
@@ -20,6 +20,11 @@ package org.apache.commons.jexl3.parser;
* Lambda (function).
*/
public final class ASTJexlLambda extends ASTJexlScript {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
ASTJexlLambda(final int id) {
super(id);
}
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 0632a575..5dcbe8e3 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTJxltLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTJxltLiteral.java
@@ -17,6 +17,10 @@
package org.apache.commons.jexl3.parser;
public final class ASTJxltLiteral extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** The actual literal value; the inherited 'value' member may host a cached template expression. */
private String literal = null;
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java b/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java
index 796e2aaa..c8b82337 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTMapLiteral.java
@@ -19,6 +19,10 @@ package org.apache.commons.jexl3.parser;
import org.apache.commons.jexl3.internal.Debugger;
public final class ASTMapLiteral extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** Whether this array is constant or not. */
private boolean constant = false;
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTNamespaceIdentifier.java b/src/main/java/org/apache/commons/jexl3/parser/ASTNamespaceIdentifier.java
index 02a6d105..5aa7669a 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTNamespaceIdentifier.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTNamespaceIdentifier.java
@@ -20,6 +20,10 @@ package org.apache.commons.jexl3.parser;
* Namespace : identifier.
*/
public class ASTNamespaceIdentifier extends ASTIdentifier {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private String namespace;
public ASTNamespaceIdentifier(final int id) {
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java b/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java
index 4ed052db..e1f46ff1 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTNumberLiteral.java
@@ -17,6 +17,10 @@
package org.apache.commons.jexl3.parser;
public final class ASTNumberLiteral extends JexlNode implements JexlNode.Constant<Number> {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** The number parser. */
private final NumberParser nlp;
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 a5610b4c..016b5949 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTQualifiedIdentifier.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTQualifiedIdentifier.java
@@ -20,6 +20,10 @@ package org.apache.commons.jexl3.parser;
* Identifiers, variables, ie symbols.
*/
public class ASTQualifiedIdentifier extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
protected String name = null;
ASTQualifiedIdentifier(final int id) {
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java b/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java
index 3822c5a2..40be08c9 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTReferenceExpression.java
@@ -17,6 +17,11 @@
package org.apache.commons.jexl3.parser;
public final class ASTReferenceExpression extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
ASTReferenceExpression(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 f592f258..d41d5c21 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTRegexLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTRegexLiteral.java
@@ -20,6 +20,10 @@ import java.util.regex.Pattern;
public final class ASTRegexLiteral extends JexlNode implements JexlNode.Constant<Pattern> {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** The actual literal value; the inherited 'value' member may host a cached getter. */
private Pattern literal = null;
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTSetLiteral.java b/src/main/java/org/apache/commons/jexl3/parser/ASTSetLiteral.java
index 64ff0f20..f10dc7a7 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTSetLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTSetLiteral.java
@@ -19,6 +19,10 @@ package org.apache.commons.jexl3.parser;
import org.apache.commons.jexl3.internal.Debugger;
public final class ASTSetLiteral extends JexlNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** Whether this set is constant or not. */
private boolean constant = false;
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 048bbdb7..e3338093 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTStringLiteral.java
@@ -17,6 +17,10 @@
package org.apache.commons.jexl3.parser;
public final class ASTStringLiteral extends JexlNode implements JexlNode.Constant<String> {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** The actual literal value; the inherited 'value' member may host a cached getter. */
private String literal = null;
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java b/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java
index c6ef66d2..a5b400ec 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTVar.java
@@ -20,6 +20,11 @@ package org.apache.commons.jexl3.parser;
* Declares a local variable.
*/
public class ASTVar extends ASTIdentifier {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public ASTVar(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 17eff4f6..b5c875b7 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlLexicalNode.java
@@ -23,6 +23,10 @@ import org.apache.commons.jexl3.internal.LexicalScope;
* @since 3.2
*/
public class JexlLexicalNode extends JexlNode implements JexlParser.LexicalUnit {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private LexicalScope lexicalScope = null;
public JexlLexicalNode(final int id) {
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java b/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
index 4a1148cd..d2f88a9e 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
@@ -28,6 +28,10 @@ import org.apache.commons.jexl3.introspection.JexlPropertySet;
* @since 2.0
*/
public abstract class JexlNode extends SimpleNode {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
// line + column encoded: up to 4096 columns (ie 20 bits for line + 12 bits for column)
private int lc = -1;
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 20a89d69..bbf678ca 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
@@ -27,6 +27,10 @@ import java.util.Locale;
* Parses number literals.
*/
public final class NumberParser implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** The type literal value. */
private Number literal = null;
/** The expected class. */
diff --git a/src/main/java/org/apache/commons/jexl3/parser/SimpleNode.java b/src/main/java/org/apache/commons/jexl3/parser/SimpleNode.java
index 0a83e9ac..23d1b01a 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/SimpleNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/SimpleNode.java
@@ -32,6 +32,10 @@ package org.apache.commons.jexl3.parser;
* so it can serve as a last evaluation cache even in multi-threaded executions.
*/
public class SimpleNode implements Node {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/** The parent node. */
private JexlNode parent;
/** The array of children nodes. */
[commons-jexl] 13/15: Add missing @Override
Posted by gg...@apache.org.
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
commit ffccfddb97128920e2f4bd0c0b78466708a77a05
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:09:15 2022 -0500
Add missing @Override
---
src/test/java/org/apache/commons/jexl3/Arithmetic360.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/test/java/org/apache/commons/jexl3/Arithmetic360.java b/src/test/java/org/apache/commons/jexl3/Arithmetic360.java
index 3149f193..a44ec333 100644
--- a/src/test/java/org/apache/commons/jexl3/Arithmetic360.java
+++ b/src/test/java/org/apache/commons/jexl3/Arithmetic360.java
@@ -97,6 +97,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param right the right operator
* @return left & right
*/
+ @Override
public Object and(final Object left, final Object right) {
final Number l = asLongNumber(left);
final Number r = asLongNumber(right);
@@ -146,6 +147,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param val the operand
* @return ~val
*/
+ @Override
public Object complement(final Object val) {
final long l = toLong(val);
return narrowLong(val, ~l);
[commons-jexl] 03/15: Access field directly
Posted by gg...@apache.org.
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
commit 9608dcbd203b55eaf5459681cea8914cdc049043
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:56:30 2022 -0500
Access field directly
---
.../java/org/apache/commons/jexl3/internal/InterpreterBase.java | 4 ++--
src/main/java/org/apache/commons/jexl3/internal/Operators.java | 8 ++++----
.../apache/commons/jexl3/internal/introspection/Introspector.java | 2 +-
.../apache/commons/jexl3/internal/introspection/Uberspect.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
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 fd23c7e8..c5f948b5 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
@@ -93,7 +93,7 @@ public abstract class InterpreterBase extends ParserVisitor {
this.jexl = engine;
this.logger = jexl.logger;
this.uberspect = jexl.uberspect;
- this.context = aContext != null ? aContext : Engine.EMPTY_CONTEXT;
+ this.context = aContext != null ? aContext : JexlEngine.EMPTY_CONTEXT;
this.cache = engine.cache != null;
final JexlArithmetic jexla = jexl.arithmetic;
this.options = opts == null? engine.evalOptions(aContext) : opts;
@@ -106,7 +106,7 @@ public abstract class InterpreterBase extends ParserVisitor {
if (this.context instanceof JexlContext.NamespaceResolver) {
ns = ((JexlContext.NamespaceResolver) context);
} else {
- ns = Engine.EMPTY_NS;
+ ns = JexlEngine.EMPTY_NS;
}
AtomicBoolean acancel = null;
if (this.context instanceof JexlContext.CancellationHandle) {
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Operators.java b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
index 831b1ad6..7a66a22a 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Operators.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
@@ -439,10 +439,10 @@ public class Operators {
result = false;
// check if there is an isEmpty method on the object that returns a
// boolean and if so, just use it
- final JexlMethod vm = uberspect.getMethod(object, "isEmpty", Interpreter.EMPTY_PARAMS);
+ final JexlMethod vm = uberspect.getMethod(object, "isEmpty", InterpreterBase.EMPTY_PARAMS);
if (returnsBoolean(vm)) {
try {
- result = vm.invoke(object, Interpreter.EMPTY_PARAMS);
+ result = vm.invoke(object, InterpreterBase.EMPTY_PARAMS);
} catch (final Exception xany) {
interpreter.operatorError(node, JexlOperator.EMPTY, xany);
}
@@ -474,10 +474,10 @@ public class Operators {
final JexlUberspect uberspect = interpreter.uberspect;
// check if there is a size method on the object that returns an
// integer and if so, just use it
- final JexlMethod vm = uberspect.getMethod(object, "size", Interpreter.EMPTY_PARAMS);
+ final JexlMethod vm = uberspect.getMethod(object, "size", InterpreterBase.EMPTY_PARAMS);
if (returnsInteger(vm)) {
try {
- result = vm.invoke(object, Interpreter.EMPTY_PARAMS);
+ result = vm.invoke(object, InterpreterBase.EMPTY_PARAMS);
} catch (final Exception xany) {
interpreter.operatorError(node, JexlOperator.SIZE, xany);
}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
index 761d1af2..0c029968 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
@@ -106,7 +106,7 @@ public final class Introspector {
public Introspector(final Log log, final ClassLoader cloader, final JexlPermissions perms) {
this.logger = log;
this.loader = cloader;
- this.permissions = perms == null? Permissions.RESTRICTED : perms;
+ this.permissions = perms == null? JexlPermissions.RESTRICTED : perms;
}
/**
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
index 768a8bb3..44365262 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
@@ -92,7 +92,7 @@ public class Uberspect implements JexlUberspect {
public Uberspect(final Log runtimeLogger, final JexlUberspect.ResolverStrategy sty, final JexlPermissions perms) {
logger = runtimeLogger == null? LogFactory.getLog(JexlEngine.class) : runtimeLogger;
strategy = sty == null? JexlUberspect.JEXL_STRATEGY : sty;
- permissions = perms == null? Permissions.RESTRICTED : perms;
+ permissions = perms == null? JexlPermissions.RESTRICTED : perms;
ref = new SoftReference<>(null);
loader = new SoftReference<>(getClass().getClassLoader());
operatorMap = new ConcurrentHashMap<>();
[commons-jexl] 10/15: Add missing @Override
Posted by gg...@apache.org.
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
commit ce339aee22c8d689309aefd3e8e7496dd8e1d5f3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:05:33 2022 -0500
Add missing @Override
---
src/test/java/org/apache/commons/jexl3/Arithmetic360.java | 6 ++++++
.../java/org/apache/commons/jexl3/introspection/SandboxTest.java | 1 +
2 files changed, 7 insertions(+)
diff --git a/src/test/java/org/apache/commons/jexl3/Arithmetic360.java b/src/test/java/org/apache/commons/jexl3/Arithmetic360.java
index f6ef69a9..3149f193 100644
--- a/src/test/java/org/apache/commons/jexl3/Arithmetic360.java
+++ b/src/test/java/org/apache/commons/jexl3/Arithmetic360.java
@@ -40,6 +40,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param result the long to narrow
* @return an Integer if narrowing is possible, the original Long otherwise
*/
+ @Override
protected Number narrowLong(final Object lhs, final Object rhs, final long result) {
if (!(lhs instanceof Long || rhs instanceof Long)) {
final int ir = (int) result;
@@ -112,6 +113,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param right the right operator
* @return left | right
*/
+ @Override
public Object or(final Object left, final Object right) {
final Number l = asLongNumber(left);
final Number r = asLongNumber(right);
@@ -128,6 +130,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param right the right operator
* @return left ^ right
*/
+ @Override
public Object xor(final Object left, final Object right) {
final Number l = asLongNumber(left);
final Number r = asLongNumber(right);
@@ -155,6 +158,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param right right argument
* @return left << right.
*/
+ @Override
public Object shiftLeft(Object left, Object right) {
if (left == null && right == null) {
boolean strictCast = isStrict(JexlOperator.SHIFTLEFT);
@@ -179,6 +183,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param right right argument
* @return left >> right.
*/
+ @Override
public Object shiftRight(Object left, Object right) {
if (left == null && right == null) {
boolean strictCast = isStrict(JexlOperator.SHIFTRIGHT);
@@ -203,6 +208,7 @@ public class Arithmetic360 extends JexlArithmetic {
* @param right right argument
* @return left >>> right.
*/
+ @Override
public Object shiftRightUnsigned(Object left, Object right) {
if (left == null && right == null) {
boolean strictCast = isStrict(JexlOperator.SHIFTRIGHTU);
diff --git a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
index 2af59a6e..323da027 100644
--- a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
+++ b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
@@ -625,6 +625,7 @@ public class SandboxTest extends JexlTestCase {
public Arithmetic350(boolean astrict) {
super(astrict);
}
+ @Override
public MapBuilder mapBuilder(final int size) {
return mb;
}
[commons-jexl] 01/15: Use Java diamonds
Posted by gg...@apache.org.
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
commit 2796ddd39887c8b6c4b3242924b3bd023bdc00f2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:54:39 2022 -0500
Use Java diamonds
---
.../java/org/apache/commons/jexl3/MapContext.java | 2 +-
.../commons/jexl3/internal/ArrayBuilder.java | 4 ++--
.../apache/commons/jexl3/internal/MapBuilder.java | 2 +-
.../apache/commons/jexl3/internal/SetBuilder.java | 2 +-
.../apache/commons/jexl3/internal/SoftCache.java | 6 +++---
.../commons/jexl3/internal/TemplateEngine.java | 2 +-
.../jexl3/internal/introspection/Uberspect.java | 16 +++++++--------
.../org/apache/commons/jexl3/AnnotationTest.java | 2 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 4 ++--
.../commons/jexl3/ArithmeticOperatorTest.java | 12 +++++------
.../org/apache/commons/jexl3/ArithmeticTest.java | 2 +-
.../org/apache/commons/jexl3/ArrayAccessTest.java | 10 ++++-----
.../java/org/apache/commons/jexl3/CacheTest.java | 10 ++++-----
.../java/org/apache/commons/jexl3/CaptureLog.java | 2 +-
.../org/apache/commons/jexl3/ClassCreator.java | 4 ++--
.../org/apache/commons/jexl3/ClassCreatorTest.java | 8 ++++----
.../org/apache/commons/jexl3/ExceptionTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/Foo.java | 2 +-
.../org/apache/commons/jexl3/Issues100Test.java | 4 ++--
.../org/apache/commons/jexl3/Issues200Test.java | 24 +++++++++++-----------
.../org/apache/commons/jexl3/Issues300Test.java | 4 ++--
.../java/org/apache/commons/jexl3/IssuesTest.java | 4 ++--
.../java/org/apache/commons/jexl3/JexlTest.java | 22 ++++++++++----------
.../java/org/apache/commons/jexl3/LexicalTest.java | 2 +-
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 14 ++++++-------
.../apache/commons/jexl3/PropertyAccessTest.java | 6 +++---
.../apache/commons/jexl3/ScriptCallableTest.java | 2 +-
.../org/apache/commons/jexl3/SetLiteralTest.java | 2 +-
.../org/apache/commons/jexl3/SideEffectTest.java | 8 ++++----
.../org/apache/commons/jexl3/StrategyTest.java | 2 +-
.../commons/jexl3/SynchronizedArithmetic.java | 2 +-
.../commons/jexl3/SynchronizedOverloadsTest.java | 6 +++---
.../java/org/apache/commons/jexl3/VarTest.java | 12 +++++------
.../apache/commons/jexl3/examples/ArrayTest.java | 2 +-
.../org/apache/commons/jexl3/internal/Util.java | 2 +-
.../internal/introspection/DiscoveryTest.java | 4 ++--
.../internal/introspection/MethodKeyTest.java | 4 ++--
.../commons/jexl3/introspection/SandboxTest.java | 2 +-
.../org/apache/commons/jexl3/junit/Asserter.java | 2 +-
40 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/MapContext.java b/src/main/java/org/apache/commons/jexl3/MapContext.java
index 40885887..b62c91f6 100644
--- a/src/main/java/org/apache/commons/jexl3/MapContext.java
+++ b/src/main/java/org/apache/commons/jexl3/MapContext.java
@@ -44,7 +44,7 @@ public class MapContext implements JexlContext {
* @param vars the variable map
*/
public MapContext(final Map<String, Object> vars) {
- map = vars == null ? new HashMap<String, Object>() : vars;
+ map = vars == null ? new HashMap<>() : vars;
}
@Override
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 11da9ea4..76188fd4 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
@@ -34,7 +34,7 @@ public class ArrayBuilder implements JexlArithmetic.ArrayBuilder {
/** The boxing types to primitive conversion map. */
private static final Map<Class<?>, Class<?>> BOXING_CLASSES;
static {
- BOXING_CLASSES = new IdentityHashMap<Class<?>, Class<?>>(PRIMITIVE_SIZE);
+ BOXING_CLASSES = new IdentityHashMap<>(PRIMITIVE_SIZE);
BOXING_CLASSES.put(Boolean.class, Boolean.TYPE);
BOXING_CLASSES.put(Byte.class, Byte.TYPE);
BOXING_CLASSES.put(Character.class, Character.TYPE);
@@ -116,7 +116,7 @@ public class ArrayBuilder implements JexlArithmetic.ArrayBuilder {
return new Object[0];
}
if (extended) {
- final List<Object> list = new ArrayList<Object>(added);
+ final List<Object> list = new ArrayList<>(added);
list.addAll(Arrays.asList(untyped).subList(0, added));
return list;
}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java b/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java
index 57b27e78..57527c3c 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java
@@ -32,7 +32,7 @@ public class MapBuilder implements JexlArithmetic.MapBuilder {
* @param size the expected map size
*/
public MapBuilder(final int size) {
- map = new HashMap<Object, Object>(size);
+ map = new HashMap<>(size);
}
@Override
diff --git a/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java b/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java
index 65430ff4..649f53e3 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java
@@ -32,7 +32,7 @@ public class SetBuilder implements JexlArithmetic.SetBuilder {
* @param size the expected set size
*/
public SetBuilder(final int size) {
- set = new HashSet<Object>(size);
+ set = new HashSet<>(size);
}
@Override
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 3028e8a6..8c5d0aa5 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
@@ -111,7 +111,7 @@ public class SoftCache<K, V> {
Map<K, V> map = ref != null ? ref.get() : null;
if (map == null) {
map = createCache(size);
- ref = new SoftReference<Map<K, V>>(map);
+ ref = new SoftReference<>(map);
}
map.put(key, script);
} finally {
@@ -134,9 +134,9 @@ public class SoftCache<K, V> {
return Collections.emptyList();
}
final Set<Map.Entry<K, V>> set = map.entrySet();
- final List<Map.Entry<K, V>> entries = new ArrayList<Map.Entry<K, V>>(set.size());
+ final List<Map.Entry<K, V>> entries = new ArrayList<>(set.size());
for (final Map.Entry<K, V> e : set) {
- entries.add(new SoftCacheEntry<K, V>(e));
+ entries.add(new SoftCacheEntry<>(e));
}
return entries;
} finally {
diff --git a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
index ca0e8e3d..809bd62a 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
@@ -1149,7 +1149,7 @@ public final class TemplateEngine extends JxltEngine {
* @return the list of blocks
*/
protected List<Block> readTemplate(final String prefix, final Reader source) {
- final ArrayList<Block> blocks = new ArrayList<Block>();
+ final ArrayList<Block> blocks = new ArrayList<>();
final BufferedReader reader;
if (source instanceof BufferedReader) {
reader = (BufferedReader) source;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
index 3f741d2a..768a8bb3 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
@@ -93,9 +93,9 @@ public class Uberspect implements JexlUberspect {
logger = runtimeLogger == null? LogFactory.getLog(JexlEngine.class) : runtimeLogger;
strategy = sty == null? JexlUberspect.JEXL_STRATEGY : sty;
permissions = perms == null? Permissions.RESTRICTED : perms;
- ref = new SoftReference<Introspector>(null);
- loader = new SoftReference<ClassLoader>(getClass().getClassLoader());
- operatorMap = new ConcurrentHashMap<Class<? extends JexlArithmetic>, Set<JexlOperator>>();
+ ref = new SoftReference<>(null);
+ loader = new SoftReference<>(getClass().getClassLoader());
+ operatorMap = new ConcurrentHashMap<>();
version = new AtomicInteger(0);
}
@@ -114,8 +114,8 @@ public class Uberspect implements JexlUberspect {
intro = ref.get();
if (intro == null) {
intro = new Introspector(logger, loader.get(), permissions);
- ref = new SoftReference<Introspector>(intro);
- loader = new SoftReference<ClassLoader>(intro.getLoader());
+ ref = new SoftReference<>(intro);
+ loader = new SoftReference<>(intro.getLoader());
version.incrementAndGet();
}
}
@@ -132,9 +132,9 @@ public class Uberspect implements JexlUberspect {
intro.setLoader(nloader);
} else {
intro = new Introspector(logger, nloader, permissions);
- ref = new SoftReference<Introspector>(intro);
+ ref = new SoftReference<>(intro);
}
- loader = new SoftReference<ClassLoader>(intro.getLoader());
+ loader = new SoftReference<>(intro.getLoader());
operatorMap.clear();
version.incrementAndGet();
}
@@ -383,7 +383,7 @@ public class Uberspect implements JexlUberspect {
return ((Map<?, ?>) obj).values().iterator();
}
if (obj instanceof Enumeration<?>) {
- return new EnumerationIterator<Object>((Enumeration<Object>) obj);
+ return new EnumerationIterator<>((Enumeration<Object>) obj);
}
if (obj instanceof Iterable<?>) {
return ((Iterable<?>) obj).iterator();
diff --git a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
index 7058e616..4ff9ef24 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 final Set<String> names = new TreeSet<String>();
+ private final Set<String> names = new TreeSet<>();
@Override
public Object processAnnotation(final String name, final Object[] args, final Callable<Object> statement) throws Exception {
diff --git a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
index f85e53f8..e2ced601 100644
--- a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
@@ -132,7 +132,7 @@ public class AntishCallTest extends JexlTestCase {
@Test
public void testAntishContextVar() throws Exception {
- final Map<String,Object> lmap = new TreeMap<String,Object>();
+ final Map<String,Object> lmap = new TreeMap<>();
final JexlContext jc = new CallSupportContext(lmap).engine(JEXL);
runTestCall(JEXL, jc);
lmap.put("java.math.BigInteger", new ClassReference(BigInteger.class));
@@ -145,7 +145,7 @@ public class AntishCallTest extends JexlTestCase {
public void testAntishArithmetic() throws Exception {
final CallSupportArithmetic ja = new CallSupportArithmetic(true);
final JexlEngine jexl = new JexlBuilder().cache(512).arithmetic(ja).create();
- final Map<String,Object> lmap = new TreeMap<String,Object>();
+ final Map<String,Object> lmap = new TreeMap<>();
final JexlContext jc = new MapContext(lmap);
lmap.put("java.math.BigInteger", java.math.BigInteger.class);
runTestCall(jexl, jc);
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
index 1cc3e86b..930a3d81 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
@@ -167,7 +167,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
private final Set<Integer> values;
public MatchingContainer(final int[] is) {
- values = new HashSet<Integer>();
+ values = new HashSet<>();
for (final int value : is) {
values.add(value);
}
@@ -182,7 +182,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
private final SortedSet<Integer> values;
public IterableContainer(final int[] is) {
- values = new TreeSet<Integer>();
+ values = new TreeSet<>();
for (final int value : is) {
values.add(value);
}
@@ -235,11 +235,11 @@ public class ArithmeticOperatorTest extends JexlTestCase {
public void testMatch() throws Exception {
// check in/not-in on array, list, map, set and duck-type collection
final int[] ai = {2, 4, 42, 54};
- final List<Integer> al = new ArrayList<Integer>();
+ final List<Integer> al = new ArrayList<>();
for (final int i : ai) {
al.add(i);
}
- final Map<Integer, String> am = new HashMap<Integer, String>();
+ final Map<Integer, String> am = new HashMap<>();
am.put(2, "two");
am.put(4, "four");
am.put(42, "forty-two");
@@ -314,7 +314,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
@Test
@SuppressWarnings("unchecked")
public void testInterval() throws Exception {
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("calc", Aggregate.class);
final JexlEngine jexl = new JexlBuilder().namespaces(ns).create();
JexlScript script;
@@ -523,7 +523,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
@Test
public void testFormatArithmeticJxlt() throws Exception {
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("calc", Aggregate.class);
final Calendar cal = Calendar.getInstance(UTC);
cal.set(1969, Calendar.AUGUST, 20);
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
index 5d18c5b0..451e1db1 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
@@ -1503,7 +1503,7 @@ public class ArithmeticTest extends JexlTestCase {
@Test
public void testInfiniteArithmetic() throws Exception {
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("math", Math.class);
final JexlEngine jexl = new JexlBuilder().arithmetic(new Arithmetic132()).namespaces(ns).create();
diff --git a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
index a53bb28d..a91af3e6 100644
--- a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
@@ -66,7 +66,7 @@ public class ArrayAccessTest extends JexlTestCase {
* test List access
*/
- final List<Integer> l = new ArrayList<Integer>();
+ final List<Integer> l = new ArrayList<>();
l.add(new Integer(1));
l.add(new Integer(2));
l.add(new Integer(3));
@@ -94,7 +94,7 @@ public class ArrayAccessTest extends JexlTestCase {
/*
* test map access
*/
- final Map<String, String> m = new HashMap<String, String>();
+ final Map<String, String> m = new HashMap<>();
m.put("foo", "bar");
asserter.setVariable("map", m);
@@ -153,8 +153,8 @@ public class ArrayAccessTest extends JexlTestCase {
@Test
public void testDoubleMaps() throws Exception {
- final Map<Object, Map<Object, Object>> foo = new HashMap<Object, Map<Object, Object>>();
- final Map<Object, Object> foo0 = new HashMap<Object, Object>();
+ final Map<Object, Map<Object, Object>> foo = new HashMap<>();
+ final Map<Object, Object> foo0 = new HashMap<>();
foo.put(0, foo0);
foo0.put(0, "one");
foo0.put(1, "two");
@@ -221,7 +221,7 @@ public class ArrayAccessTest extends JexlTestCase {
@Test
public void testArrayIdentifierParsing() throws Exception {
- final Map<Object, Number> map = new HashMap<Object, Number>();
+ final Map<Object, Number> map = new HashMap<>();
map.put("00200", -42.42d);
map.put(200, 42.42d);
asserter.setVariable("objects", map);
diff --git a/src/test/java/org/apache/commons/jexl3/CacheTest.java b/src/test/java/org/apache/commons/jexl3/CacheTest.java
index 439a536e..62b1749a 100644
--- a/src/test/java/org/apache/commons/jexl3/CacheTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CacheTest.java
@@ -294,7 +294,7 @@ public class CacheTest extends JexlTestCase {
jexl = jexlCache;
}
final java.util.concurrent.ExecutorService execs = java.util.concurrent.Executors.newFixedThreadPool(NTHREADS);
- final List<Callable<Integer>> tasks = new ArrayList<Callable<Integer>>(NTHREADS);
+ final List<Callable<Integer>> tasks = new ArrayList<>(NTHREADS);
for (int t = 0; t < NTHREADS; ++t) {
tasks.add(jexl.newInstance(ctask, loops));
}
@@ -312,7 +312,7 @@ public class CacheTest extends JexlTestCase {
public abstract static class Task implements Callable<Integer> {
final TestCacheArguments args = new TestCacheArguments();
final int loops;
- final Map<String, Object> vars = new HashMap<String, Object>();
+ final Map<String, Object> vars = new HashMap<>();
final JexlEvalContext jc = new JexlEvalContext(vars);
Task(final int loops) {
@@ -451,7 +451,7 @@ public class CacheTest extends JexlTestCase {
/** The actual test function. */
private Integer runAssignList() {
args.value = new Object[]{"foo"};
- final java.util.ArrayList<String> c1 = new java.util.ArrayList<String>(2);
+ final java.util.ArrayList<String> c1 = new java.util.ArrayList<>(2);
c1.add("foo");
c1.add("bar");
args.ca = new Object[]{
@@ -641,8 +641,8 @@ public class CacheTest extends JexlTestCase {
if (!cache) {
jexl.clearCache();
}
- final Map<String, Object> vars = new HashMap<String, Object>();
- final java.util.Map<String, Object> funcs = new java.util.HashMap<String, Object>();
+ final Map<String, Object> vars = new HashMap<>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
final JexlEvalContext jc = new JexlContextNS(vars, funcs);
final JexlExpression compute2 = jexl.createExpression("cached:COMPUTE(a0, a1)");
final JexlExpression compute1 = jexl.createExpression("cached:COMPUTE(a0)");
diff --git a/src/test/java/org/apache/commons/jexl3/CaptureLog.java b/src/test/java/org/apache/commons/jexl3/CaptureLog.java
index 227c7ae0..0aca8512 100644
--- a/src/test/java/org/apache/commons/jexl3/CaptureLog.java
+++ b/src/test/java/org/apache/commons/jexl3/CaptureLog.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.Log;
* A log implementation to help control tests results.
*/
public class CaptureLog implements Log {
- private final List<Object[]> captured = new ArrayList<Object[]>();
+ private final List<Object[]> captured = new ArrayList<>();
static Object caller() {
final StackTraceElement[] stack = new Exception().fillInStackTrace().getStackTrace();
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreator.java b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
index bdff9686..987d8aa5 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreator.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
@@ -191,12 +191,12 @@ public class ClassCreator {
Class<?> compile() throws Exception {
final String source = packageDir.getPath() + "/" + sourceName;
final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
- final DiagnosticCollector<JavaFileObject> diagnosticsCollector = new DiagnosticCollector<JavaFileObject>();
+ final DiagnosticCollector<JavaFileObject> diagnosticsCollector = new DiagnosticCollector<>();
final StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnosticsCollector, null, null);
final Iterable<? extends JavaFileObject> compilationUnits = fileManager
.getJavaFileObjectsFromStrings(Collections.singletonList(source));
- final List<String> options = new ArrayList<String>();
+ final List<String> options = new ArrayList<>();
options.add("-classpath");
// only add hbase classes to classpath. This is a little bit tricky: assume
// the classpath is {hbaseSrc}/target/classes.
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
index f778fae3..5ff6dcec 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
@@ -186,7 +186,7 @@ public class ClassCreatorTest extends JexlTestCase {
void functorTwo(final Object nstest) throws Exception {
// create jexl2 with a 'test' namespace
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("test", nstest);
final JexlEngine jexl2 = new JexlBuilder().namespaces(ns).create();
final JexlContext ctxt = new MapContext();
@@ -241,7 +241,7 @@ public class ClassCreatorTest extends JexlTestCase {
jexl.setClassLoader(cctor.getClassLoader());
cctor.clear();
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("test", foo1);
final JexlEngine jexl2 = new JexlBuilder().namespaces(ns).create();
@@ -272,8 +272,8 @@ public class ClassCreatorTest extends JexlTestCase {
}
int pass = 0;
int gced = -1;
- final ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
- final List<Reference<?>> stuff = new ArrayList<Reference<?>>();
+ final ReferenceQueue<Object> queue = new ReferenceQueue<>();
+ final List<Reference<?>> stuff = new ArrayList<>();
// keeping a reference on methods prevent classes from being GCed
// List<Object> mm = new ArrayList<Object>();
final JexlExpression expr = jexl.createExpression("foo.value");
diff --git a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
index ed851dd0..d913070f 100644
--- a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
@@ -55,7 +55,7 @@ public class ExceptionTest extends JexlTestCase {
public void testWrappedEx() throws Exception {
final JexlEngine jexl = new Engine();
final JexlExpression e = jexl.createExpression("npe()");
- final JexlContext jc = new ObjectContext<ThrowNPE>(jexl, new ThrowNPE());
+ final JexlContext jc = new ObjectContext<>(jexl, new ThrowNPE());
try {
e.evaluate(jc);
Assert.fail("Should have thrown NPE");
diff --git a/src/test/java/org/apache/commons/jexl3/Foo.java b/src/test/java/org/apache/commons/jexl3/Foo.java
index d37a154d..ef4a29ea 100644
--- a/src/test/java/org/apache/commons/jexl3/Foo.java
+++ b/src/test/java/org/apache/commons/jexl3/Foo.java
@@ -70,7 +70,7 @@ public class Foo {
public List<String> getCheeseList()
{
- final ArrayList<String> answer = new ArrayList<String>();
+ final ArrayList<String> answer = new ArrayList<>();
answer.add("cheddar");
answer.add("edam");
answer.add("brie");
diff --git a/src/test/java/org/apache/commons/jexl3/Issues100Test.java b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
index 2741dece..eaceaca6 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues100Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
@@ -389,7 +389,7 @@ public class Issues100Test extends JexlTestCase {
final JexlContext jc = new MapContext();
JexlScript script;
Object result;
- final Map<Integer, Object> foo = new HashMap<Integer, Object>();
+ final Map<Integer, Object> foo = new HashMap<>();
foo.put(3, 42);
jc.set("state", foo);
@@ -640,7 +640,7 @@ public class Issues100Test extends JexlTestCase {
}
public List<Integer> asList(final int[] array) {
- final List<Integer> l = new ArrayList<Integer>(array.length);
+ final List<Integer> l = new ArrayList<>(array.length);
for (final int i : array) {
l.add(i);
}
diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index 4b1e701f..268255df 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -71,7 +71,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test200() throws Exception {
final JexlContext jc = new MapContext();
- final Map<String, Object> funcs = new HashMap<String, Object>();
+ final Map<String, Object> funcs = new HashMap<>();
final Eval eval = new Eval();
funcs.put(null, eval);
final JexlEngine jexl = new JexlBuilder().namespaces(funcs).create();
@@ -164,7 +164,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test221() throws Exception {
final JexlEvalContext jc = new JexlEvalContext();
- final Map<String, Integer> map = new HashMap<String, Integer>();
+ final Map<String, Integer> map = new HashMap<>();
map.put("one", 1);
jc.set("map", map);
final JexlEngine jexl = new JexlBuilder().cache(256).create();
@@ -216,7 +216,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test224() throws Exception {
final List<String> a0 = Arrays.asList("one", "two");
- final Set<String> a1 = new TreeSet<String>(a0);
+ final Set<String> a1 = new TreeSet<>(a0);
final JexlContext jc = new MapContext();
final JexlEngine jexl = new JexlBuilder().arithmetic(new JexlArithmetic224(true)).create();
Object r;
@@ -250,7 +250,7 @@ public class Issues200Test extends JexlTestCase {
final JexlExpression expression = jexl.createExpression("bar()");
Assert.assertEquals("bar", expression.evaluate(df));
- final ObjectContext<Object> context = new ObjectContext<Object>(jexl, df);
+ final ObjectContext<Object> context = new ObjectContext<>(jexl, df);
Assert.assertEquals("bar", expression.evaluate(context));
}
@@ -265,9 +265,9 @@ public class Issues200Test extends JexlTestCase {
pool = Executors.newFixedThreadPool(4);
- final Map<String, Object> m1 = new HashMap<String, Object>();
+ final Map<String, Object> m1 = new HashMap<>();
m1.put("item", "A");
- final Map<String, Object> m2 = new HashMap<String, Object>();
+ final Map<String, Object> m2 = new HashMap<>();
m2.put("item", "B");
handle(pool, script, m1);
@@ -483,7 +483,7 @@ public class Issues200Test extends JexlTestCase {
static final ThreadLocal<Deque<Iterator266>> TLS_FOREACH = new ThreadLocal<Deque<Iterator266>>() {
@Override
public Deque<Iterator266> initialValue() {
- return new LinkedList<Iterator266>();
+ return new LinkedList<>();
}
};
public Arithmetic266(final boolean strict) {
@@ -526,14 +526,14 @@ public class Issues200Test extends JexlTestCase {
final JexlEngine jexl = new JexlBuilder().arithmetic(new Arithmetic266(true)).create();
final JexlContext ctxt = new MapContext();
- final List<Integer> li = new ArrayList<Integer>(Arrays.asList(1, 2, 3, 4, 5 ,6));
+ final List<Integer> li = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5 ,6));
ctxt.set("list", li);
script = jexl.createScript("for (var item : list) { if (item <= 3) remove(); } return size(list)");
result = script.execute(ctxt);
Assert.assertEquals(3, result);
Assert.assertEquals(3, li.size());
- final Map<String, Integer> msi = new HashMap<String, Integer>();
+ final Map<String, Integer> msi = new HashMap<>();
msi.put("a", 1);
msi.put("b", 2);
msi.put("c", 3);
@@ -799,7 +799,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test285() throws Exception {
- final List<String> out = new ArrayList<String>(6);
+ final List<String> out = new ArrayList<>(6);
final JexlContext ctxt = new MapContext();
ctxt.set("$out", out);
final String src = "for(var b: ['g','h','i']) {\n"
@@ -827,7 +827,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test285a() throws Exception {
- final List<String> out = new ArrayList<String>(6);
+ final List<String> out = new ArrayList<>(6);
final JexlContext ctxt = new MapContext();
ctxt.set("$out", out);
final String src =
@@ -845,7 +845,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test285b() throws Exception {
- final List<String> out = new ArrayList<String>(6);
+ final List<String> out = new ArrayList<>(6);
final JexlContext ctxt = new MapContext();
ctxt.set("$out", out);
final String src =
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index cab32c2e..d88919c1 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -820,7 +820,7 @@ public class Issues300Test {
@Test public void test370() {
Var370 var370 = new Var370();
JexlEngine jexl = new JexlBuilder().safe(true).create();
- ObjectContext<Var370> ctxt = new ObjectContext<Var370>(jexl, var370);
+ ObjectContext<Var370> ctxt = new ObjectContext<>(jexl, var370);
JexlExpression get = jexl.createExpression("name");
// not null
var370.setName("John");
@@ -866,7 +866,7 @@ public class Issues300Test {
// Create an object with getter for name
TestObject374 myObject = new TestObject374();
myObject.setName("John");
- JexlContext context = new ObjectContext<TestObject374>(engine, myObject);
+ JexlContext context = new ObjectContext<>(engine, myObject);
// Expect an exception because nested is null, so we are doing null.name
try {
Object result = expr.evaluate(context);
diff --git a/src/test/java/org/apache/commons/jexl3/IssuesTest.java b/src/test/java/org/apache/commons/jexl3/IssuesTest.java
index f72b1891..c1731e63 100644
--- a/src/test/java/org/apache/commons/jexl3/IssuesTest.java
+++ b/src/test/java/org/apache/commons/jexl3/IssuesTest.java
@@ -46,7 +46,7 @@ public class IssuesTest extends JexlTestCase {
@Test
public void test49() throws Exception {
final JexlEngine jexl = new Engine();
- final Map<String, Object> vars = new HashMap<String, Object>();
+ final Map<String, Object> vars = new HashMap<>();
final JexlContext ctxt = new MapContext(vars);
final String stmt = "a = 'b'; c = 'd';";
final JexlScript expr = jexl.createScript(stmt);
@@ -384,7 +384,7 @@ public class IssuesTest extends JexlTestCase {
"fn:replace(\"DOMAIN\\somename\", \"\\\\\", \"\\\\\\\\\")",
"fn:replace('DOMAIN\\somename', '\\u005c', '\\u005c\\u005c')"
};
- final Map<String, Object> funcs = new HashMap<String, Object>();
+ final Map<String, Object> funcs = new HashMap<>();
funcs.put("fn", new fn98());
final JexlEngine jexl = new JexlBuilder().namespaces(funcs).create();
for (final String expr : exprs) {
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTest.java b/src/test/java/org/apache/commons/jexl3/JexlTest.java
index 11c11f2d..2178b33c 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTest.java
@@ -165,8 +165,8 @@ public final class JexlTest extends JexlTestCase {
jc.set("string", "");
jc.set("array", new Object[0]);
jc.set("map", new HashMap<>());
- jc.set("list", new ArrayList<Object>());
- jc.set("set", (new HashMap<Object, Object>()).keySet());
+ jc.set("list", new ArrayList<>());
+ jc.set("set", (new HashMap<>()).keySet());
jc.set("longstring", "thingthing");
/*
@@ -190,7 +190,7 @@ public final class JexlTest extends JexlTestCase {
jc.set("s", "five!");
jc.set("array", new Object[5]);
- final Map<String, Integer> map = new HashMap<String, Integer>();
+ final Map<String, Integer> map = new HashMap<>();
map.put("1", new Integer(1));
map.put("2", new Integer(2));
@@ -200,7 +200,7 @@ public final class JexlTest extends JexlTestCase {
jc.set("map", map);
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
list.add("1");
list.add("2");
@@ -211,7 +211,7 @@ public final class JexlTest extends JexlTestCase {
jc.set("list", list);
// 30652 - support for set
- final Set<String> set = new HashSet<String>(list);
+ final Set<String> set = new HashSet<>(list);
set.add("1");
jc.set("set", set);
@@ -239,7 +239,7 @@ public final class JexlTest extends JexlTestCase {
@Test
public void testSizeAsProperty() throws Exception {
final JexlContext jc = new MapContext();
- final Map<String, Object> map = new HashMap<String, Object>();
+ final Map<String, Object> map = new HashMap<>();
map.put("size", "cheese");
map.put("si & ze", "cheese");
jc.set("map", map);
@@ -316,8 +316,8 @@ public final class JexlTest extends JexlTestCase {
jc.set("aChar", new Character('A'));
jc.set("aBool", Boolean.TRUE);
final StringBuilder buffer = new StringBuilder("abc");
- final List<Object> list = new ArrayList<Object>();
- final List<Object> list2 = new LinkedList<Object>();
+ final List<Object> list = new ArrayList<>();
+ final List<Object> list2 = new LinkedList<>();
jc.set("aBuffer", buffer);
jc.set("aList", list);
jc.set("bList", list2);
@@ -491,7 +491,7 @@ public final class JexlTest extends JexlTestCase {
*/
@Test
public void testMapDot() throws Exception {
- final Map<String, String> foo = new HashMap<String, String>();
+ final Map<String, String> foo = new HashMap<>();
foo.put("bar", "123");
final JexlContext jc = new MapContext();
@@ -574,8 +574,8 @@ public final class JexlTest extends JexlTestCase {
@Test
public void testEmptySubListOfMap() throws Exception {
final JexlContext jc = new MapContext();
- final Map<String, ArrayList<?>> m = new HashMap<String, ArrayList<?>>();
- m.put("aList", new ArrayList<Object>());
+ final Map<String, ArrayList<?>> m = new HashMap<>();
+ m.put("aList", new ArrayList<>());
jc.set("aMap", m);
diff --git a/src/test/java/org/apache/commons/jexl3/LexicalTest.java b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
index c8eb26c1..7dd7924d 100644
--- a/src/test/java/org/apache/commons/jexl3/LexicalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
@@ -761,7 +761,7 @@ public class LexicalTest {
}
final JexlEngine jexl = new JexlBuilder().features(features).create();
final JexlScript script = jexl.createScript(src);
- final List<Integer> out = new ArrayList<Integer>(10);
+ final List<Integer> out = new ArrayList<>(10);
vars.set("$out", out);
final Object result = script.execute(vars);
Assert.assertEquals(true, result);
diff --git a/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java b/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
index 8249b609..3322b58f 100644
--- a/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
@@ -46,7 +46,7 @@ public class MapLiteralTest extends JexlTestCase {
final JexlExpression e = JEXL.createExpression("{ 'foo' : 'bar', 'eat' : 'food' }");
final JexlContext jc = new MapContext();
- final Map<String, String> expected = new HashMap<String, String>();
+ final Map<String, String> expected = new HashMap<>();
expected.put("foo", "bar");
expected.put("eat", "food");
diff --git a/src/test/java/org/apache/commons/jexl3/MethodTest.java b/src/test/java/org/apache/commons/jexl3/MethodTest.java
index 47f98ff5..36cbe663 100644
--- a/src/test/java/org/apache/commons/jexl3/MethodTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MethodTest.java
@@ -478,7 +478,7 @@ public class MethodTest extends JexlTestCase {
@Test
public void testTopLevelCall() throws Exception {
- final java.util.Map<String, Object> funcs = new java.util.HashMap<String, Object>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
funcs.put(null, new Functor());
funcs.put("math", new MyMath());
funcs.put("cx", ContextualFunctor.class);
@@ -509,7 +509,7 @@ public class MethodTest extends JexlTestCase {
@Test
public void testNamespaceCall() throws Exception {
- final java.util.Map<String, Object> funcs = new java.util.HashMap<String, Object>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
funcs.put("func", new Functor());
funcs.put("FUNC", Functor.class);
@@ -604,7 +604,7 @@ public class MethodTest extends JexlTestCase {
@Test
public void testNamespaceCallEdge() throws Exception {
- final java.util.Map<String, Object> funcs = new java.util.HashMap<String, Object>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
final Edge func = new Edge();
funcs.put("func", func);
@@ -687,7 +687,7 @@ public class MethodTest extends JexlTestCase {
}
if ("functor".equals(name)) {
return (NamespaceFunctor) context -> {
- final Map<String, Object> values = new HashMap<String, Object>();
+ final Map<String, Object> values = new HashMap<>();
if ("gin".equals(context.get("base"))) {
values.put("drink", "gin fizz");
} else {
@@ -709,7 +709,7 @@ public class MethodTest extends JexlTestCase {
Object o = forty2.execute(context);
Assert.assertEquals("Result is not 42", new Integer(42), o);
- final Map<String, Object> foo = new HashMap<String, Object>();
+ final Map<String, Object> foo = new HashMap<>();
foo.put("plus", plus);
context.set("foo", foo);
forty2 = JEXL.createScript("foo.plus(4, 2) * foo.plus(4, 3)");
@@ -823,8 +823,8 @@ public class MethodTest extends JexlTestCase {
@Test
public void testVariousFunctionLocation() throws Exception {
// see JEXL-190
- final Map<String, Object> vars = new HashMap<String, Object>();
- final Map<String,Object> funcs = new HashMap<String,Object>();
+ final Map<String, Object> vars = new HashMap<>();
+ final Map<String,Object> funcs = new HashMap<>();
funcs.put(null, new ZSpace());
final JexlEngine jexl = new JexlBuilder().namespaces(funcs).arithmetic(new ZArithmetic(true)).create();
diff --git a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
index b250fc36..94445f01 100644
--- a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
@@ -299,7 +299,7 @@ public class PropertyAccessTest extends JexlTestCase {
@Test
public void testStringIdentifier() throws Exception {
- final Map<String, String> foo = new HashMap<String, String>();
+ final Map<String, String> foo = new HashMap<>();
final JexlContext jc = new MapContext();
jc.set("foo", foo);
@@ -381,7 +381,7 @@ public class PropertyAccessTest extends JexlTestCase {
@Test
public void test250() throws Exception {
final MapContext ctx = new MapContext();
- final HashMap<Object, Object> x = new HashMap<Object, Object>();
+ final HashMap<Object, Object> x = new HashMap<>();
x.put(2, "123456789");
ctx.set("x", x);
final JexlEngine engine = new JexlBuilder()
@@ -444,7 +444,7 @@ public class PropertyAccessTest extends JexlTestCase {
}
public static class Prompt {
- private final Map<String, PromptValue> values = new HashMap<String, PromptValue>();
+ private final Map<String, PromptValue> values = new HashMap<>();
public Object get(final String name) {
final PromptValue v = values.get(name);
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
index 476963c2..829246d0 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
@@ -45,7 +45,7 @@ public class ScriptCallableTest extends JexlTestCase {
@Test
public void testFuture() throws Exception {
final JexlScript e = JEXL.createScript("while(true);");
- final FutureTask<Object> future = new FutureTask<Object>(e.callable(null));
+ final FutureTask<Object> future = new FutureTask<>(e.callable(null));
final ExecutorService executor = Executors.newFixedThreadPool(1);
executor.submit(future);
diff --git a/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java b/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
index 3b758ff9..09993d34 100644
--- a/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
@@ -35,7 +35,7 @@ public class SetLiteralTest extends JexlTestCase {
}
private static Set<?> createSet(final Object... args) {
- return new HashSet<Object>(Arrays.asList(args));
+ return new HashSet<>(Arrays.asList(args));
}
@Test
diff --git a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
index 022f22d3..2e44dea9 100644
--- a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
@@ -709,7 +709,7 @@ public class SideEffectTest extends JexlTestCase {
public Object selfAdd(final Object c, final String item) throws IOException {
if (c == null) {
- return new ArrayList<String>(Collections.singletonList(item));
+ return new ArrayList<>(Collections.singletonList(item));
}
if (c instanceof Appendable) {
((Appendable) c).append(item);
@@ -737,7 +737,7 @@ public class SideEffectTest extends JexlTestCase {
final JexlEngine jexl = new JexlBuilder().arithmetic(j246).cache(32).debug(true).logger(log246).create();
final JexlScript script = jexl.createScript("z += x", "x");
final MapContext ctx = new MapContext();
- List<String> z = new ArrayList<String>(1);
+ List<String> z = new ArrayList<>(1);
// no ambiguous, std case
ctx.set("z", z);
@@ -774,7 +774,7 @@ public class SideEffectTest extends JexlTestCase {
}
public Object arrayGet(final List<?> list, final Collection<Integer> range) {
- final List<Object> rl = new ArrayList<Object>(range.size());
+ final List<Object> rl = new ArrayList<>(range.size());
for(final int i : range) {
rl.add(list.get(i));
}
@@ -792,7 +792,7 @@ public class SideEffectTest extends JexlTestCase {
@Test
public void test248() throws Exception {
final MapContext ctx = new MapContext();
- final List<Object> foo = new ArrayList<Object>(Arrays.asList(10, 20, 30, 40));
+ final List<Object> foo = new ArrayList<>(Arrays.asList(10, 20, 30, 40));
ctx.set("foo", foo);
final JexlEngine engine = new JexlBuilder().arithmetic(new Arithmetic248(true)).create();
diff --git a/src/test/java/org/apache/commons/jexl3/StrategyTest.java b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
index dd00c1ba..c10080d7 100644
--- a/src/test/java/org/apache/commons/jexl3/StrategyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
@@ -97,7 +97,7 @@ public class StrategyTest extends JexlTestCase {
public void run171(final JexlEngine jexl, final boolean std) throws Exception {
Object result;
- final Map<String, Object> i = new HashMap<String, Object>();
+ final Map<String, Object> i = new HashMap<>();
i.put("class", 42);
result = jexl.createScript("i['class'] ", "i").execute((JexlContext)null, i);
diff --git a/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java b/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
index a851d128..aeae5632 100644
--- a/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
+++ b/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
@@ -123,7 +123,7 @@ public class SynchronizedArithmetic extends JexlArithmetic {
* Crude monitor replacement...
*/
static class SafeMonitor extends Monitor {
- private final Map<Object, Object> monitored = new IdentityHashMap<Object, Object>();
+ private final Map<Object, Object> monitored = new IdentityHashMap<>();
@Override
protected void monitorEnter(final Object o) {
diff --git a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
index 7372b937..65812325 100644
--- a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
@@ -43,7 +43,7 @@ public class SynchronizedOverloadsTest extends JexlTestCase {
@Test
public void testSynchronizer() throws Exception {
- final Map<String, Object> ns = new TreeMap<String, Object>();
+ final Map<String, Object> ns = new TreeMap<>();
ns.put("synchronized", SynchronizedContext.class);
final JexlContext jc = new MapContext();
final JexlEngine jexl = new JexlBuilder().namespaces(ns).create();
@@ -54,7 +54,7 @@ public class SynchronizedOverloadsTest extends JexlTestCase {
@Test
public void testSynchronized() throws Exception {
- final Map<String, Object> ns = new TreeMap<String, Object>();
+ final Map<String, Object> ns = new TreeMap<>();
final JexlContext jc = new SynchronizedContext(new MapContext());
final JexlEngine jexl = new JexlBuilder().namespaces(ns).create();
final JexlScript js0 = jexl.createScript("@synchronized(y) {return y.size(); }", "y");
@@ -65,7 +65,7 @@ public class SynchronizedOverloadsTest extends JexlTestCase {
@Test
public void testUnsafeMonitor() throws Exception {
final SynchronizedArithmetic.Monitor monitor = new SynchronizedArithmetic.SafeMonitor();
- final Map<String, Object> foo = new TreeMap<String, Object>();
+ final Map<String, Object> foo = new TreeMap<>();
foo.put("one", 1);
foo.put("two", 2);
foo.put("three", 3);
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java b/src/test/java/org/apache/commons/jexl3/VarTest.java
index 736708a1..6b165fc0 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -167,7 +167,7 @@ public class VarTest extends JexlTestCase {
* @return the set of variables
*/
Set<List<String>> mkref(final String[][] refs) {
- final Set<List<String>> set = new HashSet<List<String>>();
+ final Set<List<String>> set = new HashSet<>();
for(final String[] ref : refs) {
set.add(Arrays.asList(ref));
}
@@ -197,7 +197,7 @@ public class VarTest extends JexlTestCase {
}
List<String> stringify(final Set<List<String>> sls) {
- final List<String> ls = new ArrayList<String>();
+ final List<String> ls = new ArrayList<>();
for(final List<String> l : sls) {
final StringBuilder strb = new StringBuilder();
for(final String s : l) {
@@ -426,7 +426,7 @@ public class VarTest extends JexlTestCase {
* @return the property values
*/
public List<String> get(final List<String> keys) {
- final List<String> values = new ArrayList<String>();
+ final List<String> values = new ArrayList<>();
for(final String key : keys) {
final String value = get(key);
if (value != null) {
@@ -444,7 +444,7 @@ public class VarTest extends JexlTestCase {
* @return the alia map
*/
public Map<String,Object> get(final Map<String,String> map) {
- final Map<String,Object> values = new LinkedHashMap<String,Object>();
+ final Map<String,Object> values = new LinkedHashMap<>();
for(final Map.Entry<String,String> entry : map.entrySet()) {
final String value = get(entry.getKey());
if (value != null) {
@@ -461,7 +461,7 @@ public class VarTest extends JexlTestCase {
* @return the properties array
*/
private static String[] readIdentifiers(final String str) {
- final List<String> ids = new ArrayList<String>();
+ final List<String> ids = new ArrayList<>();
StringBuilder strb = null;
String id = null;
char kind = 0; // array, set or map kind using first char
@@ -616,7 +616,7 @@ public class VarTest extends JexlTestCase {
@Test
public void testObjectContext() throws Exception {
final TheVarContext vars = new TheVarContext();
- final JexlContext jc = new ObjectContext<TheVarContext>(JEXL, vars);
+ final JexlContext jc = new ObjectContext<>(JEXL, vars);
try {
JexlScript script;
Object result;
diff --git a/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java b/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
index f75adad9..4896427d 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
@@ -47,7 +47,7 @@ public class ArrayTest {
*/
final JexlContext jc = new MapContext();
- final List<Object> l = new ArrayList<Object>();
+ final List<Object> l = new ArrayList<>();
l.add("Hello from location 0");
final Integer two = 2;
l.add(two);
diff --git a/src/test/java/org/apache/commons/jexl3/internal/Util.java b/src/test/java/org/apache/commons/jexl3/internal/Util.java
index 8e082ef6..dfb8887f 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/Util.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/Util.java
@@ -83,7 +83,7 @@ public class Util {
* @return the descendants-and-self list
*/
protected static ArrayList<JexlNode> flatten(final JexlNode node) {
- final ArrayList<JexlNode> list = new ArrayList<JexlNode>();
+ final ArrayList<JexlNode> list = new ArrayList<>();
flatten(list, node);
return list;
}
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
index 816cc47a..1e454354 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
@@ -164,7 +164,7 @@ public class DiscoveryTest extends JexlTestCase {
@Test
public void testListIntrospection() throws Exception {
final Uberspect uber = Engine.getUberspect(null, null);
- final List<Object> list = new ArrayList<Object>();
+ final List<Object> list = new ArrayList<>();
list.add("LIST");
list.add("TSIL");
@@ -195,7 +195,7 @@ public class DiscoveryTest extends JexlTestCase {
@Test
public void testMapIntrospection() throws Exception {
final Uberspect uber = Engine.getUberspect(null, null);
- final Map<String, Object> map = new HashMap<String, Object>();
+ final Map<String, Object> map = new HashMap<>();
map.put("value", "MAP");
map.put("eulav", "PAM");
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
index e94c0161..92110504 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
@@ -92,8 +92,8 @@ public class MethodKeyTest {
/* Generate a list of method*(prims*), method(prims*, prims*), method*(prims*,prims*,prims*) */
static {
- BY_KEY = new java.util.HashMap< MethodKey, String>();
- BY_STRING = new java.util.HashMap<String, MethodKey>();
+ BY_KEY = new java.util.HashMap<>();
+ BY_STRING = new java.util.HashMap<>();
for (final String method : METHODS) {
for (final Class<?> value : PRIMS) {
final Class<?>[] arg0 = {value};
diff --git a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
index 6b634b40..2af59a6e 100644
--- a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
+++ b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
@@ -392,7 +392,7 @@ public class SandboxTest extends JexlTestCase {
public void testSandboxInherit0() throws Exception {
Object result;
final JexlContext ctxt = null;
- final List<String> foo = new ArrayList<String>();
+ final List<String> foo = new ArrayList<>();
final JexlSandbox sandbox = new JexlSandbox(false, true);
sandbox.allow(java.util.List.class.getName());
diff --git a/src/test/java/org/apache/commons/jexl3/junit/Asserter.java b/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
index 8d5db9a5..a4197ac1 100644
--- a/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
+++ b/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
@@ -41,7 +41,7 @@ import org.junit.Assert;
*/
public class Asserter extends Assert {
/** variables used during asserts. */
- private final Map<String, Object> variables = new HashMap<String, Object>();
+ private final Map<String, Object> variables = new HashMap<>();
/** context to use during asserts. */
private final JexlEvalContext context = new JexlEvalContext(variables);
/** JEXL engine to use during Asserts. */
[commons-jexl] 04/15: Remove unused imports
Posted by gg...@apache.org.
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
commit 46615291121c52be76010d7e1fd70d5b7bf8e219
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:58:13 2022 -0500
Remove unused imports
---
src/test/java/org/apache/commons/jexl3/ForEachTest.java | 1 -
src/test/java/org/apache/commons/jexl3/JXLTTest.java | 4 ----
src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java | 3 ---
src/test/java/org/apache/commons/jexl3/SideEffectTest.java | 2 --
src/test/java/org/apache/commons/jexl3/VarTest.java | 1 -
.../jexl3/internal/introspection/MiscIntrospectionTest.java | 8 --------
.../java/org/apache/commons/jexl3/jexl342/OptionalNullMethod.java | 1 -
src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java | 2 --
8 files changed, 22 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/ForEachTest.java b/src/test/java/org/apache/commons/jexl3/ForEachTest.java
index 0207cfbc..f744d201 100644
--- a/src/test/java/org/apache/commons/jexl3/ForEachTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ForEachTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.commons.jexl3.internal.Debugger;
import org.junit.Assert;
import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/jexl3/JXLTTest.java b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
index b917d187..42b573c4 100644
--- a/src/test/java/org/apache/commons/jexl3/JXLTTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
@@ -19,10 +19,8 @@ package org.apache.commons.jexl3;
import org.apache.commons.jexl3.internal.Debugger;
import org.apache.commons.jexl3.internal.TemplateDebugger;
import org.apache.commons.jexl3.internal.TemplateInterpreter;
-import org.apache.commons.jexl3.internal.TemplateScript;
import org.apache.commons.jexl3.internal.introspection.Permissions;
import org.apache.commons.jexl3.internal.introspection.Uberspect;
-import org.apache.commons.jexl3.introspection.JexlMethod;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -35,8 +33,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import java.util.logging.Logger;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
index 94445f01..4b2a638c 100644
--- a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
@@ -21,12 +21,9 @@ import java.util.Map;
import org.apache.commons.jexl3.internal.Debugger;
import org.apache.commons.jexl3.internal.introspection.IndexedType;
-import org.apache.commons.jexl3.internal.introspection.Permissions;
import org.apache.commons.jexl3.internal.introspection.Uberspect;
import org.apache.commons.jexl3.introspection.JexlPermissions;
-import org.apache.commons.jexl3.introspection.JexlUberspect;
import org.apache.commons.jexl3.junit.Asserter;
-import org.apache.commons.logging.LogFactory;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
index 2e44dea9..ccd9b4ff 100644
--- a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
@@ -25,14 +25,12 @@ import java.util.Map;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.jexl3.internal.introspection.NoJexlTest;
import org.apache.commons.jexl3.jexl342.OptionalArithmetic;
import org.apache.commons.jexl3.junit.Asserter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java b/src/test/java/org/apache/commons/jexl3/VarTest.java
index 6b165fc0..010bc930 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -20,7 +20,6 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
-import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.LinkedHashMap;
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
index 69549db9..68cf08b3 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/MiscIntrospectionTest.java
@@ -17,19 +17,11 @@
package org.apache.commons.jexl3.internal.introspection;
import org.apache.commons.jexl3.JexlEngine;
-import org.apache.commons.jexl3.annotations.NoJexl;
import org.junit.Assert;
import org.junit.Test;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.Set;
/**
* Checks the CacheMap.MethodKey implementation
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalNullMethod.java b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalNullMethod.java
index e948851c..c8011032 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalNullMethod.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalNullMethod.java
@@ -20,7 +20,6 @@ import org.apache.commons.jexl3.JexlEngine;
import org.apache.commons.jexl3.JexlException;
import org.apache.commons.jexl3.JexlInfo;
import org.apache.commons.jexl3.introspection.JexlMethod;
-import org.apache.commons.jexl3.introspection.JexlPropertyGet;
import org.apache.commons.jexl3.introspection.JexlUberspect;
/**
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
index 068cce98..b8c74c9e 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java
@@ -21,7 +21,6 @@ import org.apache.commons.jexl3.JexlBuilder;
import org.apache.commons.jexl3.JexlContext;
import org.apache.commons.jexl3.JexlEngine;
import org.apache.commons.jexl3.JexlException;
-import org.apache.commons.jexl3.JexlFeatures;
import org.apache.commons.jexl3.JexlInfo;
import org.apache.commons.jexl3.JexlScript;
import org.apache.commons.jexl3.MapContext;
@@ -29,7 +28,6 @@ import org.apache.commons.jexl3.introspection.JexlUberspect;
import org.junit.Assert;
import org.junit.Test;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
[commons-jexl] 11/15: Add missing serialVersionUID
Posted by gg...@apache.org.
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
commit 0b484f3974547ff9e0144411702bbf2e27ba9d63
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:06:08 2022 -0500
Add missing serialVersionUID
---
src/test/java/org/apache/commons/jexl3/Issues300Test.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index d88919c1..720bafaf 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -536,6 +536,8 @@ public class Issues300Test {
public void test325() {
final JexlEngine jexl = new JexlBuilder().safe(false).create();
final Map<String, Object> map = new HashMap<String, Object>() {
+ private static final long serialVersionUID = 1L;
+
@Override
public Object get(final Object key) {
return super.get(key == null ? "" : key);
[commons-jexl] 08/15: Use try-with-resources
Posted by gg...@apache.org.
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
commit c3548fec20fa9a6053d4ee9dd7fb0890333f84f0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 14:04:07 2022 -0500
Use try-with-resources
---
.../org/apache/commons/jexl3/ClassCreator.java | 52 +++++++++++-----------
.../java/org/apache/commons/jexl3/ScriptTest.java | 12 ++---
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreator.java b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
index 987d8aa5..e3685ec3 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreator.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
@@ -137,33 +137,33 @@ public class ClassCreator {
}
void generate(final boolean ftor) throws Exception {
- final FileWriter aWriter = new FileWriter(new File(packageDir, sourceName), false);
- aWriter.write("package ");
- aWriter.write(GEN_PACKAGE);
- aWriter.write(";\n");
- if (ftor) {
- aWriter.write("import "+ JEXL_PACKAGE +".JexlContext;");
- aWriter.write(";\n");
- }
- aWriter.write("public class " + className);
- aWriter.write(" {\n");
- if (ftor) {
- aWriter.write("public " + className + "(JexlContext ctxt) {\n");
- aWriter.write(ctorBody);
- aWriter.write(" }\n");
+ try (final FileWriter writer = new FileWriter(new File(packageDir, sourceName), false)) {
+ writer.write("package ");
+ writer.write(GEN_PACKAGE);
+ writer.write(";\n");
+ if (ftor) {
+ writer.write("import " + JEXL_PACKAGE + ".JexlContext;");
+ writer.write(";\n");
+ }
+ writer.write("public class " + className);
+ writer.write(" {\n");
+ if (ftor) {
+ writer.write("public " + className + "(JexlContext ctxt) {\n");
+ writer.write(ctorBody);
+ writer.write(" }\n");
+ }
+ writer.write("private int value =");
+ writer.write(Integer.toString(seed));
+ writer.write(";\n");
+ writer.write(" public void setValue(int v) {");
+ writer.write(" value = v;");
+ writer.write(" }\n");
+ writer.write(" public int getValue() {");
+ writer.write(" return value;");
+ writer.write(" }\n");
+ writer.write(" }\n");
+ writer.flush();
}
- aWriter.write("private int value =");
- aWriter.write(Integer.toString(seed));
- aWriter.write(";\n");
- aWriter.write(" public void setValue(int v) {");
- aWriter.write(" value = v;");
- aWriter.write(" }\n");
- aWriter.write(" public int getValue() {");
- aWriter.write(" return value;");
- aWriter.write(" }\n");
- aWriter.write(" }\n");
- aWriter.flush();
- aWriter.close();
}
// Class<?> compile0() throws Exception {
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptTest.java b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
index 9fcd8beb..1f16d870 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
@@ -209,12 +209,12 @@ public class ScriptTest extends JexlTestCase {
@Override
public void handle(HttpExchange httpExchange) throws IOException {
if ("POST".equals(httpExchange.getRequestMethod())) {
- OutputStream outputStream = httpExchange.getResponseBody();
- String json = responder.apply(httpExchange);
- httpExchange.sendResponseHeaders(200, json.length());
- outputStream.write(json.toString().getBytes());
- outputStream.flush();
- outputStream.close();
+ try (OutputStream outputStream = httpExchange.getResponseBody()) {
+ String json = responder.apply(httpExchange);
+ httpExchange.sendResponseHeaders(200, json.length());
+ outputStream.write(json.toString().getBytes());
+ outputStream.flush();
+ }
} else {
// error
httpExchange.sendResponseHeaders(500, 0);
[commons-jexl] 06/15: Remove unused imports
Posted by gg...@apache.org.
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
commit 5d57f3225c230e58e158f47993afb71eaa9aa8c7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:59:00 2022 -0500
Remove unused imports
---
src/main/java/org/apache/commons/jexl3/parser/JexlNode.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java b/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
index 6b2bde55..4a1148cd 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlNode.java
@@ -17,11 +17,7 @@
package org.apache.commons.jexl3.parser;
import org.apache.commons.jexl3.JexlArithmetic;
-import org.apache.commons.jexl3.JexlException;
import org.apache.commons.jexl3.JexlInfo;
-import org.apache.commons.jexl3.internal.LexicalScope;
-import org.apache.commons.jexl3.internal.Scope;
-import org.apache.commons.jexl3.internal.ScriptVisitor;
import org.apache.commons.jexl3.introspection.JexlMethod;
import org.apache.commons.jexl3.introspection.JexlPropertyGet;
import org.apache.commons.jexl3.introspection.JexlPropertySet;
[commons-jexl] 05/15: Add missing @Deprecated
Posted by gg...@apache.org.
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
commit 4e7c3b4a0ca8a868c567d720b5f9e41ec3cd3ad0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:58:44 2022 -0500
Add missing @Deprecated
---
src/main/java/org/apache/commons/jexl3/JexlContext.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlContext.java b/src/main/java/org/apache/commons/jexl3/JexlContext.java
index 06d7704f..91648421 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlContext.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlContext.java
@@ -197,6 +197,7 @@ public interface JexlContext {
* @param value the value
* @deprecated 3.3
*/
+ @Deprecated
void processPragma(String key, Object value);
/**