Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Oliver Drotbohm
2022-11-11 18:38:53 +01:00
parent d96263fe30
commit 55b16857f3
16 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-modulith-test/src/main/java/org/springframework/modulith/test/DefaultPublishedEvents.java
View File

@@ -94,7 +94,7 @@ class DefaultPublishedEvents implements PublishedEvents, ApplicationListener<App
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());
}
/*

2
spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestAutoConfiguration.java
View File

@@ -63,7 +63,7 @@ class ModuleTestAutoConfiguration {
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, ", "));

6
spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTestExecution.java
View File

@@ -68,7 +68,7 @@ public class ModuleTestExecution implements Iterable<ApplicationModule> {
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 @@ public class ModuleTestExecution implements Iterable<ApplicationModule> {
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()) {