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 index 3395b47f..fdb7ac18 100644 --- 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.Collections; 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 @@ interface ApplicationModuleInformation { 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 index f89ec3d7..82d5a75b 100644 --- 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 @@ public class ApplicationModules implements Iterable { 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 index 32c50bbe..8bb31a1f 100644 --- 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 @@ class Classes implements DescribedIterable { 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 index 1dad67ff..db37e870 100644 --- 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 @@ package org.springframework.modulith.model; 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 class EventType { this.type = type; - Stream> 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> 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()); + . 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 index 494e5395..d39b9a56 100644 --- 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 lombok.RequiredArgsConstructor; 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 abstract class NamedInterface implements Iterable { 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 index 74c5b44d..39b3706c 100644 --- 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 @@ public class NamedInterfaces implements Iterable { 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 index 9c71f182..9e321978 100644 --- 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.Getter; import lombok.RequiredArgsConstructor; import java.util.List; -import java.util.stream.Collectors; import com.tngtech.archunit.core.domain.JavaClass; @@ -65,7 +64,7 @@ public class SpringBean { 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 index d3f790a6..46f151b2 100644 --- 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 { this.properties = Arrays.stream(resources) .flatMap(ConfigurationProperties::parseProperties) - .collect(Collectors.toList()); + .toList(); } catch (IOException e) { throw new RuntimeException(e); @@ -81,7 +81,7 @@ class ConfigurationProperties implements Iterable { 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 index 3698cc82..933c0812 100644 --- 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 @@ public class Documenter { .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 index 07e7e5a0..2c9c7295 100644 --- 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.Collection; 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 class PersistentApplicationEventMulticaster extends AbstractApplicationEv .filter(TransactionalApplicationListener.class::isInstance) .map(TransactionalApplicationListener.class::cast) .sorted(AnnotationAwareOrderComparator.INSTANCE) - .collect(Collectors.toList()); + .toList(); } private TransactionalEventListeners( @@ -185,7 +184,7 @@ public class PersistentApplicationEventMulticaster extends AbstractApplicationEv List> 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 index 4ec2e55e..731b93ea 100644 --- 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 lombok.RequiredArgsConstructor; 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 @@ class MongoDbEventPublicationRepository implements EventPublicationRepository { var query = query(where("completionDate").isNull()); return mongoTemplate.find(query, MongoDbEventPublication.class).stream() // - .map(this::documentToDomain) // - .collect(Collectors.toList()); + . map(this::documentToDomain) // + .toList(); } @Override public Optional 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 @@ class MongoDbEventPublicationRepository implements EventPublicationRepository { 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 index c2990261..d100d0cb 100644 --- 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 @@ class ModulesIntegrationTest { 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 index 455e31a5..00f71fcd 100644 --- 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 class MomentsProperties { 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 index 6981df07..d8989804 100644 --- 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 @@ class DefaultPublishedEvents implements PublishedEvents, ApplicationListener events; private static SimpleTypedPublishedEvents of(Stream 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 index 7a0b8680..5bf5d2c4 100644 --- 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 @@ class ModuleTestAutoConfiguration { public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { ModuleTestExecution execution = ((BeanFactory) registry).getBean(ModuleTestExecution.class); - List basePackages = execution.getBasePackages().collect(Collectors.toList()); + List 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 index eda1527f..c003f876 100644 --- 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 @@ public class ModuleTestExecution implements Iterable { 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 { Stream 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 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()) {