Minor refactoring and clean-up

apache · Oct 19, 2022 · d82787b · d82787b
1 parent 603a2cd
commit d82787b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/JXPathClassFilter.java b/src/main/java/org/apache/commons/jxpath/ri/JXPathClassFilter.java
@@ -24,9 +24,7 @@
  * If this property is not set, it exposes no java classes
  * Ex: jxpath.class.allow=java.lang.Runtime will allow exposing java.lang.Runtime class via xpath, while all other
  * classes will be not exposed. You can use the wildcard (*) to allow all classes.
- *
- * @author bhmohanr-techie
- * @version $Revision$ $Date$
+ * @since 1.4
  */
 public interface JXPathClassFilter {
 

diff --git a/src/main/java/org/apache/commons/jxpath/ri/JXPathFilter.java b/src/main/java/org/apache/commons/jxpath/ri/JXPathFilter.java
@@ -25,9 +25,6 @@
  * This class implements specific filter interfaces, and implements methods in those. 
  * For instance, it JXPathClassFilter interface, which is used to check if any restricted java classes are passed via xpath
  * JXPath uses this filter instance when an extension function instance is created.
- *
- * @author bhmohanr-techie
- * @version $Revision$ $Date$
  */
 public class JXPathFilter implements JXPathClassFilter {
     private Set<String> allowedClassesList = null;
@@ -37,11 +34,10 @@ public JXPathFilter() {
     }
 
     public void init() {
-        String restrictedClasses = System.getProperty("jxpath.class.allow");
-        allowedClassesList = null;
-        if (restrictedClasses != null && restrictedClasses.trim().length() > 0) {
+        final String allowedClasses = System.getProperty("jxpath.class.allow");
+        if (allowedClasses != null && !allowedClasses.isEmpty()) {
             allowedClassesList = new HashSet<>();
-            allowedClassesList.addAll(Arrays.asList(restrictedClasses.split(",")));
+            allowedClassesList.addAll(Arrays.asList(allowedClasses.split(",")));
         }
     }
 
@@ -61,4 +57,3 @@ public boolean exposeToXPath(String className) {
         return allowedClassesList.contains(className) || allowedClassesList.contains("*");
     }
 }
-
diff --git a/src/test/java/org/apache/commons/jxpath/ri/compiler/TestFunctions3.java b/src/test/java/org/apache/commons/jxpath/ri/compiler/TestFunctions3.java
@@ -16,16 +16,8 @@
  */
 package org.apache.commons.jxpath.ri.compiler;
 
-import org.apache.commons.jxpath.Functions;
-import org.apache.commons.jxpath.JXPathContext;
-
-import java.util.*;
-
 /**
  * A test class with few methods, with different argument list
- *
- * @author bhmohanr-techie
- * @version $Revision$ $Date$
  */
 public final class TestFunctions3 {
 
@@ -52,4 +44,4 @@ public String testFunction3Method3(String str1, String str2) {
         return "testFunction3Method3:" + str1 + ":" + str2;
     }
 
-}
+}