Skip to content

Commit 274256a

Browse files
committed
Remove dependency to commons-collections4 (fixes ESAPI#868)
1 parent 6422aca commit 274256a

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@
230230
</exclusion>
231231
</exclusions>
232232
</dependency>
233-
<dependency>
234-
<groupId>org.apache.commons</groupId>
235-
<artifactId>commons-collections4</artifactId>
236-
<version>4.5.0-M2</version>
237-
</dependency>
238233
<dependency>
239234
<groupId>org.apache-extras.beanshell</groupId>
240235
<artifactId>bsh</artifactId>

src/main/java/org/owasp/esapi/reference/accesscontrol/DelegatingACR.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import java.util.Vector;
77
import java.util.Arrays;
88

9-
import org.apache.commons.collections4.iterators.ArrayListIterator;
10-
119
public class DelegatingACR extends BaseACR<DynaBeanACRParameter, Object[]> {
1210
protected Method delegateMethod;
1311
protected Object delegateInstance;
@@ -66,10 +64,9 @@ protected final Class[] getParameters(String[] parameterClassNames) {
6664
if (parameterClassNames == null) {
6765
return new Class[0];
6866
}
69-
Vector<Class> classes = new Vector<Class>();
70-
Iterator<String> classNames = new ArrayListIterator(parameterClassNames);
71-
while(classNames.hasNext()) {
72-
classes.add(getClass(classNames.next(), "parameter"));
67+
Vector<Class> classes = new Vector<>();
68+
for (String className : parameterClassNames) {
69+
classes.add(getClass(className, "parameter"));
7370
}
7471
return classes.toArray(new Class[classes.size()]);
7572
}

0 commit comments

Comments
 (0)