Repository: ant Updated Branches: refs/heads/master ac35c0014 -> 070c3bc86
http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/types/ZipScanner.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index a3df040..5667159 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -20,7 +20,7 @@ package org.apache.tools.ant.types; import java.io.File; import java.io.IOException; -import java.util.Enumeration; +import java.util.Collections; import java.util.Map; import java.util.zip.ZipException; @@ -62,10 +62,7 @@ public class ZipScanner extends ArchiveScanner { "Only file provider resources are supported")); try (ZipFile zf = new ZipFile(srcFile, encoding)) { - - Enumeration<ZipEntry> e = zf.getEntries(); - while (e.hasMoreElements()) { - ZipEntry entry = e.nextElement(); + for (ZipEntry entry : Collections.list(zf.getEntries())) { Resource r = new ZipResource(srcFile, encoding, entry); String name = entry.getName(); if (entry.isDirectory()) { http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java index 4f2e1eb..413ae39 100644 --- a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java +++ b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java @@ -18,7 +18,7 @@ package org.apache.tools.ant.types.optional.depend; import java.io.File; -import java.util.Enumeration; +import java.util.Collections; import java.util.Set; import java.util.Vector; import java.util.stream.Collectors; @@ -126,12 +126,8 @@ public class DependScanner extends DirectoryScanner { Set<String> parentSet = Stream.of(parentScanner.getIncludedFiles()) .collect(Collectors.toSet()); - Enumeration<String> e = analyzer.getClassDependencies(); - - while (e.hasMoreElements()) { - String classname = e.nextElement(); - String filename = - classname.replace('.', File.separatorChar) + ".class"; + for (String classname : Collections.list(analyzer.getClassDependencies())) { + String filename = classname.replace('.', File.separatorChar) + ".class"; File depFile = new File(basedir, filename); if (depFile.exists() && parentSet.contains(filename)) { // This is included http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/types/resources/Resources.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/types/resources/Resources.java b/src/main/org/apache/tools/ant/types/resources/Resources.java index c11918c..afa92f8 100644 --- a/src/main/org/apache/tools/ant/types/resources/Resources.java +++ b/src/main/org/apache/tools/ant/types/resources/Resources.java @@ -34,7 +34,6 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.util.CollectionUtils; /** * Generic ResourceCollection: Either stores nested ResourceCollections, @@ -90,7 +89,8 @@ public class Resources extends DataType implements ResourceCollection { private synchronized Collection<Resource> getCache() { Collection<Resource> coll = cached; if (coll == null) { - coll = CollectionUtils.asCollection(new MyIterator()); + coll = new ArrayList<>(); + new MyIterator().forEachRemaining(coll::add); if (cache) { cached = coll; } http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java b/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java index 444d1c1..c6f50ef 100644 --- a/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java @@ -19,7 +19,7 @@ package org.apache.tools.ant.types.selectors; import java.io.File; -import java.util.Enumeration; +import java.util.Collections; /** * This selector is here just to shake up your thinking a bit. Don't get @@ -75,11 +75,9 @@ public class MajoritySelector extends BaseSelectorContainer { validate(); int yesvotes = 0; int novotes = 0; - Enumeration<FileSelector> e = selectorElements(); - while (e.hasMoreElements()) { - if (e.nextElement().isSelected(basedir, - filename, file)) { + for (FileSelector fs : Collections.list(selectorElements())) { + if (fs.isSelected(basedir, filename, file)) { yesvotes++; } else { novotes++; http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java index b5667f8..d091db0 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java @@ -221,11 +221,7 @@ public class SelectSelector extends BaseSelectorContainer { } Enumeration<FileSelector> e = selectorElements(); - if (!e.hasMoreElements()) { - return true; - } - FileSelector f = e.nextElement(); - return f.isSelected(basedir, filename, file); + return !e.hasMoreElements() || e.nextElement().isSelected(basedir, filename, file); } } http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/util/CollectionUtils.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/CollectionUtils.java b/src/main/org/apache/tools/ant/util/CollectionUtils.java index 94fa928..c516fe3 100644 --- a/src/main/org/apache/tools/ant/util/CollectionUtils.java +++ b/src/main/org/apache/tools/ant/util/CollectionUtils.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; * * @since Ant 1.5 */ +@Deprecated public class CollectionUtils { @SuppressWarnings("rawtypes") @@ -80,20 +81,10 @@ public class CollectionUtils { return false; } - Enumeration<?> e1 = d1.keys(); - while (e1.hasMoreElements()) { - Object key = e1.nextElement(); - Object value1 = d1.get(key); - Object value2 = d2.get(key); - if (!value1.equals(value2)) { - return false; - } - } - // don't need the opposite check as the Dictionaries have the // same size, so we've also covered all keys of d2 already. - - return true; + return Collections.list(d1.keys()).stream() + .allMatch(key -> d1.get(key).equals(d2.get(key))); } /** @@ -103,7 +94,9 @@ public class CollectionUtils { * @param c collection to transform * @return string representation of the collection * @since Ant 1.8.0 + * @deprecated use stream().collect(Collectors.joining(",")) */ + @Deprecated public static String flattenToString(Collection<?> c) { return c.stream().map(String::valueOf).collect(Collectors.joining(",")); } @@ -120,10 +113,7 @@ public class CollectionUtils { @Deprecated public static <K, V> void putAll(Dictionary<? super K, ? super V> m1, Dictionary<? extends K, ? extends V> m2) { - for (Enumeration<? extends K> it = m2.keys(); it.hasMoreElements();) { - K key = it.nextElement(); - m1.put(key, m2.get(key)); - } + Collections.list(m2.keys()).forEach(key -> m1.put(key, m2.get(key))); } /** @@ -159,7 +149,10 @@ public class CollectionUtils { * @param <E> element type * @return an enumeration representing e1 followed by e2. * @since Ant 1.6.3 + * @deprecated use Stream.concat(Collections.list(e1).stream(), Collections.list(e2).stream()) + * .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::enumeration)) */ + @Deprecated public static <E> Enumeration<E> append(Enumeration<E> e1, Enumeration<E> e2) { return new CompoundEnumeration<>(e1, e2); } @@ -169,7 +162,9 @@ public class CollectionUtils { * @param iter the Iterator to adapt. * @param <E> element type * @return an Enumeration. + * @deprecated use Collections.enumeration() */ + @Deprecated public static <E> Enumeration<E> asEnumeration(final Iterator<E> iter) { return new Enumeration<E>() { @Override @@ -188,7 +183,9 @@ public class CollectionUtils { * @param e the Enumeration to adapt. * @param <E> element type * @return an Iterator. + * @deprecated use Collections.list(e).iterator() */ + @Deprecated public static <E> Iterator<E> asIterator(final Enumeration<E> e) { return new Iterator<E>() { @Override @@ -213,7 +210,9 @@ public class CollectionUtils { * @param <T> element type * @return the collection * @since Ant 1.8.0 + * @deprecated instantiate a list an use forEachRemaining(list::add) */ + @Deprecated public static <T> Collection<T> asCollection(final Iterator<? extends T> iter) { List<T> l = new ArrayList<>(); iter.forEachRemaining(l::add); http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/util/LinkedHashtable.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/LinkedHashtable.java b/src/main/org/apache/tools/ant/util/LinkedHashtable.java index 4f73273..5224ff8 100644 --- a/src/main/org/apache/tools/ant/util/LinkedHashtable.java +++ b/src/main/org/apache/tools/ant/util/LinkedHashtable.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.util; import java.util.Collection; +import java.util.Collections; import java.util.Enumeration; import java.util.Hashtable; import java.util.LinkedHashMap; @@ -79,7 +80,7 @@ public class LinkedHashtable<K, V> extends Hashtable<K, V> { @Override public Enumeration<V> elements() { - return CollectionUtils.asEnumeration(values().iterator()); + return Collections.enumeration(values()); } @Override @@ -109,7 +110,7 @@ public class LinkedHashtable<K, V> extends Hashtable<K, V> { @Override public Enumeration<K> keys() { - return CollectionUtils.asEnumeration(keySet().iterator()); + return Collections.enumeration(keySet()); } @Override http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java index fa2e9ee..8fc6d57 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java @@ -16,9 +16,10 @@ * */ package org.apache.tools.ant.util.depend.bcel; + import java.io.File; import java.io.IOException; -import java.util.Enumeration; +import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.Vector; @@ -69,13 +70,9 @@ public class AncestorAnalyzer extends AbstractAnalyzer { // classes upon which they depend Set<String> dependencies = new HashSet<>(); Set<File> containers = new HashSet<>(); - Set<String> toAnalyze = new HashSet<>(); + Set<String> toAnalyze = new HashSet<>(Collections.list(getRootClasses())); Set<String> nextAnalyze = new HashSet<>(); - for (Enumeration<String> e = getRootClasses(); e.hasMoreElements();) { - toAnalyze.add(e.nextElement()); - } - int count = 0; int maxCount = isClosureRequired() ? MAX_LOOPS : 2; while (!toAnalyze.isEmpty() && count++ < maxCount) { @@ -115,9 +112,8 @@ public class AncestorAnalyzer extends AbstractAnalyzer { } } - Set<String> temp = toAnalyze; - toAnalyze = nextAnalyze; - nextAnalyze = temp; + toAnalyze.clear(); + toAnalyze.addAll(nextAnalyze); } files.clear(); http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java index 0c6af25..8b6357d 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java @@ -19,7 +19,6 @@ package org.apache.tools.ant.util.depend.bcel; import java.io.File; import java.io.IOException; import java.util.Collections; -import java.util.Enumeration; import java.util.HashSet; import java.util.Set; import java.util.Vector; @@ -102,15 +101,10 @@ public class FullAnalyzer extends AbstractAnalyzer { } toAnalyze.clear(); - // now recover all the dependencies collected and add to the list. - Enumeration<String> depsEnum = dependencyVisitor.getDependencies(); - while (depsEnum.hasMoreElements()) { - String className = depsEnum.nextElement(); - if (!dependencies.contains(className)) { - toAnalyze.add(className); - } - } + Collections.list(dependencyVisitor.getDependencies()).stream() + .filter(className -> !dependencies.contains(className)) + .forEach(toAnalyze::add); } files.clear(); http://git-wip-us.apache.org/repos/asf/ant/blob/070c3bc8/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java b/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java index 08ddbce..c2e16b9 100644 --- a/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.util; +import java.util.Collections; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; @@ -112,7 +113,7 @@ public class LinkedHashtableTest { @Test public void testKeys() { multiSetup(); - assertKeys(CollectionUtils.asIterator(h.keys())); + assertKeys(Collections.list(h.keys()).iterator()); } @Test @@ -124,7 +125,7 @@ public class LinkedHashtableTest { @Test public void testElements() { multiSetup(); - assertValues(CollectionUtils.asIterator(h.elements())); + assertValues(Collections.list(h.elements()).iterator()); } @Test
