Skip to content

Commit 0fa58c0

Browse files
izeyewilkinsona
authored andcommitted
Use Stream.toList()
See gh-36167
1 parent bdead8d commit 0fa58c0

File tree

8 files changed

+13
-22
lines changed

8 files changed

+13
-22
lines changed

buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.nio.file.Files;
2222
import java.nio.file.StandardOpenOption;
2323
import java.util.List;
24-
import java.util.stream.Collectors;
2524
import java.util.stream.Stream;
2625

2726
import com.tngtech.archunit.base.DescribedPredicate;
@@ -70,15 +69,15 @@ public ArchitectureCheck() {
7069
@TaskAction
7170
void checkArchitecture() throws IOException {
7271
JavaClasses javaClasses = new ClassFileImporter()
73-
.importPaths(this.classes.getFiles().stream().map(File::toPath).collect(Collectors.toList()));
72+
.importPaths(this.classes.getFiles().stream().map(File::toPath).toList());
7473
List<EvaluationResult> violations = Stream.of(allPackagesShouldBeFreeOfTangles(),
7574
allBeanPostProcessorBeanMethodsShouldBeStaticAndHaveParametersThatWillNotCausePrematureInitialization(),
7675
allBeanFactoryPostProcessorBeanMethodsShouldBeStaticAndHaveNoParameters(),
7776
noClassesShouldCallStepVerifierStepVerifyComplete(),
7877
noClassesShouldConfigureDefaultStepVerifierTimeout())
7978
.map((rule) -> rule.evaluate(javaClasses))
8079
.filter(EvaluationResult::hasViolation)
81-
.collect(Collectors.toList());
80+
.toList();
8281
File outputFile = getOutputDirectory().file("failure-report.txt").get().getAsFile();
8382
outputFile.getParentFile().mkdirs();
8483
if (!violations.isEmpty()) {

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private List<VersionOption> determineResolvedVersionOptions(Library library) {
103103
.flatMap(SortedSet::stream)
104104
.distinct()
105105
.filter((dependencyVersion) -> isPermitted(dependencyVersion, library.getProhibitedVersions()))
106-
.collect(Collectors.toList());
106+
.toList();
107107
if (allVersions.isEmpty()) {
108108
return Collections.emptyList();
109109
}

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/ArtifactCollector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private Predicate<Path> excludeFilter(List<String> exclude) {
5050
Collection<DeployableArtifact> collectArtifacts(Path root) {
5151
try (Stream<Path> artifacts = Files.walk(root)) {
5252
return artifacts.filter(Files::isRegularFile).filter(this.excludeFilter)
53-
.map((artifact) -> deployableArtifact(artifact, root)).collect(Collectors.toList());
53+
.map((artifact) -> deployableArtifact(artifact, root)).toList();
5454
}
5555
catch (IOException ex) {
5656
throw new RuntimeException("Could not read artifacts from '" + root + "'");

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/SonatypeService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private void logFailures(String stagedRepositoryId) {
208208
List<String> failureMessages = Stream.of(activities).flatMap((activity) -> activity.events.stream())
209209
.filter((event) -> event.severity > 0).flatMap((event) -> event.properties.stream())
210210
.filter((property) -> "failureMessage".equals(property.name))
211-
.map((property) -> " " + property.value).collect(Collectors.toList());
211+
.map((property) -> " " + property.value).toList();
212212
if (failureMessages.isEmpty()) {
213213
logger.error("Close failed for unknown reasons");
214214
}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/flyway/FlywayEndpoint.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.HashMap;
2222
import java.util.List;
2323
import java.util.Map;
24-
import java.util.stream.Collectors;
2524
import java.util.stream.Stream;
2625

2726
import org.flywaydb.core.Flyway;
@@ -116,7 +115,7 @@ public static class FlywayDescriptor {
116115
private final List<FlywayMigrationDescriptor> migrations;
117116

118117
private FlywayDescriptor(MigrationInfo[] migrations) {
119-
this.migrations = Stream.of(migrations).map(FlywayMigrationDescriptor::new).collect(Collectors.toList());
118+
this.migrations = Stream.of(migrations).map(FlywayMigrationDescriptor::new).toList();
120119
}
121120

122121
public FlywayDescriptor(List<FlywayMigrationDescriptor> migrations) {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/ResolvedDependencies.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ ListProperty<File> getArtifactFiles() {
8484
}
8585

8686
void resolvedArtifacts(Provider<Set<ResolvedArtifactResult>> resolvedArtifacts) {
87-
this.artifactFiles.addAll(resolvedArtifacts
88-
.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getFile).collect(Collectors.toList())));
89-
this.artifactIds.addAll(resolvedArtifacts
90-
.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getId).collect(Collectors.toList())));
87+
this.artifactFiles.addAll(
88+
resolvedArtifacts.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getFile).toList()));
89+
this.artifactIds.addAll(
90+
resolvedArtifacts.map((artifacts) -> artifacts.stream().map(ResolvedArtifactResult::getId).toList()));
9191
}
9292

9393
DependencyDescriptor find(File file) {

spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Map;
2424
import java.util.Set;
2525
import java.util.function.Predicate;
26-
import java.util.stream.Collectors;
2726

2827
import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty;
2928
import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository;
@@ -82,9 +81,7 @@ PropertiesMigrationReport getReport() {
8281
private PropertySource<?> mapPropertiesWithReplacement(PropertiesMigrationReport report, String name,
8382
List<PropertyMigration> properties) {
8483
report.add(name, properties);
85-
List<PropertyMigration> renamed = properties.stream()
86-
.filter(PropertyMigration::isCompatibleType)
87-
.collect(Collectors.toList());
84+
List<PropertyMigration> renamed = properties.stream().filter(PropertyMigration::isCompatibleType).toList();
8885
if (renamed.isEmpty()) {
8986
return null;
9087
}
@@ -118,10 +115,7 @@ private boolean isMapType(ConfigurationMetadataProperty property) {
118115
private Map<String, List<PropertyMigration>> getMatchingProperties(
119116
Predicate<ConfigurationMetadataProperty> filter) {
120117
MultiValueMap<String, PropertyMigration> result = new LinkedMultiValueMap<>();
121-
List<ConfigurationMetadataProperty> candidates = this.allProperties.values()
122-
.stream()
123-
.filter(filter)
124-
.collect(Collectors.toList());
118+
List<ConfigurationMetadataProperty> candidates = this.allProperties.values().stream().filter(filter).toList();
125119
getPropertySourcesAsMap().forEach((propertySourceName, propertySource) -> candidates.forEach((metadata) -> {
126120
ConfigurationPropertyName metadataName = ConfigurationPropertyName.isValid(metadata.getId())
127121
? ConfigurationPropertyName.of(metadata.getId())

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import java.util.jar.Attributes;
3434
import java.util.jar.JarFile;
3535
import java.util.regex.Pattern;
36-
import java.util.stream.Collectors;
3736
import java.util.stream.Stream;
3837

3938
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
@@ -97,7 +96,7 @@ static ModifiedClassPathClassLoader get(Class<?> testClass, Method testMethod, L
9796
candidates.addAll(getAnnotatedElements(arguments.toArray()));
9897
List<AnnotatedElement> annotatedElements = candidates.stream()
9998
.filter(ModifiedClassPathClassLoader::hasAnnotation)
100-
.collect(Collectors.toList());
99+
.toList();
101100
if (annotatedElements.isEmpty()) {
102101
return null;
103102
}

0 commit comments

Comments
 (0)