diff --git a/pom.xml b/pom.xml index e5b99b918..f0d9050d8 100644 --- a/pom.xml +++ b/pom.xml @@ -230,11 +230,6 @@ - - org.apache.commons - commons-collections4 - 4.5.0-M2 - org.apache-extras.beanshell bsh diff --git a/src/main/java/org/owasp/esapi/reference/accesscontrol/DelegatingACR.java b/src/main/java/org/owasp/esapi/reference/accesscontrol/DelegatingACR.java index eaa35799c..1209aa089 100644 --- 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 { protected Method delegateMethod; protected Object delegateInstance; @@ -66,10 +64,9 @@ protected final Class[] getParameters(String[] parameterClassNames) { if (parameterClassNames == null) { return new Class[0]; } - Vector classes = new Vector(); - Iterator classNames = new ArrayListIterator(parameterClassNames); - while(classNames.hasNext()) { - classes.add(getClass(classNames.next(), "parameter")); + Vector classes = new Vector<>(); + for (String className : parameterClassNames) { + classes.add(getClass(className, "parameter")); } return classes.toArray(new Class[classes.size()]); }