From b2425d024a79c524d102ccea7bd0d91a54b6e5db Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Fri, 8 Jul 2022 09:33:08 +0200 Subject: [PATCH] GH-1 - Polishing. Fix import order after package renames. --- .../modulith/model/AnnotationModulithMetadata.java | 2 +- .../modulith/model/ArchitecturallyEvidentType.java | 4 ++-- .../modulith/model/DefaultModulithMetadata.java | 2 +- .../org/springframework/modulith/model/Module.java | 2 +- .../org/springframework/modulith/model/Modules.java | 2 +- .../modulith/model/ModuleDependencyUnitTest.java | 2 +- .../modulith/model/ModulithMetadataUnitTest.java | 2 +- .../org/springframework/modulith/docs/Asciidoctor.java | 2 +- .../modulith/docs/ConfigurationProperties.java | 4 ++-- .../org/springframework/modulith/docs/Documenter.java | 2 +- .../modulith/docs/AsciidoctorUnitTests.java | 2 +- .../events/config/EnablePersistentDomainEvents.java | 2 +- .../events/config/EventPublicationConfiguration.java | 8 ++++---- .../CompletionRegisteringBeanPostProcessor.java | 4 ++-- .../support/PersistentApplicationEventMulticaster.java | 6 +++--- ...CompletionRegisteringBeanPostProcessorUnitTest.java | 2 +- .../JacksonEventSerializationConfiguration.java | 2 +- .../events/jpa/JpaEventPublicationConfiguration.java | 7 +++---- .../events/jpa/JpaEventPublicationRegistry.java | 2 +- ...aEventPublicationConfigurationIntegrationTests.java | 2 +- .../JpaEventPublicationRepositoryIntegrationTests.java | 2 +- .../events/starter/DomainEventsAutoConfiguration.java | 4 ++-- .../events/PersistentDomainEventIntegrationTest.java | 10 +++++----- .../autoconfigure/MomentsAutoConfiguration.java | 6 +++--- .../modulith/moments/support/Moments.java | 2 +- .../modulith/moments/support/MomentsProperties.java | 4 ++-- .../autoconfigure/MomentsAutoConfigurationTests.java | 4 ++-- .../modulith/moments/support/MomentsUnitTests.java | 2 +- .../modulith/observability/DefaultObservedModule.java | 4 ++-- .../modulith/observability/ModuleEventListener.java | 2 +- .../observability/ModuleTracingBeanPostProcessor.java | 2 +- .../modulith/observability/ModuleTracingSupport.java | 2 +- .../SpringDataRestModuleTracingBeanPostProcessor.java | 4 ++-- .../ModuleObservabilityAutoConfiguration.java | 8 ++++---- .../autoconfigure/SpringBootApplicationRuntime.java | 2 +- ...ngDataRestModuleObservabilityAutoConfiguration.java | 4 ++-- .../SpringBootApplicationRuntimeUnitTests.java | 2 +- .../com/acme/myproject/NonVerifyingModuleTest.java | 2 +- .../java/com/acme/myproject/complex/ComplexTest.java | 2 +- .../fieldinjected/FieldInjectedIntegrationTest.java | 4 ++-- .../java/com/acme/myproject/moduleA/ModuleATest.java | 4 ++-- .../java/com/acme/myproject/moduleB/ModuleBTest.java | 4 ++-- .../java/com/acme/myproject/moduleC/ModuleCTest.java | 4 ++-- .../modulith/test/ModuleContextCustomizerFactory.java | 4 ++-- .../org/springframework/modulith/test/ModuleTest.java | 2 +- .../modulith/test/ModuleTestExecution.java | 6 +++--- 46 files changed, 78 insertions(+), 79 deletions(-) diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java index 4c5a4f88..37e1d678 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/AnnotationModulithMetadata.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import org.springframework.modulith.Modulithic; import org.springframework.core.annotation.AnnotatedElementUtils; +import org.springframework.modulith.Modulithic; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java index 66f3ae22..ca995372 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/ArchitecturallyEvidentType.java @@ -35,11 +35,11 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.springframework.data.repository.core.RepositoryMetadata; +import org.springframework.data.repository.core.support.AbstractRepositoryMetadata; import org.springframework.modulith.model.Types.JMoleculesTypes; import org.springframework.modulith.model.Types.SpringDataTypes; import org.springframework.modulith.model.Types.SpringTypes; -import org.springframework.data.repository.core.RepositoryMetadata; -import org.springframework.data.repository.core.support.AbstractRepositoryMetadata; import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.domain.JavaMethod; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java index 3db0be5a..d66de460 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/DefaultModulithMetadata.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; +import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.modulith.Modulith; import org.springframework.modulith.Modulithic; import org.springframework.modulith.model.Types.SpringTypes; -import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.util.Assert; /** diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java index 219a2d2c..78a704cb 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Module.java @@ -39,9 +39,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.springframework.lang.Nullable; import org.springframework.modulith.model.Types.JMoleculesTypes; import org.springframework.modulith.model.Types.SpringTypes; -import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java index 6a529db5..7099e613 100644 --- a/spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java +++ b/spring-modulith-core/src/main/java/org/springframework/modulith/model/Modules.java @@ -31,10 +31,10 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.jmolecules.archunit.JMoleculesDddRules; +import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.modulith.Modulith; import org.springframework.modulith.Modulithic; import org.springframework.modulith.model.Types.JMoleculesTypes; -import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.util.Assert; import com.tngtech.archunit.base.DescribedPredicate; diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java index 9c7c0677..3f109019 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModuleDependencyUnitTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import java.util.stream.Stream; import org.junit.jupiter.api.Test; -import org.springframework.modulith.model.Module.ModuleDependency; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.modulith.model.Module.ModuleDependency; import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.importer.ClassFileImporter; diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java index 38a99961..44071063 100644 --- a/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java +++ b/spring-modulith-core/src/test/java/org/springframework/modulith/model/ModulithMetadataUnitTest.java @@ -20,9 +20,9 @@ import static org.assertj.core.api.Assertions.*; import java.util.stream.Stream; import org.junit.jupiter.api.Test; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.modulith.Modulith; import org.springframework.modulith.Modulithic; -import org.springframework.boot.autoconfigure.SpringBootApplication; /** * Unit tests for {@link ModulithMetadata}. diff --git a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java index aafb37d9..71f91b05 100644 --- a/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java +++ b/spring-modulith-docs/src/main/java/org/springframework/modulith/docs/Asciidoctor.java @@ -24,6 +24,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.springframework.lang.Nullable; import org.springframework.modulith.docs.ConfigurationProperties.ModuleProperty; import org.springframework.modulith.docs.Documenter.CanvasOptions; import org.springframework.modulith.docs.Documenter.CanvasOptions.Groupings; @@ -34,7 +35,6 @@ import org.springframework.modulith.model.Module; import org.springframework.modulith.model.Modules; import org.springframework.modulith.model.Source; import org.springframework.modulith.model.SpringBean; -import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; 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 93f12a74..b2e2cd81 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 @@ -26,11 +26,11 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.springframework.modulith.docs.ConfigurationProperties.ConfigurationProperty; -import org.springframework.modulith.model.Module; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.lang.Nullable; +import org.springframework.modulith.docs.ConfigurationProperties.ConfigurationProperty; +import org.springframework.modulith.model.Module; import org.springframework.util.Assert; import org.springframework.util.StringUtils; 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 608ed4bb..e462b768 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 @@ -42,12 +42,12 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.springframework.lang.Nullable; import org.springframework.modulith.model.Module; import org.springframework.modulith.model.Module.DependencyDepth; import org.springframework.modulith.model.Module.DependencyType; import org.springframework.modulith.model.Modules; import org.springframework.modulith.model.SpringBean; -import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java index 4122db47..34fbfb22 100644 --- a/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java +++ b/spring-modulith-docs/src/test/java/org/springframework/modulith/docs/AsciidoctorUnitTests.java @@ -18,8 +18,8 @@ package org.springframework.modulith.docs; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.springframework.modulith.model.Modules; import org.springframework.context.ApplicationContext; +import org.springframework.modulith.model.Modules; import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.importer.ClassFileImporter; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java index 587b7e4b..25fbf5bb 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EnablePersistentDomainEvents.java @@ -28,12 +28,12 @@ import java.lang.annotation.Target; import java.util.ArrayList; import java.util.List; -import org.springframework.modulith.events.config.EnablePersistentDomainEvents.PersistentDomainEventsImportSelector; import org.springframework.context.ResourceLoaderAware; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportSelector; import org.springframework.core.io.ResourceLoader; import org.springframework.core.type.AnnotationMetadata; +import org.springframework.modulith.events.config.EnablePersistentDomainEvents.PersistentDomainEventsImportSelector; /** * @author Oliver Gierke diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java index 2a0acc10..7b260e43 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java @@ -15,14 +15,14 @@ */ package org.springframework.modulith.events.config; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.support.CompletionRegisteringBeanPostProcessor; -import org.springframework.modulith.events.support.MapEventPublicationRegistry; -import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster; import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.support.CompletionRegisteringBeanPostProcessor; +import org.springframework.modulith.events.support.MapEventPublicationRegistry; +import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster; /** * @author Oliver Drotbohm diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessor.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessor.java index 381d353e..c7da3e41 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessor.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessor.java @@ -28,8 +28,6 @@ import java.util.function.Supplier; import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.AopProxyUtils; import org.springframework.aop.framework.ProxyFactory; @@ -37,6 +35,8 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotatedElementUtils; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalApplicationListenerMethodAdapter; import org.springframework.transaction.event.TransactionalEventListener; 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 4824ae1c..4b18260d 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 @@ -26,9 +26,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; @@ -37,6 +34,9 @@ import org.springframework.context.event.AbstractApplicationEventMulticaster; import org.springframework.context.event.ApplicationEventMulticaster; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotationAwareOrderComparator; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.PublicationTargetIdentifier; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalApplicationListener; import org.springframework.transaction.event.TransactionalEventListener; diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java index 581f53f5..29503508 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringBeanPostProcessorUnitTest.java @@ -22,10 +22,10 @@ import static org.mockito.Mockito.*; import java.util.function.BiConsumer; import org.junit.jupiter.api.Test; -import org.springframework.modulith.events.EventPublicationRegistry; import org.springframework.aop.framework.Advised; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.event.EventListener; +import org.springframework.modulith.events.EventPublicationRegistry; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; diff --git a/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializationConfiguration.java b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializationConfiguration.java index 032091b4..8b329809 100644 --- a/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializationConfiguration.java @@ -17,10 +17,10 @@ package org.springframework.modulith.events.jackson; import lombok.RequiredArgsConstructor; -import org.springframework.modulith.events.config.EventSerializationConfigurationExtension; import org.springframework.beans.factory.ObjectProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.modulith.events.config.EventSerializationConfigurationExtension; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java index 59affa96..ae1c6227 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfiguration.java @@ -15,14 +15,13 @@ */ package org.springframework.modulith.events.jpa; +import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; -import jakarta.persistence.EntityManager; - -import org.springframework.modulith.events.EventSerializer; -import org.springframework.modulith.events.config.EventPublicationConfigurationExtension; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.config.EventPublicationConfigurationExtension; /** * @author Oliver Gierke diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java index 82c01e3d..cb504996 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRegistry.java @@ -25,12 +25,12 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.springframework.beans.factory.DisposableBean; import org.springframework.modulith.events.CompletableEventPublication; import org.springframework.modulith.events.EventPublication; import org.springframework.modulith.events.EventPublicationRegistry; import org.springframework.modulith.events.EventSerializer; import org.springframework.modulith.events.PublicationTargetIdentifier; -import org.springframework.beans.factory.DisposableBean; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java index 5be78a68..d0f72c78 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationConfigurationIntegrationTests.java @@ -25,11 +25,11 @@ import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.modulith.events.EventSerializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.modulith.events.EventSerializer; import org.springframework.test.context.TestConstructor; import org.springframework.test.context.TestConstructor.AutowireMode; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java index 870d5a58..3beb69aa 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepositoryIntegrationTests.java @@ -28,13 +28,13 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.modulith.events.EventSerializer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import org.springframework.modulith.events.EventSerializer; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.SharedEntityManagerCreator; diff --git a/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/DomainEventsAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/DomainEventsAutoConfiguration.java index eede6754..f5446a22 100644 --- a/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/DomainEventsAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-starter/src/main/java/org/springframework/modulith/events/starter/DomainEventsAutoConfiguration.java @@ -15,8 +15,6 @@ */ package org.springframework.modulith.events.starter; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.config.EnablePersistentDomainEvents; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -25,6 +23,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.type.AnnotationMetadata; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.config.EnablePersistentDomainEvents; /** * Enables auto-configuration for the events package. diff --git a/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java b/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java index 0f133b0b..313d7f36 100644 --- a/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java +++ b/spring-modulith-events/spring-modulith-events-tests/src/test/java/example/events/PersistentDomainEventIntegrationTest.java @@ -21,16 +21,16 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.PublicationTargetIdentifier; -import org.springframework.modulith.events.config.EnablePersistentDomainEvents; -import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.EventListener; +import org.springframework.modulith.events.EventPublication; +import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.config.EnablePersistentDomainEvents; +import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfiguration.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfiguration.java index 08e37c81..9b155c3f 100644 --- a/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfiguration.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfiguration.java @@ -17,15 +17,15 @@ package org.springframework.modulith.moments.autoconfigure; import java.time.Clock; -import org.springframework.modulith.moments.support.Moments; -import org.springframework.modulith.moments.support.MomentsProperties; -import org.springframework.modulith.moments.support.TimeMachine; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.modulith.moments.support.Moments; +import org.springframework.modulith.moments.support.MomentsProperties; +import org.springframework.modulith.moments.support.TimeMachine; import org.springframework.scheduling.annotation.EnableScheduling; /** diff --git a/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/Moments.java b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/Moments.java index a3a89a85..0a22b98d 100644 --- a/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/Moments.java +++ b/spring-modulith-moments/src/main/java/org/springframework/modulith/moments/support/Moments.java @@ -30,6 +30,7 @@ import java.time.YearMonth; import java.time.temporal.ChronoUnit; import java.time.temporal.WeekFields; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.modulith.moments.DayHasPassed; import org.springframework.modulith.moments.HourHasPassed; import org.springframework.modulith.moments.MonthHasPassed; @@ -37,7 +38,6 @@ import org.springframework.modulith.moments.QuarterHasPassed; import org.springframework.modulith.moments.ShiftedQuarter; import org.springframework.modulith.moments.WeekHasPassed; import org.springframework.modulith.moments.YearHasPassed; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.scheduling.annotation.Scheduled; /** 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 e5d84e5b..a1ec715e 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 @@ -29,12 +29,12 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -import org.springframework.modulith.moments.Quarter; -import org.springframework.modulith.moments.ShiftedQuarter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.boot.context.properties.bind.DefaultValue; import org.springframework.lang.Nullable; +import org.springframework.modulith.moments.Quarter; +import org.springframework.modulith.moments.ShiftedQuarter; import org.springframework.util.Assert; /** diff --git a/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfigurationTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfigurationTests.java index eeffd56c..b212715c 100644 --- a/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfigurationTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/autoconfigure/MomentsAutoConfigurationTests.java @@ -21,12 +21,12 @@ import java.time.LocalDate; import java.time.ZoneId; import org.junit.jupiter.api.Test; +import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.modulith.moments.Quarter; import org.springframework.modulith.moments.support.Moments; import org.springframework.modulith.moments.support.MomentsProperties; import org.springframework.modulith.moments.support.TimeMachine; -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; /** * Integration tests for {@link MomentsAutoConfiguration}. diff --git a/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/support/MomentsUnitTests.java b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/support/MomentsUnitTests.java index 5d51bc83..c75da9dd 100644 --- a/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/support/MomentsUnitTests.java +++ b/spring-modulith-moments/src/test/java/org/springframework/modulith/moments/support/MomentsUnitTests.java @@ -29,6 +29,7 @@ import java.time.temporal.WeekFields; import java.util.Locale; import org.junit.jupiter.api.Test; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.modulith.moments.DayHasPassed; import org.springframework.modulith.moments.HourHasPassed; import org.springframework.modulith.moments.MonthHasPassed; @@ -37,7 +38,6 @@ import org.springframework.modulith.moments.ShiftedQuarter; import org.springframework.modulith.moments.WeekHasPassed; import org.springframework.modulith.moments.YearHasPassed; import org.springframework.modulith.moments.support.MomentsProperties.Granularity; -import org.springframework.context.ApplicationEventPublisher; /** * Unit tests for {@link Moments}. diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java index d938e454..2df37314 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/DefaultObservedModule.java @@ -21,12 +21,12 @@ import java.lang.reflect.Method; import java.util.Arrays; import org.aopalliance.intercept.MethodInvocation; +import org.springframework.aop.ProxyMethodInvocation; +import org.springframework.aop.framework.Advised; import org.springframework.modulith.model.FormatableJavaClass; import org.springframework.modulith.model.Module; import org.springframework.modulith.model.Modules; import org.springframework.modulith.model.SpringBean; -import org.springframework.aop.ProxyMethodInvocation; -import org.springframework.aop.framework.Advised; import com.tngtech.archunit.core.domain.JavaClass; diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java index c3cec4dc..87bc6fba 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEventListener.java @@ -19,12 +19,12 @@ import lombok.RequiredArgsConstructor; import java.util.function.Supplier; -import org.springframework.modulith.model.Module; import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.Tracer; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.PayloadApplicationEvent; +import org.springframework.modulith.model.Module; /** * @author Oliver Drotbohm diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java index 8f504f8d..0636ab86 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessor.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Map; import org.aopalliance.aop.Advice; -import org.springframework.modulith.model.Modules; import org.springframework.aop.Advisor; import org.springframework.aop.MethodMatcher; import org.springframework.aop.Pointcut; @@ -32,6 +31,7 @@ import org.springframework.aop.support.StaticMethodMatcher; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.cloud.sleuth.Tracer; +import org.springframework.modulith.model.Modules; /** * @author Oliver Drotbohm diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java index c239a505..9faf1004 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleTracingSupport.java @@ -18,11 +18,11 @@ package org.springframework.modulith.observability; import java.util.function.Consumer; import java.util.function.Supplier; -import org.springframework.modulith.model.Modules; import org.springframework.aop.Advisor; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.BeanClassLoaderAware; +import org.springframework.modulith.model.Modules; import org.springframework.util.Assert; /** diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java index 5b393905..d7ea8a73 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/SpringDataRestModuleTracingBeanPostProcessor.java @@ -20,8 +20,6 @@ import lombok.RequiredArgsConstructor; import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.springframework.modulith.model.Module; -import org.springframework.modulith.model.Modules; import org.springframework.aop.Advisor; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.beans.BeansException; @@ -30,6 +28,8 @@ import org.springframework.cloud.sleuth.Tracer; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.data.rest.webmvc.BasePathAwareController; import org.springframework.data.rest.webmvc.RootResourceInformation; +import org.springframework.modulith.model.Module; +import org.springframework.modulith.model.Modules; /** * @author Oliver Drotbohm diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java index 8eef4cd8..d18060e5 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java @@ -23,16 +23,16 @@ import brave.handler.MutableSpan; import brave.handler.SpanHandler; import brave.propagation.TraceContext; -import org.springframework.modulith.observability.ApplicationRuntime; -import org.springframework.modulith.observability.ModuleEventListener; -import org.springframework.modulith.observability.ModuleTracingBeanPostProcessor; -import org.springframework.modulith.observability.ModulesRuntime; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.sleuth.Tracer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.modulith.observability.ApplicationRuntime; +import org.springframework.modulith.observability.ModuleEventListener; +import org.springframework.modulith.observability.ModuleTracingBeanPostProcessor; +import org.springframework.modulith.observability.ModulesRuntime; /** * @author Oliver Drotbohm diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntime.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntime.java index 4c5d50a1..4294ddb6 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntime.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntime.java @@ -20,10 +20,10 @@ import lombok.RequiredArgsConstructor; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.modulith.observability.ApplicationRuntime; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationContext; +import org.springframework.modulith.observability.ApplicationRuntime; import org.springframework.util.ClassUtils; /** diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java index f93c5dda..67e8fbdd 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/SpringDataRestModuleObservabilityAutoConfiguration.java @@ -15,13 +15,13 @@ */ package org.springframework.modulith.observability.autoconfigure; -import org.springframework.modulith.observability.ApplicationRuntime; -import org.springframework.modulith.observability.SpringDataRestModuleTracingBeanPostProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.sleuth.Tracer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.rest.webmvc.RepositoryController; +import org.springframework.modulith.observability.ApplicationRuntime; +import org.springframework.modulith.observability.SpringDataRestModuleTracingBeanPostProcessor; /** * @author Oliver Drotbohm diff --git a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java index a9d3cfe7..3dcfcac4 100644 --- a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java +++ b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/autoconfigure/SpringBootApplicationRuntimeUnitTests.java @@ -21,9 +21,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.modulith.observability.ApplicationRuntime; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.ApplicationContext; +import org.springframework.modulith.observability.ApplicationRuntime; /** * Unit tests for {@link SpringBootApplicationRuntime}. diff --git a/spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java index 9ee19256..11c46130 100644 --- a/spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/NonVerifyingModuleTest.java @@ -20,9 +20,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.core.annotation.AliasFor; import org.springframework.modulith.test.ModuleTest; import org.springframework.modulith.test.ModuleTest.BootstrapMode; -import org.springframework.core.annotation.AliasFor; /** * @author Oliver Gierke diff --git a/spring-modulith-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java index a1830c4e..c689eb62 100644 --- a/spring-modulith-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/complex/ComplexTest.java @@ -18,10 +18,10 @@ package com.acme.myproject.complex; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.modulith.model.NamedInterface; import org.springframework.modulith.model.NamedInterfaces; import org.springframework.modulith.test.ModuleTestExecution; -import org.springframework.beans.factory.annotation.Autowired; import com.acme.myproject.NonVerifyingModuleTest; diff --git a/spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java index de0c6f78..c2d17a09 100644 --- a/spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/fieldinjected/FieldInjectedIntegrationTest.java @@ -18,10 +18,10 @@ package com.acme.myproject.fieldinjected; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.springframework.modulith.model.Modules; -import org.springframework.modulith.test.ModuleTestExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.modulith.model.Modules; +import org.springframework.modulith.test.ModuleTestExecution; import com.acme.myproject.NonVerifyingModuleTest; import com.acme.myproject.moduleA.ServiceComponentA; diff --git a/spring-modulith-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java index c4c04033..7d3d3faf 100644 --- a/spring-modulith-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleA/ModuleATest.java @@ -18,11 +18,11 @@ package com.acme.myproject.moduleA; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.springframework.modulith.test.PublishedEvents; -import org.springframework.modulith.test.PublishedEvents.TypedPublishedEvents; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; +import org.springframework.modulith.test.PublishedEvents; +import org.springframework.modulith.test.PublishedEvents.TypedPublishedEvents; import com.acme.myproject.NonVerifyingModuleTest; import com.acme.myproject.moduleB.ServiceComponentB; diff --git a/spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java index 7b5fe481..9e32883b 100644 --- a/spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java @@ -20,12 +20,12 @@ import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.internal.creation.bytebuddy.MockAccess; -import org.springframework.modulith.test.ModuleTest.BootstrapMode; -import org.springframework.modulith.test.TestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.ApplicationContext; +import org.springframework.modulith.test.ModuleTest.BootstrapMode; +import org.springframework.modulith.test.TestUtils; import com.acme.myproject.NonVerifyingModuleTest; import com.acme.myproject.moduleA.ServiceComponentA; diff --git a/spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java index 943c26cc..53f51e5a 100644 --- a/spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java +++ b/spring-modulith-sample/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java @@ -19,10 +19,10 @@ import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.springframework.modulith.test.ModuleTest.BootstrapMode; -import org.springframework.modulith.test.TestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.modulith.test.ModuleTest.BootstrapMode; +import org.springframework.modulith.test.TestUtils; import com.acme.myproject.NonVerifyingModuleTest; import com.acme.myproject.moduleA.ServiceComponentA; diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java index 217bf45d..d8a21cf9 100644 --- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java @@ -25,11 +25,11 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Stream; -import org.springframework.modulith.model.Module; -import org.springframework.modulith.model.Modules; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.annotation.AnnotatedElementUtils; +import org.springframework.modulith.model.Module; +import org.springframework.modulith.model.Modules; import org.springframework.test.context.ContextConfigurationAttributes; import org.springframework.test.context.ContextCustomizer; import org.springframework.test.context.ContextCustomizerFactory; diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTest.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTest.java index ee2bc8fc..775128a6 100644 --- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTest.java +++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleTest.java @@ -24,11 +24,11 @@ import java.lang.annotation.RetentionPolicy; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.modulith.model.Module.DependencyDepth; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; import org.springframework.boot.test.context.SpringBootTestContextBootstrapper; import org.springframework.core.annotation.AliasFor; +import org.springframework.modulith.model.Module.DependencyDepth; import org.springframework.test.context.BootstrapWith; import org.springframework.test.context.TestConstructor; import org.springframework.test.context.TestConstructor.AutowireMode; 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 9ebe9e12..6493135f 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 @@ -30,13 +30,13 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.AnnotatedClassFinder; +import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.modulith.model.JavaPackage; import org.springframework.modulith.model.Module; import org.springframework.modulith.model.Modules; import org.springframework.modulith.test.ModuleTest.BootstrapMode; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.context.AnnotatedClassFinder; -import org.springframework.core.annotation.AnnotatedElementUtils; import com.tngtech.archunit.thirdparty.com.google.common.base.Supplier; import com.tngtech.archunit.thirdparty.com.google.common.base.Suppliers;