Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-…

…jexl

src/main/java/org/apache/commons/jexl3/parser/JexlParser.java

@@ -29,7 +29,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.apache.commons.jexl3.JexlContext;
 import org.apache.commons.jexl3.JexlEngine;
 import org.apache.commons.jexl3.JexlException;
 import org.apache.commons.jexl3.JexlFeatures;
@@ -632,8 +631,9 @@ private boolean isNamespace(String name) {
     /**
      * Default implementation does nothing but is overridden by generated code.
      * @param top whether the identifier is beginning an l/r value
-     * @throws ParseException subclasses may throw this
+     * @throws ParseException subclasses may throw ParseException
      */
+    @SuppressWarnings("unused") // subclasses may throw ParseException
     protected void Identifier(final boolean top) throws ParseException {
         // Overridden by generated code
     }

src/main/java/org/apache/commons/jexl3/parser/SimpleNode.java

@@ -83,14 +83,17 @@ public void jjtSetParent(final Node n) {
 
     /**
      * Gets this node's parent.
+     *
      * @return the parent node
      */
     @Override
     public JexlNode jjtGetParent() {
         return parent;
     }
 
-    /** Adds a child node.
+    /**
+     * Adds a child node.
+     *
      * @param n the child node
      * @param i the child offset
      */
@@ -113,6 +116,7 @@ void jjtSetChildren(final JexlNode[] jexlNodes) {
 
     /**
      * Gets a child of this node.
+     *
      * @param i the child offset
      * @return the child node
      */
@@ -123,29 +127,35 @@ public JexlNode jjtGetChild(final int i) {
 
     /**
      * Gets this node number of children.
+     *
      * @return the number of children
      */
     @Override
     public int jjtGetNumChildren() {
         return children == null ? 0 : children.length;
     }
 
-    /** Sets this node value.
-     * @param value
+    /**
+     * Sets this node value.
+     *
+     * @param value this node value.
      */
     public void jjtSetValue(final Object value) {
         this.value = value;
     }
 
-    /** Gets this node value.
+    /**
+     * Gets this node value.
+     *
      * @return value
      */
     public Object jjtGetValue() {
         return value;
     }
 
     /**
-     * Accept the visitor.
+     * Accepts the visitor.
+     *
      * @param visitor the visitor
      * @param data contextual data
      * @return result of visit
@@ -156,7 +166,8 @@ public Object jjtAccept(final ParserVisitor visitor, final Object data) {
     }
 
     /**
-     * Accept the visitor on all this node's children.
+     * Accepts the visitor on all this node's children.
+     *
      * @param visitor the visitor
      * @param data contextual data
      * @return result of visit

src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java

@@ -132,7 +132,7 @@ public String getAfter() {
         return after;
     }
 
-     /***
+     /**
       * Replaces unprintable characters by their espaced (or unicode escaped)
       * equivalents in the given string
       */

src/test/java/org/apache/commons/jexl3/ClassCreator.java

@@ -87,32 +87,31 @@ Class<?> compile() throws Exception {
         final String source = packageDir.getPath() + "/" + sourceName;
         final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         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<>();
-        options.add("-classpath");
-        // only add hbase classes to classpath. This is a little bit tricky: assume
-        // the classpath is {hbaseSrc}/target/classes.
-        final String currentDir = new File(".").getAbsolutePath();
-        final String classpath = currentDir + File.separator + "target" + File.separator + "classes"
-        //+ File.pathSeparator + System.getProperty("java.class.path")
-        + File.pathSeparator + System.getProperty("surefire.test.class.path");
-
-        options.add(classpath);
-        //LOG.debug("Setting classpath to: " + classpath);
-
-        final JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, diagnosticsCollector, options,
-                null, compilationUnits);
-        final boolean success = task.call();
-        fileManager.close();
+        final boolean success;
+        try (StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnosticsCollector, null, null)) {
+            final Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromStrings(Collections.singletonList(source));
+
+            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.
+            final String currentDir = new File(".").getAbsolutePath();
+            final String classpath = currentDir + File.separator + "target" + File.separator + "classes"
+            // + File.pathSeparator + System.getProperty("java.class.path")
+                    + File.pathSeparator + System.getProperty("surefire.test.class.path");
+
+            options.add(classpath);
+            // LOG.debug("Setting classpath to: " + classpath);
+
+            final JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, diagnosticsCollector, options, null, compilationUnits);
+            success = task.call();
+        }
         if (success) {
             return getClassLoader().loadClass(GEN_CLASS + className);
         }
         final List<Diagnostic<? extends JavaFileObject>> diagnostics = diagnosticsCollector.getDiagnostics();
         for (final Diagnostic<? extends JavaFileObject> diagnostic : diagnostics) {
-            // read error dertails from the diagnostic object
+            // read error details from the diagnostic object
             System.out.println(diagnostic.getMessage(null));
 
         }

src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java

@@ -89,7 +89,7 @@ public int hangs(final Object t) {
             return 1;
         }
 
-        public int interrupt() throws InterruptedException {
+        public int interrupt() {
             Thread.currentThread().interrupt();
             return 42;
         }

src/test/java/org/apache/commons/jexl3/SideEffectTest.java

@@ -57,7 +57,7 @@ public Object selfAdd(final Appendable c, final String item) throws IOException
             return c;
         }
 
-        public Object selfAdd(final Collection<String> c, final String item) throws IOException {
+        public Object selfAdd(final Collection<String> c, final String item) {
             c.add(item);
             return c;
         }

src/test/java/org/example/SomeTest.java

@@ -89,7 +89,7 @@ public JexlEngine create() {
    */
   @Test
   public void testCustomFunctionPermissions() {
-      Map<String, Object> funcs = new HashMap<String, Object>();
+      Map<String, Object> funcs = new HashMap<>();
       funcs.put("math", new MyMath());
       JexlPermissions permissions = JexlPermissions.parse("org.example.*");
       JexlEngine jexl = new JexlBuilder().permissions(permissions).namespaces(funcs).create();