Remove dependency to commons-collections4 (fixes #868)

ESAPI · Jan 22, 2025 · 274256a · 274256a
1 parent 6422aca
commit 274256a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -230,11 +230,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.5.0-M2</version>
-        </dependency>
         <dependency>
             <groupId>org.apache-extras.beanshell</groupId>
             <artifactId>bsh</artifactId>

diff --git a/src/main/java/org/owasp/esapi/reference/accesscontrol/DelegatingACR.java b/src/main/java/org/owasp/esapi/reference/accesscontrol/DelegatingACR.java
@@ -6,8 +6,6 @@
 import java.util.Vector;
 import java.util.Arrays;
 
-import org.apache.commons.collections4.iterators.ArrayListIterator;
-
 public class DelegatingACR extends BaseACR<DynaBeanACRParameter, Object[]> {
     protected Method delegateMethod;
     protected Object delegateInstance;
@@ -66,10 +64,9 @@ protected final Class[] getParameters(String[] parameterClassNames) {
         if (parameterClassNames == null) {
             return new Class[0];
         }
-        Vector<Class> classes = new Vector<Class>();
-        Iterator<String> classNames = new ArrayListIterator(parameterClassNames);
-        while(classNames.hasNext()) {
-            classes.add(getClass(classNames.next(), "parameter"));
+        Vector<Class> classes = new Vector<>();
+        for (String className : parameterClassNames) {
+            classes.add(getClass(className, "parameter"));
         }
         return classes.toArray(new Class[classes.size()]);
     }