GH-69 - Switch to Stream.toList().

odrotbohm · odrotbohm · commit 55b16857f32f · 2022-11-11T18:49:03.000+01:00
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleInformation.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModuleInformation.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.springframework.modulith.ApplicationModule;
@@ -125,7 +124,7 @@ public List<String> getAllowedDependencies() {
 			return annotation //
 					.map(it -> Arrays.stream(it.allowedDependencies())) //
 					.orElse(Stream.empty()) //
-					.collect(Collectors.toList());
+					.toList();
 		}
 	}
 }
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModules.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModules.java
@@ -102,7 +102,7 @@ private ApplicationModules(ModulithMetadata metadata, Collection<String> package
 
 		this.rootPackages = packages.stream() //
 				.map(it -> JavaPackage.of(classes, it).toSingle()) //
-				.collect(Collectors.toList());
+				.toList();
 
 		this.sharedModules = Collections.emptySet();
 	}
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Classes.java
@@ -77,7 +77,7 @@ private Classes(List<JavaClass> classes) {
 	static Classes of(JavaClasses classes) {
 
 		return new Classes(StreamSupport.stream(classes.spliterator(), false) //
-				.collect(Collectors.toList()));
+				.toList());
 	}
 
 	/**
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/EventType.java
@@ -18,12 +18,10 @@
 import lombok.Value;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.springframework.util.Assert;
 
-import com.tngtech.archunit.core.domain.JavaAccess;
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaModifier;
 
@@ -54,18 +52,18 @@ public EventType(JavaClass type) {
 
 		this.type = type;
 
-		Stream<JavaAccess<?>> factoryMethodCalls = type.getMethods().stream()
+		var factoryMethodCalls = type.getMethods().stream()
 				.filter(method -> method.getModifiers().contains(JavaModifier.STATIC))
 				.filter(method -> method.getRawReturnType().equals(type))
 				.flatMap(method -> method.getCallsOfSelf().stream());
 
-		Stream<JavaAccess<?>> constructorCalls = type.getConstructors().stream()
+		var constructorCalls = type.getConstructors().stream()
 				.flatMap(constructor -> constructor.getCallsOfSelf().stream());
 
 		this.sources = Stream.concat(constructorCalls, factoryMethodCalls)
 				.filter(call -> !call.getOriginOwner().equals(type))
-				.map(JavaAccessSource::new)
-				.collect(Collectors.toList());
+				.<Source> map(JavaAccessSource::new)
+				.toList();
 	}
 
 	public boolean hasSources() {
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterface.java
@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.util.Assert;
 
@@ -56,7 +55,7 @@ public static List<PackageBasedNamedInterface> of(JavaPackage javaPackage) {
 
 		return Arrays.stream(name) //
 				.map(it -> new PackageBasedNamedInterface(it, javaPackage)) //
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	public static TypeBasedNamedInterface of(String name, Classes classes, JavaPackage basePackage) {
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/NamedInterfaces.java
@@ -84,7 +84,7 @@ private static List<TypeBasedNamedInterface> ofAnnotatedTypes(JavaPackage basePa
 
 		return mappings.entrySet().stream() //
 				.map(entry -> NamedInterface.of(entry.getKey(), Classes.of(entry.getValue()), basePackage)) //
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	private NamedInterfaces and(NamedInterface namedInterface) {
diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/SpringBean.java
@@ -21,7 +21,6 @@
 import lombok.RequiredArgsConstructor;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.tngtech.archunit.core.domain.JavaClass;
 
@@ -65,7 +64,7 @@ public List<JavaClass> getInterfacesWithinModule() {
 
 		return type.getRawInterfaces().stream() //
 				.filter(module::contains) //
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	public boolean isAnnotatedWith(Class<?> type) {
diff --git a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/ConfigurationProperties.java
@@ -62,7 +62,7 @@ class ConfigurationProperties implements Iterable<ConfigurationProperty> {
 
 			this.properties = Arrays.stream(resources)
 					.flatMap(ConfigurationProperties::parseProperties)
-					.collect(Collectors.toList());
+					.toList();
 
 		} catch (IOException e) {
 			throw new RuntimeException(e);
@@ -81,7 +81,7 @@ public List<ModuleProperty> getModuleProperties(ApplicationModule module) {
 
 		return properties.stream()
 				.flatMap(it -> getModuleProperty(module, it))
-				.collect(Collectors.toList());
+				.toList();
 	}
 
 	/*
diff --git a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Documenter.java
@@ -822,7 +822,7 @@ private List<SpringBean> getMatchingBeans(ApplicationModule module, Grouping fil
 					.filter(it -> !hideInternals || it.isApiBean())
 					.filter(it -> !alreadyMapped.contains(it))
 					.filter(filter::matches)
-					.collect(Collectors.toList());
+					.toList();
 		}
 
 		@Value(staticConstructor = "of")
diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticaster.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticaster.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.springframework.beans.factory.SmartInitializingSingleton;
@@ -165,7 +164,7 @@ public TransactionalEventListeners(Collection<ApplicationListener<?>> listeners)
 					.filter(TransactionalApplicationListener.class::isInstance)
 					.map(TransactionalApplicationListener.class::cast)
 					.sorted(AnnotationAwareOrderComparator.INSTANCE)
-					.collect(Collectors.toList());
+					.toList();
 		}
 
 		private TransactionalEventListeners(
@@ -185,7 +184,7 @@ public TransactionalEventListeners forPhase(TransactionPhase phase) {
 
 			List<TransactionalApplicationListener<ApplicationEvent>> collect = listeners.stream()
 					.filter(it -> it.getTransactionPhase().equals(phase))
-					.collect(Collectors.toList());
+					.toList();
 
 			return new TransactionalEventListeners(collect);
 		}
diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepository.java b/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepository.java
@@ -24,7 +24,6 @@
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -85,16 +84,15 @@ public List<EventPublication> findIncompletePublications() {
 		var query = query(where("completionDate").isNull());
 
 		return mongoTemplate.find(query, MongoDbEventPublication.class).stream() //
-				.map(this::documentToDomain) //
-				.collect(Collectors.toList());
+				.<EventPublication> map(this::documentToDomain) //
+				.toList();
 	}
 
 	@Override
 	public Optional<EventPublication> findIncompletePublicationsByEventAndTargetIdentifier(
 			Object event, PublicationTargetIdentifier targetIdentifier) {
 
-		var documents = findDocumentsByEventAndTargetIdentifierAndCompletionDateNull( //
-				event, targetIdentifier);
+		var documents = findDocumentsByEventAndTargetIdentifierAndCompletionDateNull(event, targetIdentifier);
 		var results = documents
 				.stream() //
 				.map(this::documentToDomain) //
@@ -113,7 +111,8 @@ private List<MongoDbEventPublication> findDocumentsByEventAndTargetIdentifierAnd
 			Object event, PublicationTargetIdentifier targetIdentifier) {
 
 		// we need to enforce writing of the type information
-		var eventAsMongoType = mongoTemplate.getConverter().convertToMongoType(event, TypeInformation.of(Object.class));
+		var eventAsMongoType = mongoTemplate.getConverter().convertToMongoType(event, TypeInformation.OBJECT);
+
 		var query = query(
 				where("event").is(eventAsMongoType) //
 						.and("listenerId").is(targetIdentifier.getValue()) //
diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ModulesIntegrationTest.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/model/ModulesIntegrationTest.java
@@ -147,7 +147,7 @@ void createsModulesFromJavaPackage() {
 
 		assertThat(fromPackage.stream().map(ApplicationModule::getName)) //
 				.containsExactlyInAnyOrderElementsOf(
-						modules.stream().map(ApplicationModule::getName).collect(Collectors.toList()));
+						modules.stream().map(ApplicationModule::getName).toList());
 	}
 
 	private static void verifyNamedInterfaces(NamedInterfaces interfaces, String name, Class<?>... types) {
diff --git a/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/MomentsProperties.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/MomentsProperties.java
@@ -130,7 +130,7 @@ public static ShiftedQuarters of(Month shift) {
 
 			return new ShiftedQuarters(Arrays.stream(Quarter.values())
 					.map(it -> ShiftedQuarter.of(it, shift))
-					.collect(Collectors.toList()));
+					.toList());
 		}
 	}
 }
diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/DefaultPublishedEvents.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/DefaultPublishedEvents.java
@@ -94,7 +94,7 @@ private static class SimpleTypedPublishedEvents<T> implements TypedPublishedEven
 		private final List<T> events;
 
 		private static <T> SimpleTypedPublishedEvents<T> of(Stream<T> stream) {
-			return new SimpleTypedPublishedEvents<>(stream.collect(Collectors.toList()));
+			return new SimpleTypedPublishedEvents<>(stream.toList());
 		}
 
 		/*
diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestAutoConfiguration.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestAutoConfiguration.java
@@ -63,7 +63,7 @@ static class AutoConfigurationAndEntityScanPackageCustomizer implements ImportBe
 		public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 
 			ModuleTestExecution execution = ((BeanFactory) registry).getBean(ModuleTestExecution.class);
-			List<String> basePackages = execution.getBasePackages().collect(Collectors.toList());
+			List<String> basePackages = execution.getBasePackages().toList();
 
 			LOG.info("Re-configuring auto-configuration and entity scan packages to: {}.",
 					StringUtils.collectionToDelimitedString(basePackages, ", "));
diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java
@@ -68,7 +68,7 @@ private ModuleTestExecution(ApplicationModuleTest annotation, ApplicationModules
 		this.bootstrapMode = annotation.mode();
 		this.module = module;
 
-		this.extraIncludes = getExtraModules(annotation, modules).collect(Collectors.toList());
+		this.extraIncludes = getExtraModules(annotation, modules).toList();
 
 		this.basePackages = Suppliers.memoize(() -> {
 
@@ -78,13 +78,13 @@ private ModuleTestExecution(ApplicationModuleTest annotation, ApplicationModules
 
 			Stream<JavaPackage> intermediate = Stream.concat(moduleBasePackages, extraPackages);
 
-			return Stream.concat(intermediate, sharedBasePackages).distinct().collect(Collectors.toList());
+			return Stream.concat(intermediate, sharedBasePackages).distinct().toList();
 		});
 
 		this.dependencies = Suppliers.memoize(() -> {
 
 			Stream<ApplicationModule> bootstrapDependencies = module.getBootstrapDependencies(modules, bootstrapMode.getDepth());
-			return Stream.concat(bootstrapDependencies, extraIncludes.stream()).collect(Collectors.toList());
+			return Stream.concat(bootstrapDependencies, extraIncludes.stream()).toList();
 		});
 
 		if (annotation.verifyAutomatically()) {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import java.util.List;`
`21`	`21`	`import java.util.Optional;`
`22`	`22`	`import java.util.function.Supplier;`
`23`		`-import java.util.stream.Collectors;`
`24`	`23`	`import java.util.stream.Stream;`
`25`	`24`
`26`	`25`	`import org.springframework.modulith.ApplicationModule;`
`@@ -125,7 +124,7 @@ public List<String> getAllowedDependencies() {`
`125`	`124`	`return annotation //`
`126`	`125`	`.map(it -> Arrays.stream(it.allowedDependencies())) //`
`127`	`126`	`.orElse(Stream.empty()) //`
`128`		`- .collect(Collectors.toList());`
	`127`	`+ .toList();`
`129`	`128`	`}`
`130`	`129`	`}`
`131`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private ApplicationModules(ModulithMetadata metadata, Collection<String> package`
`102`	`102`
`103`	`103`	`this.rootPackages = packages.stream() //`
`104`	`104`	`.map(it -> JavaPackage.of(classes, it).toSingle()) //`
`105`		`- .collect(Collectors.toList());`
	`105`	`+ .toList();`
`106`	`106`
`107`	`107`	`this.sharedModules = Collections.emptySet();`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private Classes(List<JavaClass> classes) {`
`77`	`77`	`static Classes of(JavaClasses classes) {`
`78`	`78`
`79`	`79`	`return new Classes(StreamSupport.stream(classes.spliterator(), false) //`
`80`		`- .collect(Collectors.toList()));`
	`80`	`+ .toList());`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private static List<TypeBasedNamedInterface> ofAnnotatedTypes(JavaPackage basePa`
`84`	`84`
`85`	`85`	`return mappings.entrySet().stream() //`
`86`	`86`	`.map(entry -> NamedInterface.of(entry.getKey(), Classes.of(entry.getValue()), basePackage)) //`
`87`		`- .collect(Collectors.toList());`
	`87`	`+ .toList();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`private NamedInterfaces and(NamedInterface namedInterface) {`
Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ private List<SpringBean> getMatchingBeans(ApplicationModule module, Grouping fil`
`822`	`822`	`.filter(it -> !hideInternals \|\| it.isApiBean())`
`823`	`823`	`.filter(it -> !alreadyMapped.contains(it))`
`824`	`824`	`.filter(filter::matches)`
`825`		`- .collect(Collectors.toList());`
	`825`	`+ .toList();`
`826`	`826`	`}`
`827`	`827`
`828`	`828`	`@Value(staticConstructor = "of")`