Skip to content

Commit 64081a3

Browse files
committed
Replace Collectors.toList() with Stream.toList()
Modernize stream collection operations by replacing Collectors.toList() with Stream.toList() introduced in Java 16. Changes: - 17 files updated across multiple modules - Removed unused Collectors import statements where applicable - Retained Collectors import where joining() or toCollection() is used Motivation: - Conciseness: stream.toList() is shorter and more readable - Performance: Avoids creating an intermediate Collector object - Immutability: toList() returns an unmodifiable list - Modern Java: Aligns with Java 16+ idioms since the project requires Java 17 Signed-off-by: Eunseo Song <[email protected]>
1 parent 47878d4 commit 64081a3

File tree

19 files changed

+30
-53
lines changed

19 files changed

+30
-53
lines changed

initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.List;
2121
import java.util.regex.Matcher;
2222
import java.util.regex.Pattern;
23-
import java.util.stream.Collectors;
2423

2524
import io.spring.initializr.actuate.stat.ProjectRequestDocument.ClientInformation;
2625
import io.spring.initializr.actuate.stat.ProjectRequestDocument.DependencyInformation;
@@ -90,11 +89,11 @@ public ProjectRequestDocument createDocument(ProjectRequestEvent event) {
9089
List<String> dependencies = new ArrayList<>(request.getDependencies());
9190
List<String> validDependencies = dependencies.stream()
9291
.filter((id) -> metadata.getDependencies().get(id) != null)
93-
.collect(Collectors.toList());
92+
.toList();
9493
document.setDependencies(new DependencyInformation(validDependencies));
9594
List<String> invalidDependencies = dependencies.stream()
9695
.filter((id) -> (!validDependencies.contains(id)))
97-
.collect(Collectors.toList());
96+
.toList();
9897
if (!invalidDependencies.isEmpty()) {
9998
document.triggerError().triggerInvalidDependencies(invalidDependencies);
10099
}

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package io.spring.initializr.generator.spring.build.gradle;
1818

1919
import java.util.List;
20-
import java.util.stream.Collectors;
2120

2221
import io.spring.initializr.generator.buildsystem.BuildItemResolver;
2322
import io.spring.initializr.generator.buildsystem.gradle.GradleBuild;
@@ -71,8 +70,7 @@ public GradleProjectGenerationConfiguration(IndentingWriterFactory indentingWrit
7170
@Bean
7271
public GradleBuild gradleBuild(ObjectProvider<BuildItemResolver> buildItemResolver,
7372
ObjectProvider<BuildCustomizer<?>> buildCustomizers) {
74-
return createGradleBuild(buildItemResolver.getIfAvailable(),
75-
buildCustomizers.orderedStream().collect(Collectors.toList()));
73+
return createGradleBuild(buildItemResolver.getIfAvailable(), buildCustomizers.orderedStream().toList());
7674
}
7775

7876
@SuppressWarnings("unchecked")

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/MavenProjectGenerationConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package io.spring.initializr.generator.spring.build.maven;
1818

1919
import java.util.List;
20-
import java.util.stream.Collectors;
2120

2221
import io.spring.initializr.generator.buildsystem.BuildItemResolver;
2322
import io.spring.initializr.generator.buildsystem.maven.MavenBuild;
@@ -59,8 +58,7 @@ MavenWrapperContributor mavenWrapperContributor() {
5958
@Bean
6059
public MavenBuild mavenBuild(ObjectProvider<BuildItemResolver> buildItemResolver,
6160
ObjectProvider<BuildCustomizer<?>> buildCustomizers) {
62-
return createBuild(buildItemResolver.getIfAvailable(),
63-
buildCustomizers.orderedStream().collect(Collectors.toList()));
61+
return createBuild(buildItemResolver.getIfAvailable(), buildCustomizers.orderedStream().toList());
6462
}
6563

6664
@SuppressWarnings("unchecked")

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/MainSourceCodeProjectContributor.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.nio.file.Path;
2121
import java.util.List;
2222
import java.util.function.Supplier;
23-
import java.util.stream.Collectors;
2423

2524
import io.spring.initializr.generator.language.CompilationUnit;
2625
import io.spring.initializr.generator.language.SourceCode;
@@ -84,24 +83,22 @@ public void contribute(Path projectRoot) throws IOException {
8483

8584
@SuppressWarnings("unchecked")
8685
private void customizeMainApplicationType(T mainApplicationType) {
87-
List<MainApplicationTypeCustomizer<?>> customizers = this.mainTypeCustomizers.orderedStream()
88-
.collect(Collectors.toList());
86+
List<MainApplicationTypeCustomizer<?>> customizers = this.mainTypeCustomizers.orderedStream().toList();
8987
LambdaSafe.callbacks(MainApplicationTypeCustomizer.class, customizers, mainApplicationType)
9088
.invoke((customizer) -> customizer.customize(mainApplicationType));
9189
}
9290

9391
@SuppressWarnings("unchecked")
9492
private void customizeMainCompilationUnit(C compilationUnit) {
9593
List<MainCompilationUnitCustomizer<?, ?>> customizers = this.mainCompilationUnitCustomizers.orderedStream()
96-
.collect(Collectors.toList());
94+
.toList();
9795
LambdaSafe.callbacks(MainCompilationUnitCustomizer.class, customizers, compilationUnit)
9896
.invoke((customizer) -> customizer.customize(compilationUnit));
9997
}
10098

10199
@SuppressWarnings("unchecked")
102100
private void customizeMainSourceCode(S sourceCode) {
103-
List<MainSourceCodeCustomizer<?, ?, ?>> customizers = this.mainSourceCodeCustomizers.orderedStream()
104-
.collect(Collectors.toList());
101+
List<MainSourceCodeCustomizer<?, ?, ?>> customizers = this.mainSourceCodeCustomizers.orderedStream().toList();
105102
LambdaSafe.callbacks(MainSourceCodeCustomizer.class, customizers, sourceCode)
106103
.invoke((customizer) -> customizer.customize(sourceCode));
107104
}

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/ServletInitializerContributor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package io.spring.initializr.generator.spring.code;
1818

1919
import java.util.List;
20-
import java.util.stream.Collectors;
2120

2221
import io.spring.initializr.generator.language.CompilationUnit;
2322
import io.spring.initializr.generator.language.SourceCode;
@@ -59,8 +58,7 @@ public void customize(SourceCode<TypeDeclaration, CompilationUnit<TypeDeclaratio
5958

6059
@SuppressWarnings("unchecked")
6160
private void customizeServletInitializer(TypeDeclaration servletInitializer) {
62-
List<ServletInitializerCustomizer<?>> customizers = this.servletInitializerCustomizers.orderedStream()
63-
.collect(Collectors.toList());
61+
List<ServletInitializerCustomizer<?>> customizers = this.servletInitializerCustomizers.orderedStream().toList();
6462
LambdaSafe.callbacks(ServletInitializerCustomizer.class, customizers, servletInitializer)
6563
.invoke((customizer) -> customizer.customize(servletInitializer));
6664
}

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/TestSourceCodeProjectContributor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.nio.file.Path;
2121
import java.util.List;
2222
import java.util.function.Supplier;
23-
import java.util.stream.Collectors;
2423

2524
import io.spring.initializr.generator.language.CompilationUnit;
2625
import io.spring.initializr.generator.language.SourceCode;
@@ -80,15 +79,14 @@ public void contribute(Path projectRoot) throws IOException {
8079
@SuppressWarnings("unchecked")
8180
private void customizeTestApplicationType(TypeDeclaration testApplicationType) {
8281
List<TestApplicationTypeCustomizer<?>> customizers = this.testApplicationTypeCustomizers.orderedStream()
83-
.collect(Collectors.toList());
82+
.toList();
8483
LambdaSafe.callbacks(TestApplicationTypeCustomizer.class, customizers, testApplicationType)
8584
.invoke((customizer) -> customizer.customize(testApplicationType));
8685
}
8786

8887
@SuppressWarnings("unchecked")
8988
private void customizeTestSourceCode(S sourceCode) {
90-
List<TestSourceCodeCustomizer<?, ?, ?>> customizers = this.testSourceCodeCustomizers.orderedStream()
91-
.collect(Collectors.toList());
89+
List<TestSourceCodeCustomizer<?, ?, ?>> customizers = this.testSourceCodeCustomizers.orderedStream().toList();
9290
LambdaSafe.callbacks(TestSourceCodeCustomizer.class, customizers, sourceCode)
9391
.invoke((customizer) -> customizer.customize(sourceCode));
9492
}

initializr-generator-test/src/main/java/io/spring/initializr/generator/test/project/ProjectAssetTester.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Map;
2222
import java.util.function.Consumer;
2323
import java.util.function.Supplier;
24-
import java.util.stream.Collectors;
2524

2625
import io.spring.initializr.generator.project.MutableProjectDescription;
2726
import io.spring.initializr.generator.project.ProjectAssetGenerator;
@@ -122,7 +121,7 @@ private ProjectAssetGenerator<ProjectStructure> runAllAvailableContributors() {
122121
.createProjectDirectory(context.getBean(ProjectDescription.class));
123122
List<ProjectContributor> projectContributors = context.getBeanProvider(ProjectContributor.class)
124123
.orderedStream()
125-
.collect(Collectors.toList());
124+
.toList();
126125
for (ProjectContributor projectContributor : projectContributors) {
127126
projectContributor.contribute(projectDirectory);
128127
}

initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected List<StandardGradlePlugin> extractStandardPlugin(GradleBuild build) {
101101
.values()
102102
.filter(StandardGradlePlugin.class::isInstance)
103103
.map(StandardGradlePlugin.class::cast)
104-
.collect(Collectors.toList());
104+
.toList();
105105
}
106106

107107
/**
@@ -138,8 +138,7 @@ private static String sourceCompatibilityAsNumber(GradleBuildSettings settings)
138138
}
139139

140140
protected final void writeRepositories(IndentingWriter writer, GradleBuild build) {
141-
writeNestedCollection(writer, "repositories", build.repositories().items().collect(Collectors.toList()),
142-
this::repositoryAsString);
141+
writeNestedCollection(writer, "repositories", build.repositories().items().toList(), this::repositoryAsString);
143142
}
144143

145144
protected abstract String repositoryAsString(MavenRepository repository);
@@ -224,7 +223,7 @@ private void writeBoms(IndentingWriter writer, GradleBuild build) {
224223
List<BillOfMaterials> boms = build.boms()
225224
.items()
226225
.sorted(Comparator.comparingInt(BillOfMaterials::getOrder).reversed())
227-
.collect(Collectors.toList());
226+
.toList();
228227
writer.println();
229228
writer.println("dependencyManagement {");
230229
writer.indented(() -> writeNestedCollection(writer, "imports", boms, this::bomAsString));
@@ -326,7 +325,7 @@ private Collection<Dependency> filterDependencies(DependencyContainer dependenci
326325
return dependencies.items()
327326
.filter((dep) -> filter.test(dep.getScope()))
328327
.sorted(getDependencyComparator())
329-
.collect(Collectors.toList());
328+
.toList();
330329
}
331330

332331
@SafeVarargs

initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.List;
2020
import java.util.Map;
2121
import java.util.function.BiFunction;
22-
import java.util.stream.Collectors;
2322

2423
import io.spring.initializr.generator.buildsystem.BillOfMaterials;
2524
import io.spring.initializr.generator.buildsystem.Dependency;
@@ -76,7 +75,7 @@ protected void writePlugins(IndentingWriter writer, GradleBuild build) {
7675
}
7776

7877
private List<GradlePlugin> extractApplyPlugins(GradleBuild build) {
79-
return build.plugins().values().filter(GradlePlugin::isApply).collect(Collectors.toList());
78+
return build.plugins().values().filter(GradlePlugin::isApply).toList();
8079
}
8180

8281
private String pluginAsString(StandardGradlePlugin plugin) {

initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected void writeConfigurations(IndentingWriter writer, GradleConfigurationCo
101101
return;
102102
}
103103
writer.println("configurations {");
104-
List<String> customConfigurations = configurations.names().collect(Collectors.toList());
104+
List<String> customConfigurations = configurations.names().toList();
105105
writer.indented(() -> configurations.customizations()
106106
.forEach((configuration) -> writeConfiguration(writer, configuration, customConfigurations)));
107107
writer.println("}");

0 commit comments

Comments
 (0)