From 867ebc271fc038d83eb0a5fbb314d1cbf60148de Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Mon, 20 Aug 2018 07:40:00 +0200 Subject: [PATCH] Use String.join() --- src/main/org/apache/tools/ant/Main.java | 2 +- src/main/org/apache/tools/ant/Project.java | 2 +- src/main/org/apache/tools/ant/taskdefs/GenerateKey.java | 4 +--- src/main/org/apache/tools/ant/taskdefs/Manifest.java | 3 +-- .../org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java | 3 +-- .../apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java | 3 +-- .../ant/taskdefs/optional/extension/LibraryDisplayer.java | 4 +--- src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java | 3 +-- src/main/org/apache/tools/ant/types/AbstractFileSet.java | 3 +-- src/main/org/apache/tools/ant/types/DirSet.java | 5 +---- src/main/org/apache/tools/mail/MailMessage.java | 3 +-- .../org/apache/tools/ant/types/mappers/MapperResult.java | 5 +---- 12 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index feb25413d..a4523922e 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -900,7 +900,7 @@ public class Main implements AntMain { // Setting it here allows top-level tasks to access the // property. project.setUserProperty(MagicNames.PROJECT_INVOKED_TARGETS, - targets.stream().collect(Collectors.joining(","))); + String.join(",", targets)); } /** diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 4d8ab59ae..62aafbc4c 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -1247,7 +1247,7 @@ public class Project implements ResourceFactory { */ public void executeTargets(final Vector names) throws BuildException { setUserProperty(MagicNames.PROJECT_INVOKED_TARGETS, - names.stream().collect(Collectors.joining(","))); + String.join(",", names)); getExecutor().executeTargets(this, names.toArray(new String[names.size()])); } diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java index bff5834e2..cab130423 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -22,7 +22,6 @@ import java.util.Enumeration; import java.util.List; import java.util.Vector; import java.util.stream.Collectors; -import java.util.stream.Stream; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; @@ -128,8 +127,7 @@ public class GenerateKey extends Task { * @return the encoded value. */ public String encode(final String string) { - return Stream.of(string.split(",")) - .collect(Collectors.joining("\\,")); + return String.join("\\,", string.split(",")); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index 141bcdd38..b3a37e26a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -35,7 +35,6 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Vector; -import java.util.stream.Collectors; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.FileUtils; @@ -264,7 +263,7 @@ public class Manifest { */ public String getValue() { return values.isEmpty() ? null - : values.stream().collect(Collectors.joining(" ")); + : String.join(" ", values); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java index 12cd81c1a..6759e75f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java @@ -29,7 +29,6 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import java.util.stream.Collectors; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -422,7 +421,7 @@ public class CvsTagDiff extends AbstractCvsTask { root.setAttribute("cvsroot", getCvsRoot()); root.setAttribute("package", - packageNames.stream().collect(Collectors.joining(","))); + String.join(",", packageNames)); DOM_WRITER.openElement(root, writer, 0, "\t"); writer.println(); for (CvsTagEntry entry : entries) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java index a49c7e0ca..4484062fa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java @@ -35,7 +35,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.xml.parsers.SAXParser; @@ -404,7 +403,7 @@ public class IPlanetEjbc { command += "ejbc "; /* Concatenate all of the command line arguments into a single String */ - String args = Stream.of(arguments).collect(Collectors.joining(" ")); + String args = String.join(" ", arguments); log(command + args); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java index b755687fd..bb34b77bc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java @@ -20,8 +20,6 @@ package org.apache.tools.ant.taskdefs.optional.extension; import java.io.File; import java.text.ParseException; import java.util.jar.Manifest; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.apache.tools.ant.BuildException; @@ -138,7 +136,7 @@ class LibraryDisplayer { if (null != sections) { System.out.print("Sections: "); System.out - .println(Stream.of(sections).collect(Collectors.joining(" "))); + .println(String.join(" ", sections)); } System.out.println(specification.toString()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java index a4d702a65..6bd6d4d7d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.tools.ant.BuildException; @@ -551,7 +550,7 @@ public class Scp extends SSHBase { private BuildException exactlyOne(final String[] attrs, final String alt) { return new BuildException("Exactly one of [%s]%s is required", - Stream.of(attrs).collect(Collectors.joining("|")), + String.join("|", attrs), alt == null ? "" : " or " + alt); } } diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 794931a86..6258fa81f 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -24,7 +24,6 @@ import java.util.Enumeration; import java.util.List; import java.util.Stack; import java.util.stream.Collectors; -import java.util.stream.Stream; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; @@ -903,7 +902,7 @@ public abstract class AbstractFileSet extends DataType } dieOnCircularReference(); DirectoryScanner ds = getDirectoryScanner(getProject()); - return Stream.of(ds.getIncludedFiles()).collect(Collectors.joining(";")); + return String.join(";", ds.getIncludedFiles()); } /** diff --git a/src/main/org/apache/tools/ant/types/DirSet.java b/src/main/org/apache/tools/ant/types/DirSet.java index d7c6ede8c..d71ae3383 100644 --- a/src/main/org/apache/tools/ant/types/DirSet.java +++ b/src/main/org/apache/tools/ant/types/DirSet.java @@ -19,8 +19,6 @@ package org.apache.tools.ant.types; import java.util.Iterator; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.resources.FileResourceIterator; @@ -105,8 +103,7 @@ public class DirSet extends AbstractFileSet implements ResourceCollection { */ @Override public String toString() { - DirectoryScanner ds = getDirectoryScanner(getProject()); - return Stream.of(ds.getIncludedDirectories()).collect(Collectors.joining(";")); + return String.join(";", getDirectoryScanner(getProject()).getIncludedDirectories()); } } diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index dad50a9fa..35f57bc26 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -35,7 +35,6 @@ import java.net.Socket; import java.util.LinkedHashMap; import java.util.Map; import java.util.Vector; -import java.util.stream.Collectors; /** * A class to help send SMTP email. @@ -312,7 +311,7 @@ public class MailMessage { } String vectorToList(Vector v) { - return v.stream().collect(Collectors.joining(", ")); + return String.join(", ", v); } void flushHeaders() throws IOException { diff --git a/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java b/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java index cf69d511d..278b25a50 100644 --- a/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java +++ b/src/tests/junit/org/apache/tools/ant/types/mappers/MapperResult.java @@ -23,9 +23,6 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.util.FileNameMapper; -import java.util.Arrays; -import java.util.stream.Collectors; - /** * This is a test task to show the result of a mapper * on a specific input. @@ -83,7 +80,7 @@ public class MapperResult extends Task { if (result == null) { flattened = NULL_MAPPER_RESULT; } else { - flattened = Arrays.stream(result).collect(Collectors.joining("|")); + flattened = String.join("|", result); } if (!flattened.equals(output)) { throw new BuildException(failMessage + " got " + flattened + " expected " + output);