Replaced Collectors.joining() with String.join() where possible.

nedtwigg · nedtwigg · commit 86a13c361053 · 2018-02-12T02:43:21.000-08:00
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrow.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrow.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.assertj.core.api.Assertions;
 import org.gradle.testkit.runner.BuildResult;
@@ -49,7 +48,7 @@ private void writeBuild(String... toInsert) throws IOException {
 		lines.add("             }");
 		lines.add("        }");
 		lines.addAll(Arrays.asList(toInsert));
-		setFile("build.gradle").toContent(lines.stream().collect(Collectors.joining("\n")));
+		setFile("build.gradle").toContent(String.join("\n", lines));
 	}
 
 	@Test
@@ -133,7 +132,7 @@ private void assertResultAndMessages(BuildResult result, TaskOutcome outcome, St
 		String expectedToStartWith = StringPrinter.buildStringFromLines(messages).trim();
 		int numNewlines = CharMatcher.is('\n').countIn(expectedToStartWith);
 		List<String> actualLines = Splitter.on('\n').splitToList(LineEnding.toUnix(result.getOutput()));
-		String actualStart = actualLines.subList(0, numNewlines + 1).stream().collect(Collectors.joining("\n"));
+		String actualStart = String.join("\n", actualLines.subList(0, numNewlines + 1));
 		Assertions.assertThat(actualStart).isEqualTo(expectedToStartWith);
 		Assertions.assertThat(result.tasks(outcome).size() + result.tasks(TaskOutcome.UP_TO_DATE).size())
 				.isEqualTo(result.getTasks().size());
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java
@@ -20,7 +20,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Locale;
-import java.util.stream.Collectors;
 
 import org.assertj.core.api.Assertions;
 import org.gradle.api.GradleException;
@@ -163,7 +162,7 @@ public void paddedCellCheckFailureFiles() throws Throwable {
 	private void assertFolderContents(String subfolderName, String... files) throws IOException {
 		File subfolder = new File(rootFolder(), subfolderName);
 		Assert.assertTrue(subfolder.isDirectory());
-		String asList = Arrays.stream(subfolder.list()).sorted().collect(Collectors.joining("\n"));
+		String asList = String.join("\n", Arrays.asList(files));
 		Assert.assertEquals(StringPrinter.buildStringFromLines(files).trim(), asList);
 	}
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven;
 
-import static java.util.stream.Collectors.joining;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.ByteArrayOutputStream;
@@ -65,7 +64,7 @@ private Result run() throws IOException, InterruptedException {
 		Objects.requireNonNull(projectDir, "Need to call withProjectDir() first");
 		Objects.requireNonNull(args, "Need to call withArguments() first");
 		// run maven with the given args in the given directory
-		String argsString = Arrays.stream(args).collect(joining(" "));
+		String argsString = String.join(" ", Arrays.asList(args));
 		List<String> cmds = getPlatformCmds("-e -Dmaven.repo.local=" + localRepositoryDir + ' ' + argsString);
 		ProcessBuilder builder = new ProcessBuilder(cmds);
 		builder.directory(projectDir);
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -28,7 +28,6 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.assertj.core.api.AbstractCharSequenceAssert;
 import org.assertj.core.api.Assertions;
@@ -175,7 +174,7 @@ public void hasContent(String expected, Charset charset) {
 		}
 
 		public void hasLines(String... lines) {
-			hasContent(Arrays.stream(lines).collect(Collectors.joining("\n")));
+			hasContent(String.join("\n", Arrays.asList(lines)));
 		}
 
 		public void sameAsResource(String resource) throws IOException {
@@ -201,7 +200,7 @@ private WriteAsserter(File file) {
 		}
 
 		public File toLines(String... lines) throws IOException {
-			return toContent(Arrays.stream(lines).collect(Collectors.joining("\n")));
+			return toContent(String.join("\n", Arrays.asList(lines)));
 		}
 
 		public File toContent(String content) throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`import java.util.Objects;`
`29`	`29`	`import java.util.function.Consumer;`
`30`	`30`	`import java.util.logging.Logger;`
`31`		`-import java.util.stream.Collectors;`
`32`	`31`
`33`	`32`	`import org.assertj.core.api.AbstractCharSequenceAssert;`
`34`	`33`	`import org.assertj.core.api.Assertions;`
`@@ -175,7 +174,7 @@ public void hasContent(String expected, Charset charset) {`
`175`	`174`	`}`
`176`	`175`
`177`	`176`	`public void hasLines(String... lines) {`
`178`		`- hasContent(Arrays.stream(lines).collect(Collectors.joining("\n")));`
	`177`	`+ hasContent(String.join("\n", Arrays.asList(lines)));`
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`public void sameAsResource(String resource) throws IOException {`
`@@ -201,7 +200,7 @@ private WriteAsserter(File file) {`
`201`	`200`	`}`
`202`	`201`
`203`	`202`	`public File toLines(String... lines) throws IOException {`
`204`		`- return toContent(Arrays.stream(lines).collect(Collectors.joining("\n")));`
	`203`	`+ return toContent(String.join("\n", Arrays.asList(lines)));`
`205`	`204`	`}`
`206`	`205`
`207`	`206`	`public File toContent(String content) throws IOException {`