[openrewrite] migrate.util.JavaUtilAPIs

Vincent Potucek · Vincent Potucek · commit aa63de7b5a8a · 2025-09-30T13:09:53.000+02:00
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -137,7 +137,7 @@ public String format(
 			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
 		} else {
 			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
-					RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
+					RuleProvider::createNewRuleInstance).toList(),
 					editorConfigOverrideMap);
 		}
 		EditorConfigDefaults editorConfig;
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -99,7 +99,7 @@ public String format(
 			editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();
 		} else {
 			editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(
-					RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
+					RuleProvider::createNewRuleInstance).toList(),
 					editorConfigOverrideMap);
 		}
 		EditorConfigDefaults editorConfig;
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -100,7 +100,7 @@ public String format(
 		} else {
 			editorConfigOverride = createEditorConfigOverride(
 					editorConfig,
-					allRuleProviders.stream().map(RuleProvider::createNewRuleInstance).collect(Collectors.toList()),
+					allRuleProviders.stream().map(RuleProvider::createNewRuleInstance).toList(),
 					editorConfigOverrideMap);
 		}
 
diff --git a/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java b/lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java
@@ -46,7 +46,7 @@ public String applyWithFile(String unix, File file) {
 		try {
 			return adapter.format(file, unix, isScript);
 		} catch (DiktatReporting.LintException e) {
-			throw Lint.shortcut(e.lints.stream().map(lint -> Lint.atLine(lint.line, lint.ruleId, lint.detail)).collect(Collectors.toList()));
+			throw Lint.shortcut(e.lints.stream().map(lint -> Lint.atLine(lint.line, lint.ruleId, lint.detail)).toList());
 		}
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,12 +105,12 @@ private static PaddedCell check(Formatter formatter, File file, String original,
 		}
 		String appliedOnce = formatter.computeWithLint(original, file, exceptionPerStep);
 		if (appliedOnce.equals(original)) {
-			return Type.CONVERGE.create(file, Collections.singletonList(appliedOnce));
+			return Type.CONVERGE.create(file, List.of(appliedOnce));
 		}
 
 		String appliedTwice = formatter.computeWithLint(appliedOnce, file, exceptionPerStep);
 		if (appliedOnce.equals(appliedTwice)) {
-			return Type.CONVERGE.create(file, Collections.singletonList(appliedOnce));
+			return Type.CONVERGE.create(file, List.of(appliedOnce));
 		}
 
 		List<String> appliedN = new ArrayList<>();
diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
@@ -24,8 +24,8 @@
 import java.nio.file.Path;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
+import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -299,7 +299,7 @@ private State createState() throws IOException, InterruptedException {
 		validateBiomeExecutable(resolvedPathToExe);
 		validateBiomeConfigPath(configPath, version);
 		logger.debug("Using Biome executable located at  '{}'", resolvedPathToExe);
-		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
+		var exeSignature = FileSignature.signAsList(Set.of(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
 		return new State(resolvedPathToExe, exeSignature, configPath, language);
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -280,7 +280,7 @@ private List<String> getParams(File file) {
 			}
 			builder.add("-charset").add("UTF-8");
 			builder.add(ThrowingEx.get(file::getCanonicalPath));
-			return builder.build().collect(Collectors.toList());
+			return builder.build().toList();
 		}
 
 		private FormatterFunc.Closeable toFunc() {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -57,7 +57,7 @@ public ImportsGroup(String importOrder, Set<String> knownGroupings) {
 			this.subGroups = Stream.of(importOrder.split("\\" + SUBGROUP_SEPARATOR, -1))
 					.map(this::normalizeStatic)
 					.filter(group -> !knownGroupings.contains(group))
-					.collect(Collectors.toList());
+					.toList();
 			knownGroupings.addAll(this.subGroups);
 		}
 
@@ -91,7 +91,7 @@ private List<String> sort(List<String> imports, String lineFormat) {
 
 	private ImportSorterImpl(List<String> importOrder, boolean wildcardsLast, boolean semanticSort,
 			Set<String> treatAsPackage, Set<String> treatAsClass) {
-		importsGroups = importOrder.stream().filter(Objects::nonNull).map(order -> new ImportsGroup(order, knownGroupings)).collect(Collectors.toList());
+		importsGroups = importOrder.stream().filter(Objects::nonNull).map(order -> new ImportsGroup(order, knownGroupings)).toList();
 		putStaticItemIfNotExists(importsGroups);
 		putCatchAllGroupIfNotExists(importsGroups);
 
@@ -101,7 +101,7 @@ private ImportSorterImpl(List<String> importOrder, boolean wildcardsLast, boolea
 			ordering = new LexicographicalOrderingComparator(wildcardsLast);
 		}
 
-		List<String> subgroups = importsGroups.stream().map(ImportsGroup::getSubGroups).flatMap(Collection::stream).collect(Collectors.toList());
+		List<String> subgroups = importsGroups.stream().map(ImportsGroup::getSubGroups).flatMap(Collection::stream).toList();
 		this.allImportOrderItems.addAll(subgroups);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -65,7 +64,7 @@ public static Map<String, String> defaultDevDependencies() {
 	}
 
 	public static Map<String, String> defaultDevDependenciesWithEslint(String version) {
-		return Collections.singletonMap("eslint", version);
+		return Map.of("eslint", version);
 	}
 
 	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/JsonWriter.java b/lib/src/main/java/com/diffplug/spotless/npm/JsonWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -45,7 +44,7 @@ JsonWriter putAll(Map<String, ?> values) {
 	}
 
 	JsonWriter put(String name, Object value) {
-		verifyValues(Collections.singletonMap(name, value));
+		verifyValues(Map.of(name, value));
 		this.valueMap.put(name, value);
 		return this;
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -22,7 +22,6 @@
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -164,7 +163,7 @@ protected static String replaceDevDependencies(String template, Map<String, Stri
 				builder.append(",\n");
 			}
 		}
-		return replacePlaceholders(template, Collections.singletonMap("devDependencies", builder.toString()));
+		return replacePlaceholders(template, Map.of("devDependencies", builder.toString()));
 	}
 
 	private static String replacePlaceholders(String template, Map<String, String> replacements) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -48,7 +47,7 @@ public static Map<String, String> defaultDevDependencies() {
 	}
 
 	public static Map<String, String> defaultDevDependenciesWithPrettier(String version) {
-		return Collections.singletonMap("prettier", version);
+		return Map.of("prettier", version);
 	}
 
 	public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/rdf/RdfFormatterFunc.java
@@ -141,7 +141,7 @@ private static String calculateDiff(ReflectionHelper reflectionHelper, Object mo
 						throw new RuntimeException(e);
 					}
 				})
-				.collect(Collectors.toList());
+				.toList();
 
 		List<Object> onlyInAfterContent = reflectionHelper.streamGraph(graphAfter)
 				.filter(triple -> {
@@ -151,7 +151,7 @@ private static String calculateDiff(ReflectionHelper reflectionHelper, Object mo
 						throw new RuntimeException(e);
 					}
 				})
-				.collect(Collectors.toList());
+				.toList();
 		if (!(onlyInBeforeContent.isEmpty() && onlyInAfterContent.isEmpty())) {
 			diffResult = onlyInBeforeContent.stream().map("< %s"::formatted)
 					.collect(Collectors.joining("\n"));
diff --git a/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java b/lib/src/main/java/com/diffplug/spotless/rdf/ReflectionHelper.java
@@ -350,7 +350,7 @@ private Object makeListOf(Type type, String parameterValueAsString) {
 			} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
 				throw new RuntimeException(ex);
 			}
-		}).collect(Collectors.toList());
+		}).toList();
 	}
 
 	private Object makeSetOf(Type type, String parameterValueAsString) {
diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -21,6 +21,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.util.Collections;
+import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -87,7 +88,7 @@ private static final class State implements Serializable {
 
 		State(JarState jarState, @Nullable File configFile) throws IOException {
 			this.jarState = jarState;
-			this.configSignature = FileSignature.signAsList(configFile == null ? Collections.emptySet() : Collections.singleton(configFile));
+			this.configSignature = FileSignature.signAsList(configFile == null ? Collections.emptySet() : Set.of(configFile));
 		}
 
 		FormatterFunc createFormat() throws Exception {
diff --git a/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java b/lib/src/main/java/com/diffplug/spotless/shell/ShfmtStep.java
@@ -123,7 +123,7 @@ String format(ProcessRunner runner, String input, File file) throws IOException,
 
 			// This will ensure that the next file name is retrieved on every format
 			final List<String> finalArgs = Stream.concat(args.stream(), Stream.of(file.getAbsolutePath()))
-					.collect(Collectors.toList());
+					.toList();
 
 			return runner.exec(input.getBytes(StandardCharsets.UTF_8), finalArgs).assertExitZero(StandardCharsets.UTF_8);
 		}
diff --git a/lib/src/test/java/com/diffplug/spotless/npm/NodeServerLayoutTest.java b/lib/src/test/java/com/diffplug/spotless/npm/NodeServerLayoutTest.java
@@ -42,8 +42,8 @@ void itCalculatesSameNodeModulesDirForSameContent() throws IOException {
 	@Test
 	void itCalculatesDifferentNodeModulesDirForDifferentPackageJson() throws IOException {
 		File testDir = newFolder("build");
-		String packageJsonContent1 = prettierPackageJson(Collections.singletonMap("prettier-plugin-xy", "^2.0.0"));
-		String packageJsonContent2 = prettierPackageJson(Collections.singletonMap("prettier-plugin-xy", "^2.1.0"));
+		String packageJsonContent1 = prettierPackageJson(Map.of("prettier-plugin-xy", "^2.0.0"));
+		String packageJsonContent2 = prettierPackageJson(Map.of("prettier-plugin-xy", "^2.1.0"));
 		String serveJsContent = "fun main() { console.log('Hello, world!'); }";
 
 		NodeServerLayout layout1 = new NodeServerLayout(testDir, packageJsonContent1, serveJsContent);
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java
@@ -15,7 +15,7 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.util.Collections;
+import java.util.Map;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.json.JacksonConfig;
@@ -36,7 +36,7 @@ protected AJacksonGradleConfig(JacksonConfig jacksonConfig, FormatExtension form
 	}
 
 	public T feature(String feature, boolean toggle) {
-		this.jacksonConfig.appendFeatureToToggle(Collections.singletonMap(feature, toggle));
+		this.jacksonConfig.appendFeatureToToggle(Map.of(feature, toggle));
 		formatExtension.replaceStep(createStep());
 		return self();
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java
@@ -18,7 +18,6 @@
 import static java.util.Objects.requireNonNull;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -200,7 +199,7 @@ protected FormatterStep createStep() {
 
 		private void fixParserToJavascript() {
 			if (this.prettierConfig == null) {
-				this.prettierConfig = Collections.singletonMap("parser", DEFAULT_PRETTIER_JS_PARSER);
+				this.prettierConfig = Map.of("parser", DEFAULT_PRETTIER_JS_PARSER);
 			} else {
 				final Object currentParser = this.prettierConfig.get("parser");
 				if (PRETTIER_JS_PARSERS.contains(String.valueOf(currentParser))) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -165,7 +164,7 @@ public JacksonJsonGradleConfig(FormatExtension formatExtension) {
 		 * Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
 		 */
 		public JacksonJsonGradleConfig jsonFeature(String feature, boolean toggle) {
-			this.jacksonConfig.appendJsonFeatureToToggle(Collections.singletonMap(feature, toggle));
+			this.jacksonConfig.appendJsonFeatureToToggle(Map.of(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
 		}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
@@ -169,7 +169,7 @@ protected FormatterStep createStep() {
 
 		private void fixParserToTypescript() {
 			if (this.prettierConfig == null) {
-				this.prettierConfig = new TreeMap<>(Collections.singletonMap("parser", "typescript"));
+				this.prettierConfig = new TreeMap<>(Map.of("parser", "typescript"));
 			} else {
 				final Object replaced = this.prettierConfig.put("parser", "typescript");
 				if (replaced != null) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.util.Collections;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -62,7 +62,7 @@ public JacksonYamlGradleConfig(FormatExtension formatExtension) {
 		 * Refers to com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
 		 */
 		public JacksonYamlGradleConfig yamlFeature(String feature, boolean toggle) {
-			this.jacksonConfig.appendYamlFeatureToToggle(Collections.singletonMap(feature, toggle));
+			this.jacksonConfig.appendYamlFeatureToToggle(Map.of(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
 		}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.diffplug.gradle.spotless;
 
 import java.io.File;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.gradle.api.Project;
 import org.gradle.api.services.BuildServiceParameters;
@@ -50,7 +50,7 @@ void testLineEndings() throws Exception {
 		File testFile = setFile("testFile").toContent("\r\n");
 		File outputFile = new File(spotlessTask.getCleanDirectory(), "testFile");
 
-		spotlessTask.setTarget(Collections.singleton(testFile));
+		spotlessTask.setTarget(Set.of(testFile));
 		Tasks.execute(spotlessTask);
 
 		assertFile(outputFile).hasContent("\n");
@@ -60,7 +60,7 @@ void testLineEndings() throws Exception {
 	void testStep() throws Exception {
 		File testFile = setFile("testFile").toContent("apple");
 		File outputFile = new File(spotlessTask.getCleanDirectory(), "testFile");
-		spotlessTask.setTarget(Collections.singleton(testFile));
+		spotlessTask.setTarget(Set.of(testFile));
 
 		spotlessTask.setSteps(List.of(ReplaceStep.create("double-p", "pp", "p")));
 		Tasks.execute(spotlessTask);
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -159,7 +159,7 @@ public void iterateFiles(Predicate<String> subpathsToInclude, BiConsumer<String,
 		TreeDef<File> treeDef = TreeDef.forFile(Errors.rethrow());
 		List<File> files = TreeStream.depthFirst(treeDef, rootFolder())
 				.filter(File::isFile)
-				.collect(Collectors.toList());
+				.toList();
 
 		ListIterator<File> iterator = files.listIterator(files.size());
 		int rootLength = rootFolder().getAbsolutePath().length() + 1;
@@ -210,13 +210,13 @@ private void taskIsUpToDate(String task, boolean upToDate) throws IOException {
 	public static List<String> outcomes(BuildResult build, TaskOutcome outcome) {
 		return build.taskPaths(outcome).stream()
 				.filter(s -> !s.equals(":spotlessInternalRegisterDependencies"))
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	public static List<BuildTask> outcomes(BuildResult build) {
 		return build.getTasks().stream()
 				.filter(t -> !t.getPath().equals(":spotlessInternalRegisterDependencies"))
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	static String buildResultToString(BuildResult result) {
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
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/GitRatchetMaven.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/GitRatchetMaven.java
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MultiModuleProjectTest.java
diff --git a/rewrite.yml b/rewrite.yml
diff --git a/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/ShadowCopyTest.java
diff --git a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public String format(`
`137`	`137`	`editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();`
`138`	`138`	`} else {`
`139`	`139`	`editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(`
`140`		`- RuleProvider::createNewRuleInstance).collect(Collectors.toList()),`
	`140`	`+ RuleProvider::createNewRuleInstance).toList(),`
`141`	`141`	`editorConfigOverrideMap);`
`142`	`142`	`}`
`143`	`143`	`EditorConfigDefaults editorConfig;`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public String format(`
`99`	`99`	`editorConfigOverride = EditorConfigOverride.Companion.getEMPTY_EDITOR_CONFIG_OVERRIDE();`
`100`	`100`	`} else {`
`101`	`101`	`editorConfigOverride = createEditorConfigOverride(allRuleProviders.stream().map(`
`102`		`- RuleProvider::createNewRuleInstance).collect(Collectors.toList()),`
	`102`	`+ RuleProvider::createNewRuleInstance).toList(),`
`103`	`103`	`editorConfigOverrideMap);`
`104`	`104`	`}`
`105`	`105`	`EditorConfigDefaults editorConfig;`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public String format(`
`100`	`100`	`} else {`
`101`	`101`	`editorConfigOverride = createEditorConfigOverride(`
`102`	`102`	`editorConfig,`
`103`		`- allRuleProviders.stream().map(RuleProvider::createNewRuleInstance).collect(Collectors.toList()),`
	`103`	`+ allRuleProviders.stream().map(RuleProvider::createNewRuleInstance).toList(),`
`104`	`104`	`editorConfigOverrideMap);`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public String applyWithFile(String unix, File file) {`
`46`	`46`	`try {`
`47`	`47`	`return adapter.format(file, unix, isScript);`
`48`	`48`	`} catch (DiktatReporting.LintException e) {`
`49`		`- throw Lint.shortcut(e.lints.stream().map(lint -> Lint.atLine(lint.line, lint.ruleId, lint.detail)).collect(Collectors.toList()));`
	`49`	`+ throw Lint.shortcut(e.lints.stream().map(lint -> Lint.atLine(lint.line, lint.ruleId, lint.detail)).toList());`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2024 DiffPlug`
	`2`	`+ * Copyright 2016-2025 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.`
`@@ -105,12 +105,12 @@ private static PaddedCell check(Formatter formatter, File file, String original,`
`105`	`105`	`}`
`106`	`106`	`String appliedOnce = formatter.computeWithLint(original, file, exceptionPerStep);`
`107`	`107`	`if (appliedOnce.equals(original)) {`
`108`		`- return Type.CONVERGE.create(file, Collections.singletonList(appliedOnce));`
	`108`	`+ return Type.CONVERGE.create(file, List.of(appliedOnce));`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`String appliedTwice = formatter.computeWithLint(appliedOnce, file, exceptionPerStep);`
`112`	`112`	`if (appliedOnce.equals(appliedTwice)) {`
`113`		`- return Type.CONVERGE.create(file, Collections.singletonList(appliedOnce));`
	`113`	`+ return Type.CONVERGE.create(file, List.of(appliedOnce));`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`List<String> appliedN = new ArrayList<>();`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ private List<String> getParams(File file) {`
`280`	`280`	`}`
`281`	`281`	`builder.add("-charset").add("UTF-8");`
`282`	`282`	`builder.add(ThrowingEx.get(file::getCanonicalPath));`
`283`		`- return builder.build().collect(Collectors.toList());`
	`283`	`+ return builder.build().toList();`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`private FormatterFunc.Closeable toFunc() {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import java.io.File;`
`21`	`21`	`import java.io.IOException;`
`22`	`22`	`import java.io.Serializable;`
`23`		`-import java.util.Collections;`
`24`	`23`	`import java.util.HashMap;`
`25`	`24`	`import java.util.LinkedHashMap;`
`26`	`25`	`import java.util.Map;`
`@@ -65,7 +64,7 @@ public static Map<String, String> defaultDevDependencies() {`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`public static Map<String, String> defaultDevDependenciesWithEslint(String version) {`
`68`		`- return Collections.singletonMap("eslint", version);`
	`67`	`+ return Map.of("eslint", version);`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`public static FormatterStep create(Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {`