[openrewrite] add JavaSecurityBestPractices

Vincent Potucek · Vincent Potucek · commit 162c4c93a43d · 2025-09-25T12:27:04.000+02:00
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -251,7 +251,7 @@ public static Map.Entry<Integer, String> diff(Path rootDir, Formatter formatter,
 	}
 
 	private static Map.Entry<Integer, String> diff(CleanProvider formatter, File file) throws IOException {
-		String raw = Files.readString(file.toPath(), formatter.getEncoding());
+		String raw = new String(Files.readAllBytes(file.toPath()), formatter.getEncoding());
 		String rawUnix = LineEnding.toUnix(raw);
 		String formatted = formatter.getFormatted(file, rawUnix);
 		String formattedUnix = LineEnding.toUnix(formatted);
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
@@ -114,7 +114,7 @@ public static FormatterProperties fromXmlContent(final Iterable<String> content)
 
 	public static FormatterProperties merge(Properties... properties) {
 		FormatterProperties merged = new FormatterProperties();
-		List.of(properties).forEach((source) -> merged.properties.putAll(source));
+		List.of(properties).stream().forEach((source) -> merged.properties.putAll(source));
 		return merged;
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -172,7 +172,7 @@ private void doInstall() throws Exception {
 	 *                  such as file reading or writing errors
 	 */
 	private void uninstall(File gitHookFile) throws Exception {
-		final var hook = Files.readString(gitHookFile.toPath());
+		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
 		final int hookStart = hook.indexOf(HOOK_HEADER);
 		final int hookEnd = hook.indexOf(HOOK_FOOTER) + HOOK_FOOTER.length(); // hookEnd exclusive, so must be last symbol \n
 
@@ -323,7 +323,7 @@ private boolean isGitInstalled() {
 	 * @throws Exception if an error occurs when reading the file.
 	 */
 	private boolean isGitHookInstalled(File gitHookFile) throws Exception {
-		final var hook = Files.readString(gitHookFile.toPath());
+		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
 		return hook.contains(HOOK_HEADER) && hook.contains(HOOK_FOOTER);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -224,7 +224,7 @@ private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanup
 				LOGGER.debug("command finished with exit code: {}", result.exitCode());
 				LOGGER.debug("command finished with stdout: {}",
 						result.assertExitZero(StandardCharsets.UTF_8));
-				return Files.readString(tempFile.toPath());
+				return Files.readString(tempFile.toPath(), StandardCharsets.UTF_8);
 			} finally {
 				Files.delete(tempFile.toPath());
 			}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java b/lib/src/main/java/com/diffplug/spotless/npm/NodeServerLayout.java
@@ -96,7 +96,7 @@ public boolean isNodeModulesPrepared() {
 		// check if it is NOT empty
 		return ThrowingEx.get(() -> {
 			try (Stream<Path> entries = Files.list(nodeModulesInstallDirPath)) {
-				return entries.findAny().isPresent();
+				return entries.findFirst().isPresent();
 			}
 		});
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -137,7 +137,7 @@ private String assertFilepathInConfigOptions(File file) {
 				return prettierConfigOptions;
 			}
 			// if the file has no name, we  cannot use it
-			if (file.getName().trim().isEmpty()) {
+			if (file.getName().trim().length() == 0) {
 				return prettierConfigOptions;
 			}
 			// if it is not there, we add it at the beginning of the Options
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/FormatterToken.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/FormatterToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/KeywordCase.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/KeywordCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java b/lib/src/scalafmt/java/com/diffplug/spotless/glue/scalafmt/ScalafmtFormatterFunc.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
 import org.scalafmt.Scalafmt;
@@ -42,7 +43,7 @@ public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 			config = (ScalafmtConfig) method.invoke(ScalafmtConfig$.MODULE$);
 		} else {
 			File file = configSignature.getOnlyFile();
-			String configStr = Files.readString(file.toPath());
+			String configStr = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
 			config = Scalafmt.parseHoconConfig(configStr).get();
 		}
 
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,7 @@
  */
 package com.diffplug.spotless.glue.pom;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
+import java.io.*;
 import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -60,7 +61,7 @@ private static String loadAndWriteText(Path path, String name) throws IOExceptio
 		try (InputStream is = KtLintCompat0Dot48Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
 			Files.copy(is, path.resolve(name));
 		}
-		return Files.readString(path.resolve(name));
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
 	}
 
 }
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -58,7 +59,7 @@ private static String loadAndWriteText(Path path, String name) throws IOExceptio
 		try (InputStream is = KtLintCompat0Dot49Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
 			Files.copy(is, path.resolve(name));
 		}
-		return Files.readString(path.resolve(name));
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
 	}
 
 }
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -58,7 +59,7 @@ private static String loadAndWriteText(Path path, String name) throws IOExceptio
 		try (InputStream is = KtLintCompat0Dot50Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
 			Files.copy(is, path.resolve(name));
 		}
-		return Files.readString(path.resolve(name));
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
 	}
 
 }
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -58,7 +59,7 @@ private static String loadAndWriteText(Path path, String name) throws IOExceptio
 		try (InputStream is = KtLintCompat1Dot0Dot0AdapterTest.class.getResourceAsStream("/" + name)) {
 			Files.copy(is, path.resolve(name));
 		}
-		return Files.readString(path.resolve(name));
+		return new String(Files.readAllBytes(path.resolve(name)), StandardCharsets.UTF_8);
 	}
 
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/IdeHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,8 @@ public abstract class SpotlessTaskService implements BuildService<BuildServicePa
 	private final Map<String, SpotlessTask> source = Collections.synchronizedMap(new HashMap<>());
 	private final Map<String, Provisioner> provisioner = Collections.synchronizedMap(new HashMap<>());
 
-	@Nullable GradleProvisioner.DedupingProvisioner predeclaredProvisioner;
+	@Nullable
+	GradleProvisioner.DedupingProvisioner predeclaredProvisioner;
 
 	Provisioner provisionerFor(SpotlessExtension spotless) {
 		if (spotless instanceof SpotlessExtensionPredeclare) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java
@@ -414,7 +414,8 @@ private List<FormatterFactory> getFormatterFactories() {
 	}
 
 	private List<FormatterStepFactory> getFormatterStepFactories() {
-		return Stream.ofNullable(licenseHeader)
+		return Stream.of(licenseHeader)
+				.filter(Objects::nonNull)
 				.collect(toList());
 	}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/ArtifactResolver.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/ArtifactResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2020 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/UpToDateChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/EslintJs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -111,7 +111,7 @@ public String read(String path) throws IOException {
 	}
 
 	public String read(Path path, Charset encoding) throws IOException {
-		return Files.readString(path, encoding);
+		return new String(Files.readAllBytes(path), encoding);
 	}
 
 	public void replace(String path, String toReplace, String replaceWith) throws IOException {
@@ -214,7 +214,7 @@ public void notSameAsResource(String resource) throws IOException {
 		}
 
 		public void matches(Consumer<AbstractCharSequenceAssert<?, String>> conditions) throws IOException {
-			String content = Files.readString(file.toPath());
+			String content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
 			conditions.accept(assertThat(content));
 		}
 	}
diff --git a/testlib/src/test/java/com/diffplug/spotless/FileSignatureTest.java b/testlib/src/test/java/com/diffplug/spotless/FileSignatureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2021 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testlib/src/test/java/com/diffplug/spotless/JvmTest.java b/testlib/src/test/java/com/diffplug/spotless/JvmTest.java
@@ -43,8 +43,8 @@ void initialize() {
 	@Test
 	void supportAdd() {
 		Integer differentVersions[] = {0, 1, 2};
-		Arrays.asList(differentVersions).forEach(v -> testSupport.add(v + Jvm.version(), v.toString()));
-		Arrays.asList(differentVersions).forEach(v -> assertThat(testSupport.toString()).contains("Version %d".formatted(v)));
+		Arrays.asList(differentVersions).stream().forEach(v -> testSupport.add(v + Jvm.version(), v.toString()));
+		Arrays.asList(differentVersions).stream().forEach(v -> assertThat(testSupport.toString()).contains("Version %d".formatted(v)));
 		assertThat(testSupport.toString()).contains("%s alternatives".formatted(TEST_NAME));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2020-2025 DiffPlug`
	`2`	`+ * Copyright 2020-2023 DiffPlug`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ public static Map.Entry<Integer, String> diff(Path rootDir, Formatter formatter,`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`private static Map.Entry<Integer, String> diff(CleanProvider formatter, File file) throws IOException {`
`254`		`- String raw = Files.readString(file.toPath(), formatter.getEncoding());`
	`254`	`+ String raw = new String(Files.readAllBytes(file.toPath()), formatter.getEncoding());`
`255`	`255`	`String rawUnix = LineEnding.toUnix(raw);`
`256`	`256`	`String formatted = formatter.getFormatted(file, rawUnix);`
`257`	`257`	`String formattedUnix = LineEnding.toUnix(formatted);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2025 DiffPlug`
	`2`	`+ * Copyright 2016-2024 DiffPlug`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public static FormatterProperties fromXmlContent(final Iterable<String> content)`
`114`	`114`
`115`	`115`	`public static FormatterProperties merge(Properties... properties) {`
`116`	`116`	`FormatterProperties merged = new FormatterProperties();`
`117`		`- List.of(properties).forEach((source) -> merged.properties.putAll(source));`
	`117`	`+ List.of(properties).stream().forEach((source) -> merged.properties.putAll(source));`
`118`	`118`	`return merged;`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanup`
`224`	`224`	`LOGGER.debug("command finished with exit code: {}", result.exitCode());`
`225`	`225`	`LOGGER.debug("command finished with stdout: {}",`
`226`	`226`	`result.assertExitZero(StandardCharsets.UTF_8));`
`227`		`- return Files.readString(tempFile.toPath());`
	`227`	`+ return Files.readString(tempFile.toPath(), StandardCharsets.UTF_8);`
`228`	`228`	`} finally {`
`229`	`229`	`Files.delete(tempFile.toPath());`
`230`	`230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public boolean isNodeModulesPrepared() {`
`96`	`96`	`// check if it is NOT empty`
`97`	`97`	`return ThrowingEx.get(() -> {`
`98`	`98`	`try (Stream<Path> entries = Files.list(nodeModulesInstallDirPath)) {`
`99`		`- return entries.findAny().isPresent();`
	`99`	`+ return entries.findFirst().isPresent();`
`100`	`100`	`}`
`101`	`101`	`});`
`102`	`102`	`}`