You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/05/16 19:43:16 UTC
ant git commit: Vector is iterable
Repository: ant
Updated Branches:
refs/heads/master 070c3bc86 -> 0020d1a16
Vector is iterable
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0020d1a1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0020d1a1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0020d1a1
Branch: refs/heads/master
Commit: 0020d1a16ba4207289d2380dc6981c85455b617f
Parents: 070c3bc
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed May 16 21:43:02 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed May 16 21:43:02 2018 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/AntClassLoader.java | 13 +++++--------
.../taskdefs/optional/ejb/WebsphereDeploymentTool.java | 2 +-
src/main/org/apache/tools/ant/types/FilterSet.java | 4 +---
3 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0020d1a1/src/main/org/apache/tools/ant/AntClassLoader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index 41a0cde..d0ba4da 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -742,8 +742,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
private InputStream loadResource(final String name) {
// we need to search the components of the path to see if we can
// find the class we want.
- return Collections.list(pathComponents.elements()).stream()
- .map(path -> getResourceStream(path, name))
+ return pathComponents.stream().map(path -> getResourceStream(path, name))
.filter(Objects::nonNull).findFirst().orElse(null);
}
@@ -826,10 +825,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
// TODO - shouldn't this always return false in isolated mode?
- return Collections.list(loaderPackages.elements()).stream()
- .noneMatch(resourceName::startsWith)
- && (Collections.list(systemPackages.elements()).stream()
- .anyMatch(resourceName::startsWith) || parentFirst);
+ return loaderPackages.stream().noneMatch(resourceName::startsWith)
+ && (systemPackages.stream().anyMatch(resourceName::startsWith) || parentFirst);
}
/**
@@ -869,7 +866,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
} else {
// try and load from this loader if the parent either didn't find
// it or wasn't consulted.
- for (final File pathComponent : Collections.list(pathComponents.elements())) {
+ for (final File pathComponent : pathComponents) {
url = getResourceURL(pathComponent, name);
if (url != null) {
log("Resource " + name + " loaded from ant loader", Project.MSG_DEBUG);
@@ -1343,7 +1340,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
// we need to search the components of the path to see if
// we can find the class we want.
final String classFilename = getClassFilename(name);
- for (final File pathComponent : Collections.list(pathComponents.elements())) {
+ for (final File pathComponent : pathComponents) {
InputStream stream = null;
try {
stream = getResourceStream(pathComponent, classFilename);
http://git-wip-us.apache.org/repos/asf/ant/blob/0020d1a1/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index 45bb25e..eed9377 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -737,7 +737,7 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
newJarStream.setLevel(0);
// Copy files from old WebSphere jar
- for (JarEntry je : Collections.list(wasEntries.elements())) {
+ for (JarEntry je : wasEntries.values()) {
if (je.getCompressedSize() == -1
|| je.getCompressedSize() == je.getSize()) {
newJarStream.setLevel(0);
http://git-wip-us.apache.org/repos/asf/ant/blob/0020d1a1/src/main/org/apache/tools/ant/types/FilterSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index a3fefce..7d3333d 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -20,7 +20,6 @@ package org.apache.tools.ant.types;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Files;
-import java.util.Collections;
import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
@@ -252,8 +251,7 @@ public class FilterSet extends DataType implements Cloneable {
dieOnCircularReference();
if (filterHash == null) {
filterHash = new Hashtable<>(getFilters().size());
- Collections.list(getFilters().elements())
- .forEach(filter -> filterHash.put(filter.getToken(), filter.getValue()));
+ getFilters().forEach(filter -> filterHash.put(filter.getToken(), filter.getValue()));
}
return filterHash;
}