You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2020/05/28 14:25:07 UTC
[commons-jexl] branch master updated (c520fdc -> 9c865cd)
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git.
from c520fdc Merge pull request #23 from XenoAmess/patch-1
add f398ed8 fix code smells; fix typos; do language level migration to java8;
add 78fab52 delete a comment.
add 402a171 convert import * to single classes.
new d4d62f3 Merge branch 'fix_code_smells' of git://github.com/XenoAmess/commons-jexl into JEXL-249
new 0e119f8 Java8 required in release notes; Javadoc nitpick
new 9c865cd Merge branch 'master' into JEXL-249
The 3 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:
.travis.yml | 2 +-
RELEASE-NOTES.txt | 2 +-
pom.xml | 1 -
.../java/org/apache/commons/jexl3/JexlEngine.java | 25 +-----
.../org/apache/commons/jexl3/JexlException.java | 4 +-
.../org/apache/commons/jexl3/JexlFeatures.java | 4 +-
.../commons/jexl3/internal/ArrayBuilder.java | 5 +-
.../org/apache/commons/jexl3/internal/Closure.java | 6 +-
.../apache/commons/jexl3/internal/Debugger.java | 6 +-
.../apache/commons/jexl3/internal/Interpreter.java | 8 +-
.../commons/jexl3/internal/LexicalScope.java | 2 +-
.../org/apache/commons/jexl3/internal/Script.java | 3 +-
.../org/apache/commons/jexl3/internal/Source.java | 7 +-
.../commons/jexl3/internal/TemplateEngine.java | 7 +-
.../jexl3/internal/TemplateInterpreter.java | 6 +-
.../commons/jexl3/internal/TemplateScript.java | 22 ++---
.../internal/introspection/AbstractExecutor.java | 2 +-
.../jexl3/internal/introspection/ClassMap.java | 17 ++--
.../internal/introspection/ConstructorMethod.java | 6 +-
.../internal/introspection/DuckGetExecutor.java | 4 +-
.../internal/introspection/DuckSetExecutor.java | 4 +-
.../internal/introspection/ListGetExecutor.java | 8 +-
.../internal/introspection/ListSetExecutor.java | 8 +-
.../internal/introspection/MethodExecutor.java | 4 +-
.../jexl3/internal/introspection/MethodKey.java | 6 +-
.../introspection/PropertyGetExecutor.java | 4 +-
.../introspection/PropertySetExecutor.java | 6 +-
.../apache/commons/jexl3/parser/ASTJexlScript.java | 2 +-
.../commons/jexl3/parser/JexlLexicalNode.java | 2 +-
.../apache/commons/jexl3/parser/SimpleNode.java | 7 +-
.../apache/commons/jexl3/parser/TokenMgrError.java | 6 +-
.../jexl3/scripting/JexlScriptEngineFactory.java | 39 ++++-----
.../org/apache/commons/jexl3/AnnotationTest.java | 4 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 13 +--
.../commons/jexl3/ArithmeticOperatorTest.java | 18 +++--
.../org/apache/commons/jexl3/ArithmeticTest.java | 17 ++--
.../org/apache/commons/jexl3/ArrayLiteralTest.java | 10 +--
.../java/org/apache/commons/jexl3/AssignTest.java | 2 +-
.../apache/commons/jexl3/BitwiseOperatorTest.java | 1 -
.../java/org/apache/commons/jexl3/CacheTest.java | 2 +-
.../org/apache/commons/jexl3/ClassCreator.java | 9 ++-
.../org/apache/commons/jexl3/ClassCreatorTest.java | 16 ++--
.../org/apache/commons/jexl3/FeaturesTest.java | 5 +-
.../org/apache/commons/jexl3/Issues100Test.java | 27 ++-----
.../org/apache/commons/jexl3/Issues200Test.java | 17 ++--
.../org/apache/commons/jexl3/Issues300Test.java | 6 +-
.../java/org/apache/commons/jexl3/IssuesTest.java | 35 ++++----
.../java/org/apache/commons/jexl3/JXLTTest.java | 14 ++--
src/test/java/org/apache/commons/jexl3/Jexl.java | 6 +-
.../java/org/apache/commons/jexl3/JexlTest.java | 7 +-
.../java/org/apache/commons/jexl3/LexicalTest.java | 38 ++++-----
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 14 ++--
.../apache/commons/jexl3/ParseFailuresTest.java | 4 +-
.../java/org/apache/commons/jexl3/PragmaTest.java | 14 ++--
.../apache/commons/jexl3/PropertyAccessTest.java | 12 +--
.../org/apache/commons/jexl3/PublicFieldsTest.java | 4 +-
.../java/org/apache/commons/jexl3/RangeTest.java | 24 +++---
.../apache/commons/jexl3/ScriptCallableTest.java | 10 +--
.../java/org/apache/commons/jexl3/ScriptTest.java | 3 +-
.../org/apache/commons/jexl3/SetLiteralTest.java | 18 ++---
.../org/apache/commons/jexl3/SideEffectTest.java | 18 ++---
.../commons/jexl3/SynchronizedArithmetic.java | 2 +-
.../java/org/apache/commons/jexl3/VarTest.java | 2 +-
.../apache/commons/jexl3/examples/ArrayTest.java | 6 +-
.../commons/jexl3/examples/MethodPropertyTest.java | 8 +-
.../apache/commons/jexl3/internal/RangeTest.java | 13 +--
.../org/apache/commons/jexl3/internal/Util.java | 6 +-
.../internal/introspection/DiscoveryTest.java | 32 ++++----
.../internal/introspection/MethodKeyTest.java | 93 ++++++++++------------
.../commons/jexl3/introspection/SandboxTest.java | 5 +-
.../org/apache/commons/jexl3/junit/Asserter.java | 3 +-
.../scripting/JexlScriptEngineOptionalTest.java | 4 +-
.../jexl3/scripting/JexlScriptEngineTest.java | 26 +++---
74 files changed, 357 insertions(+), 448 deletions(-)
[commons-jexl] 03/03: Merge branch 'master' into JEXL-249
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit 9c865cd3e1d8e0d3e432b950de363228b2d98da5
Merge: c520fdc 0e119f8
Author: henrib <he...@apache.org>
AuthorDate: Thu May 28 16:23:18 2020 +0200
Merge branch 'master' into JEXL-249
* master:
Update CONTRIBUTING.md
.travis.yml | 2 +-
RELEASE-NOTES.txt | 2 +-
pom.xml | 1 -
.../java/org/apache/commons/jexl3/JexlEngine.java | 25 +-----
.../org/apache/commons/jexl3/JexlException.java | 4 +-
.../org/apache/commons/jexl3/JexlFeatures.java | 4 +-
.../commons/jexl3/internal/ArrayBuilder.java | 5 +-
.../org/apache/commons/jexl3/internal/Closure.java | 6 +-
.../apache/commons/jexl3/internal/Debugger.java | 6 +-
.../apache/commons/jexl3/internal/Interpreter.java | 8 +-
.../commons/jexl3/internal/LexicalScope.java | 2 +-
.../org/apache/commons/jexl3/internal/Script.java | 3 +-
.../org/apache/commons/jexl3/internal/Source.java | 7 +-
.../commons/jexl3/internal/TemplateEngine.java | 7 +-
.../jexl3/internal/TemplateInterpreter.java | 6 +-
.../commons/jexl3/internal/TemplateScript.java | 22 ++---
.../internal/introspection/AbstractExecutor.java | 2 +-
.../jexl3/internal/introspection/ClassMap.java | 17 ++--
.../internal/introspection/ConstructorMethod.java | 6 +-
.../internal/introspection/DuckGetExecutor.java | 4 +-
.../internal/introspection/DuckSetExecutor.java | 4 +-
.../internal/introspection/ListGetExecutor.java | 8 +-
.../internal/introspection/ListSetExecutor.java | 8 +-
.../internal/introspection/MethodExecutor.java | 4 +-
.../jexl3/internal/introspection/MethodKey.java | 6 +-
.../introspection/PropertyGetExecutor.java | 4 +-
.../introspection/PropertySetExecutor.java | 6 +-
.../apache/commons/jexl3/parser/ASTJexlScript.java | 2 +-
.../commons/jexl3/parser/JexlLexicalNode.java | 2 +-
.../apache/commons/jexl3/parser/SimpleNode.java | 7 +-
.../apache/commons/jexl3/parser/TokenMgrError.java | 6 +-
.../jexl3/scripting/JexlScriptEngineFactory.java | 39 ++++-----
.../org/apache/commons/jexl3/AnnotationTest.java | 4 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 13 +--
.../commons/jexl3/ArithmeticOperatorTest.java | 18 +++--
.../org/apache/commons/jexl3/ArithmeticTest.java | 17 ++--
.../org/apache/commons/jexl3/ArrayLiteralTest.java | 10 +--
.../java/org/apache/commons/jexl3/AssignTest.java | 2 +-
.../apache/commons/jexl3/BitwiseOperatorTest.java | 1 -
.../java/org/apache/commons/jexl3/CacheTest.java | 2 +-
.../org/apache/commons/jexl3/ClassCreator.java | 9 ++-
.../org/apache/commons/jexl3/ClassCreatorTest.java | 16 ++--
.../org/apache/commons/jexl3/FeaturesTest.java | 5 +-
.../org/apache/commons/jexl3/Issues100Test.java | 27 ++-----
.../org/apache/commons/jexl3/Issues200Test.java | 17 ++--
.../org/apache/commons/jexl3/Issues300Test.java | 6 +-
.../java/org/apache/commons/jexl3/IssuesTest.java | 35 ++++----
.../java/org/apache/commons/jexl3/JXLTTest.java | 14 ++--
src/test/java/org/apache/commons/jexl3/Jexl.java | 6 +-
.../java/org/apache/commons/jexl3/JexlTest.java | 7 +-
.../java/org/apache/commons/jexl3/LexicalTest.java | 38 ++++-----
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 14 ++--
.../apache/commons/jexl3/ParseFailuresTest.java | 4 +-
.../java/org/apache/commons/jexl3/PragmaTest.java | 14 ++--
.../apache/commons/jexl3/PropertyAccessTest.java | 12 +--
.../org/apache/commons/jexl3/PublicFieldsTest.java | 4 +-
.../java/org/apache/commons/jexl3/RangeTest.java | 24 +++---
.../apache/commons/jexl3/ScriptCallableTest.java | 10 +--
.../java/org/apache/commons/jexl3/ScriptTest.java | 3 +-
.../org/apache/commons/jexl3/SetLiteralTest.java | 18 ++---
.../org/apache/commons/jexl3/SideEffectTest.java | 18 ++---
.../commons/jexl3/SynchronizedArithmetic.java | 2 +-
.../java/org/apache/commons/jexl3/VarTest.java | 2 +-
.../apache/commons/jexl3/examples/ArrayTest.java | 6 +-
.../commons/jexl3/examples/MethodPropertyTest.java | 8 +-
.../apache/commons/jexl3/internal/RangeTest.java | 13 +--
.../org/apache/commons/jexl3/internal/Util.java | 6 +-
.../internal/introspection/DiscoveryTest.java | 32 ++++----
.../internal/introspection/MethodKeyTest.java | 93 ++++++++++------------
.../commons/jexl3/introspection/SandboxTest.java | 5 +-
.../org/apache/commons/jexl3/junit/Asserter.java | 3 +-
.../scripting/JexlScriptEngineOptionalTest.java | 4 +-
.../jexl3/scripting/JexlScriptEngineTest.java | 26 +++---
74 files changed, 357 insertions(+), 448 deletions(-)
[commons-jexl] 01/03: Merge branch 'fix_code_smells' of
git://github.com/XenoAmess/commons-jexl into JEXL-249
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit d4d62f3b5bfacb1c3a38a63d03b7ecbd2b91bfdf
Merge: ad4eee7 402a171
Author: henrib <he...@apache.org>
AuthorDate: Tue May 26 09:52:43 2020 +0200
Merge branch 'fix_code_smells' of git://github.com/XenoAmess/commons-jexl into JEXL-249
.travis.yml | 2 +-
CONTRIBUTING.md | 2 +-
pom.xml | 1 -
.../java/org/apache/commons/jexl3/JexlEngine.java | 25 +-----
.../org/apache/commons/jexl3/JexlException.java | 4 +-
.../org/apache/commons/jexl3/JexlFeatures.java | 4 +-
.../commons/jexl3/internal/ArrayBuilder.java | 5 +-
.../org/apache/commons/jexl3/internal/Closure.java | 6 +-
.../apache/commons/jexl3/internal/Debugger.java | 6 +-
.../apache/commons/jexl3/internal/Interpreter.java | 8 +-
.../commons/jexl3/internal/LexicalScope.java | 2 +-
.../org/apache/commons/jexl3/internal/Script.java | 3 +-
.../org/apache/commons/jexl3/internal/Source.java | 7 +-
.../commons/jexl3/internal/TemplateEngine.java | 7 +-
.../jexl3/internal/TemplateInterpreter.java | 6 +-
.../commons/jexl3/internal/TemplateScript.java | 22 ++---
.../internal/introspection/AbstractExecutor.java | 2 +-
.../jexl3/internal/introspection/ClassMap.java | 17 ++--
.../internal/introspection/ConstructorMethod.java | 6 +-
.../internal/introspection/DuckGetExecutor.java | 4 +-
.../internal/introspection/DuckSetExecutor.java | 4 +-
.../internal/introspection/ListGetExecutor.java | 8 +-
.../internal/introspection/ListSetExecutor.java | 8 +-
.../internal/introspection/MethodExecutor.java | 4 +-
.../jexl3/internal/introspection/MethodKey.java | 6 +-
.../introspection/PropertyGetExecutor.java | 4 +-
.../introspection/PropertySetExecutor.java | 4 +-
.../apache/commons/jexl3/parser/ASTJexlScript.java | 2 +-
.../commons/jexl3/parser/JexlLexicalNode.java | 2 +-
.../apache/commons/jexl3/parser/SimpleNode.java | 7 +-
.../apache/commons/jexl3/parser/TokenMgrError.java | 6 +-
.../jexl3/scripting/JexlScriptEngineFactory.java | 39 ++++-----
.../org/apache/commons/jexl3/AnnotationTest.java | 4 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 13 +--
.../commons/jexl3/ArithmeticOperatorTest.java | 18 +++--
.../org/apache/commons/jexl3/ArithmeticTest.java | 17 ++--
.../org/apache/commons/jexl3/ArrayLiteralTest.java | 10 +--
.../java/org/apache/commons/jexl3/AssignTest.java | 2 +-
.../apache/commons/jexl3/BitwiseOperatorTest.java | 1 -
.../java/org/apache/commons/jexl3/CacheTest.java | 2 +-
.../org/apache/commons/jexl3/ClassCreator.java | 9 ++-
.../org/apache/commons/jexl3/ClassCreatorTest.java | 16 ++--
.../org/apache/commons/jexl3/FeaturesTest.java | 5 +-
.../org/apache/commons/jexl3/Issues100Test.java | 27 ++-----
.../org/apache/commons/jexl3/Issues200Test.java | 17 ++--
.../org/apache/commons/jexl3/Issues300Test.java | 6 +-
.../java/org/apache/commons/jexl3/IssuesTest.java | 35 ++++----
.../java/org/apache/commons/jexl3/JXLTTest.java | 14 ++--
src/test/java/org/apache/commons/jexl3/Jexl.java | 6 +-
.../java/org/apache/commons/jexl3/JexlTest.java | 7 +-
.../java/org/apache/commons/jexl3/LexicalTest.java | 38 ++++-----
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 14 ++--
.../apache/commons/jexl3/ParseFailuresTest.java | 4 +-
.../java/org/apache/commons/jexl3/PragmaTest.java | 14 ++--
.../apache/commons/jexl3/PropertyAccessTest.java | 12 +--
.../org/apache/commons/jexl3/PublicFieldsTest.java | 4 +-
.../java/org/apache/commons/jexl3/RangeTest.java | 24 +++---
.../apache/commons/jexl3/ScriptCallableTest.java | 10 +--
.../java/org/apache/commons/jexl3/ScriptTest.java | 3 +-
.../org/apache/commons/jexl3/SetLiteralTest.java | 18 ++---
.../org/apache/commons/jexl3/SideEffectTest.java | 18 ++---
.../commons/jexl3/SynchronizedArithmetic.java | 2 +-
.../java/org/apache/commons/jexl3/VarTest.java | 2 +-
.../apache/commons/jexl3/examples/ArrayTest.java | 6 +-
.../commons/jexl3/examples/MethodPropertyTest.java | 8 +-
.../apache/commons/jexl3/internal/RangeTest.java | 13 +--
.../org/apache/commons/jexl3/internal/Util.java | 6 +-
.../internal/introspection/DiscoveryTest.java | 32 ++++----
.../internal/introspection/MethodKeyTest.java | 93 ++++++++++------------
.../commons/jexl3/introspection/SandboxTest.java | 5 +-
.../org/apache/commons/jexl3/junit/Asserter.java | 3 +-
.../scripting/JexlScriptEngineOptionalTest.java | 4 +-
.../jexl3/scripting/JexlScriptEngineTest.java | 26 +++---
74 files changed, 356 insertions(+), 447 deletions(-)
[commons-jexl] 02/03: Java8 required in release notes;
Javadoc nitpick
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit 0e119f86855947504b00835fc6dc866d150047f8
Author: henrib <he...@apache.org>
AuthorDate: Tue May 26 10:54:43 2020 +0200
Java8 required in release notes;
Javadoc nitpick
---
RELEASE-NOTES.txt | 2 +-
.../commons/jexl3/internal/introspection/PropertySetExecutor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d6d3829..2428a98 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -27,7 +27,7 @@ Version 3.2 is a minor release.
Compatibility with previous releases
====================================
-Version 3.2 is binary compatible with 3.1.
+Version 3.2 is binary compatible with 3.1. However, JEXL now requires Java 8.
Unfortunately, it is not strictly source compatible. This release does break source compatibility by adding methods to existing
interfaces and an abstract method to an abstract class. However, since these interfaces and class are not expected to be implemented
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java
index 1f7e8f1..f8d2004 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/PropertySetExecutor.java
@@ -115,7 +115,7 @@ public class PropertySetExecutor extends AbstractExecutor.Set {
}
/**
- * Discovers the method for a {@link PropertySet}.
+ * Discovers the method for a {@link org.apache.commons.jexl3.introspection.JexlPropertySet}.
* <p>The method to be found should be named "set{P,p}property.
* As a special case, any empty array will try to find a valid array-setting non-ambiguous method.
*