From 31efdb31a291bf95e0a0c227e4a85abb8a6ace1c Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Wed, 9 Aug 2023 22:02:25 +0200 Subject: [PATCH] GH-259 - Rename modulith.events package to modulith.events.core. Allows us to eventually use the former as user-facing API package in a to-be-introduced API JAR. --- .../events/config/EventPublicationConfiguration.java | 6 +++--- .../modulith/events/{ => core}/Completable.java | 2 +- .../events/{ => core}/DefaultEventPublication.java | 2 +- .../{ => core}/DefaultEventPublicationRegistry.java | 2 +- .../modulith/events/{ => core}/EventPublication.java | 2 +- .../events/{ => core}/EventPublicationRegistry.java | 2 +- .../events/{ => core}/EventPublicationRepository.java | 2 +- .../modulith/events/{ => core}/EventSerializer.java | 2 +- .../events/{ => core}/PublicationTargetIdentifier.java | 2 +- .../modulith/events/{ => core}/package-info.java | 2 +- .../events/support/CompletionRegisteringAdvisor.java | 4 ++-- .../support/PersistentApplicationEventMulticaster.java | 6 +++--- .../EventPublicationConfigurationIntegrationTests.java | 4 ++-- .../DefaultEventPublicationRegistryUnitTests.java | 2 +- .../events/{ => core}/EventPublicationUnitTests.java | 2 +- .../CompletionRegisteringAdvisorIntegrationTests.java | 2 +- .../support/CompletionRegisteringAdvisorUnitTests.java | 2 +- ...istentApplicationEventMulticasterIntegrationTests.java | 4 ++-- .../PersistentApplicationEventMulticasterUnitTests.java | 2 +- .../jackson/JacksonEventSerializationConfiguration.java | 2 +- .../modulith/events/jackson/JacksonEventSerializer.java | 2 +- .../modulith/events/jackson/package-info.java | 2 +- .../jdbc/JdbcEventPublicationAutoConfiguration.java | 2 +- .../events/jdbc/JdbcEventPublicationRepository.java | 8 ++++---- .../modulith/events/jdbc/package-info.java | 2 +- .../jdbc/DatabaseSchemaInitializerIntegrationTests.java | 2 +- ...EventPublicationAutoConfigurationIntegrationTests.java | 4 ++-- .../JdbcEventPublicationRepositoryIntegrationTests.java | 6 +++--- .../events/jpa/JpaEventPublicationConfiguration.java | 2 +- .../events/jpa/JpaEventPublicationRepository.java | 8 ++++---- .../springframework/modulith/events/jpa/package-info.java | 2 +- ...EventPublicationAutoConfigurationIntegrationTests.java | 2 +- .../JpaEventPublicationConfigurationIntegrationTests.java | 4 ++-- .../JpaEventPublicationRepositoryIntegrationTests.java | 6 +++--- .../events/mongodb/MongoDbEventPublicationRepository.java | 6 +++--- .../mongodb/MongoDbTransactionAutoConfiguration.java | 2 +- .../modulith/events/mongodb/package-info.java | 2 +- ...EventPublicationAutoConfigurationIntegrationTests.java | 2 +- .../mongodb/MongoDbEventPublicationRepositoryTest.java | 4 ++-- .../events/PersistentDomainEventIntegrationTest.java | 6 +++--- .../test/java/example/ApplicationIntegrationTests.java | 2 +- .../test/java/example/ApplicationIntegrationTests.java | 2 +- .../java/example/order/EventPublicationRegistryTests.java | 2 +- 43 files changed, 67 insertions(+), 67 deletions(-) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/Completable.java (95%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/DefaultEventPublication.java (98%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/DefaultEventPublicationRegistry.java (98%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/EventPublication.java (98%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/EventPublicationRegistry.java (97%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/EventPublicationRepository.java (98%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/EventSerializer.java (95%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/PublicationTargetIdentifier.java (97%) rename spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/{ => core}/package-info.java (64%) rename spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/{ => core}/DefaultEventPublicationRegistryUnitTests.java (97%) rename spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/{ => core}/EventPublicationUnitTests.java (96%) 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 80bea6a2..9d11d674 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 @@ -35,10 +35,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Role; import org.springframework.core.env.Environment; -import org.springframework.modulith.events.DefaultEventPublicationRegistry; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.EventPublicationRepository; import org.springframework.modulith.events.config.EventPublicationConfiguration.AsyncEnablingConfiguration; +import org.springframework.modulith.events.core.DefaultEventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRepository; import org.springframework.modulith.events.support.CompletionRegisteringAdvisor; import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster; import org.springframework.scheduling.annotation.AbstractAsyncConfiguration; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/Completable.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/Completable.java similarity index 95% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/Completable.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/Completable.java index b63375fd..a8abe778 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/Completable.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/Completable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import java.time.Instant; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublication.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/DefaultEventPublication.java similarity index 98% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublication.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/DefaultEventPublication.java index f907afd5..668f4c18 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublication.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/DefaultEventPublication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import java.time.Instant; import java.util.Objects; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublicationRegistry.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/DefaultEventPublicationRegistry.java similarity index 98% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublicationRegistry.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/DefaultEventPublicationRegistry.java index 2a9cd506..12b9c65b 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/DefaultEventPublicationRegistry.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/DefaultEventPublicationRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import java.time.Clock; import java.time.Duration; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublication.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublication.java similarity index 98% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublication.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublication.java index 94f6f9dc..1db13ed9 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublication.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import java.time.Clock; import java.time.Instant; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRegistry.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublicationRegistry.java similarity index 97% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRegistry.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublicationRegistry.java index 86493c26..cd48b5f7 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRegistry.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublicationRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import java.time.Duration; import java.util.Collection; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRepository.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublicationRepository.java similarity index 98% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRepository.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublicationRepository.java index 3209f2f5..6abda3e2 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventPublicationRepository.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventPublicationRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import java.time.Instant; import java.util.List; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventSerializer.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventSerializer.java similarity index 95% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventSerializer.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventSerializer.java index fe84ac41..6ec3c7d3 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/EventSerializer.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/EventSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; /** * @author Oliver Drotbohm diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/PublicationTargetIdentifier.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/PublicationTargetIdentifier.java similarity index 97% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/PublicationTargetIdentifier.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/PublicationTargetIdentifier.java index 75dbc3d2..44bafaf3 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/PublicationTargetIdentifier.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/PublicationTargetIdentifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import java.util.Objects; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/package-info.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/package-info.java similarity index 64% rename from spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/package-info.java rename to spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/package-info.java index 23e944a8..a50857e9 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/package-info.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/core/package-info.java @@ -2,4 +2,4 @@ * The event publication registry abstraction. */ @org.springframework.lang.NonNullApi -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisor.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisor.java index df7577b7..aaa669b1 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisor.java +++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisor.java @@ -32,8 +32,8 @@ import org.springframework.aop.support.annotation.AnnotationMatchingPointcut; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.lang.NonNull; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublicationRegistry; +import org.springframework.modulith.events.core.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 0292ccf2..beedebd1 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 @@ -33,9 +33,9 @@ import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.core.env.Environment; import org.springframework.lang.NonNull; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.EventPublicationRegistry; +import org.springframework.modulith.events.core.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/config/EventPublicationConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/config/EventPublicationConfigurationIntegrationTests.java index 336ea38f..efc1f6d2 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/config/EventPublicationConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/config/EventPublicationConfigurationIntegrationTests.java @@ -35,9 +35,9 @@ import org.springframework.boot.test.context.assertj.AssertableApplicationContex import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.context.annotation.AdviceMode; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.EventPublicationRepository; import org.springframework.modulith.events.config.EventPublicationConfiguration.AsyncPropertiesDefaulter; +import org.springframework.modulith.events.core.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRepository; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.ProxyAsyncConfiguration; import org.springframework.scheduling.aspectj.AspectJAsyncConfiguration; diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/DefaultEventPublicationRegistryUnitTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/core/DefaultEventPublicationRegistryUnitTests.java similarity index 97% rename from spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/DefaultEventPublicationRegistryUnitTests.java rename to spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/core/DefaultEventPublicationRegistryUnitTests.java index 395794bf..c886352b 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/DefaultEventPublicationRegistryUnitTests.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/core/DefaultEventPublicationRegistryUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import static org.assertj.core.api.Assertions.*; import static org.mockito.AdditionalAnswers.*; diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/EventPublicationUnitTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/core/EventPublicationUnitTests.java similarity index 96% rename from spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/EventPublicationUnitTests.java rename to spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/core/EventPublicationUnitTests.java index 00346875..7c54aa7e 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/EventPublicationUnitTests.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/core/EventPublicationUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.modulith.events; +package org.springframework.modulith.events.core; import static org.assertj.core.api.Assertions.*; diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorIntegrationTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorIntegrationTests.java index 7c1674fb..e839447b 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorIntegrationTests.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Role; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; import org.springframework.modulith.events.support.CompletionRegisteringAdvisor.CompletionRegisteringMethodInterceptor; import org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor; import org.springframework.scheduling.annotation.Async; diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorUnitTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorUnitTests.java index 2fb930f4..9197638a 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorUnitTests.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/CompletionRegisteringAdvisorUnitTests.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.event.EventListener; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterIntegrationTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterIntegrationTests.java index 48a76b89..fb6fb72f 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterIntegrationTests.java @@ -25,9 +25,9 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventPublicationRepository; import org.springframework.modulith.events.config.EnablePersistentDomainEvents; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.EventPublicationRepository; import org.springframework.stereotype.Component; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterUnitTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterUnitTests.java index 73905f78..9448c008 100644 --- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterUnitTests.java +++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/support/PersistentApplicationEventMulticasterUnitTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.StandardEnvironment; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; /** * Unit tests for {@link PersistentApplicationEventMulticaster}. 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 966fcb7e..4f9c1052 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 @@ -19,8 +19,8 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.modulith.events.EventSerializer; import org.springframework.modulith.events.config.EventSerializationConfigurationExtension; +import org.springframework.modulith.events.core.EventSerializer; import org.springframework.util.Assert; import com.fasterxml.jackson.databind.Module; diff --git a/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializer.java b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializer.java index dc08b37d..74dc7a46 100644 --- a/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializer.java +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/JacksonEventSerializer.java @@ -18,7 +18,7 @@ package org.springframework.modulith.events.jackson; import java.io.IOException; import java.util.function.Supplier; -import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.core.EventSerializer; import org.springframework.util.Assert; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/package-info.java b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/package-info.java index b679183f..e2040964 100644 --- a/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/package-info.java +++ b/spring-modulith-events/spring-modulith-events-jackson/src/main/java/org/springframework/modulith/events/jackson/package-info.java @@ -1,5 +1,5 @@ /** - * A Jackson based implementation of the {@link org.springframework.modulith.events.EventSerializer}. + * A Jackson based implementation of the {@link org.springframework.modulith.events.core.EventSerializer}. */ @org.springframework.lang.NonNullApi package org.springframework.modulith.events.jackson; diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java index 03869937..32b4b147 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfiguration.java @@ -23,8 +23,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ResourceLoader; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.modulith.events.EventSerializer; import org.springframework.modulith.events.config.EventPublicationConfigurationExtension; +import org.springframework.modulith.events.core.EventSerializer; /** * @author Dmitry Belyaev diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepository.java b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepository.java index c4d39844..82eea303 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepository.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepository.java @@ -31,10 +31,10 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.ResultSetExtractor; import org.springframework.jdbc.core.RowMapper; import org.springframework.lang.Nullable; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventPublicationRepository; -import org.springframework.modulith.events.EventSerializer; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.EventPublicationRepository; +import org.springframework.modulith.events.core.EventSerializer; +import org.springframework.modulith.events.core.PublicationTargetIdentifier; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/package-info.java b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/package-info.java index eb7f04a5..7250810c 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/package-info.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/package-info.java @@ -1,5 +1,5 @@ /** - * JDBC integration for {@link org.springframework.modulith.events.EventPublicationRepository}. + * JDBC integration for {@link org.springframework.modulith.events.core.EventPublicationRepository}. */ @org.springframework.lang.NonNullApi package org.springframework.modulith.events.jdbc; diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java index 5dbfff3f..06bf1bb5 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/DatabaseSchemaInitializerIntegrationTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.core.EventSerializer; import org.springframework.modulith.testapp.TestApplication; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java index 4bc9b698..6d84ff64 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationAutoConfigurationIntegrationTests.java @@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.ApplicationContext; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.core.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventSerializer; import org.springframework.modulith.testapp.TestApplication; /** diff --git a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryIntegrationTests.java index 015bd2f6..13d37738 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryIntegrationTests.java @@ -35,9 +35,9 @@ import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventSerializer; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.EventSerializer; +import org.springframework.modulith.events.core.PublicationTargetIdentifier; import org.springframework.modulith.testapp.TestApplication; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; 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 ee09ecb9..037cba52 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 @@ -19,8 +19,8 @@ import jakarta.persistence.EntityManager; 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; +import org.springframework.modulith.events.core.EventSerializer; /** * @author Oliver Drotbohm diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java index 352a0733..dab67b24 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/JpaEventPublicationRepository.java @@ -23,10 +23,10 @@ import java.util.Objects; import java.util.Optional; import java.util.UUID; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventPublicationRepository; -import org.springframework.modulith.events.EventSerializer; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.EventPublicationRepository; +import org.springframework.modulith.events.core.EventSerializer; +import org.springframework.modulith.events.core.PublicationTargetIdentifier; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/package-info.java b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/package-info.java index c09ece90..07e40cae 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/package-info.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/main/java/org/springframework/modulith/events/jpa/package-info.java @@ -1,5 +1,5 @@ /** - * JPA integration for {@link org.springframework.modulith.events.EventPublicationRepository}. + * JPA integration for {@link org.springframework.modulith.events.core.EventPublicationRepository}. */ @org.springframework.lang.NonNullApi package org.springframework.modulith.events.jpa; diff --git a/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfigurationIntegrationTests.java index de9423f8..32c4dfd3 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-jpa/src/test/java/org/springframework/modulith/events/jpa/JpaEventPublicationAutoConfigurationIntegrationTests.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.core.EventSerializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestConstructor; import org.springframework.test.context.TestConstructor.AutowireMode; 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 e8d2dc41..26475a66 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 @@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.ApplicationContext; -import org.springframework.modulith.events.EventPublicationRegistry; -import org.springframework.modulith.events.EventSerializer; +import org.springframework.modulith.events.core.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventSerializer; import org.springframework.test.context.TestConstructor; import org.springframework.test.context.TestConstructor.AutowireMode; 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 6c830b85..e9b37742 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 @@ -40,9 +40,9 @@ 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.EventPublication; -import org.springframework.modulith.events.EventSerializer; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.EventSerializer; +import org.springframework.modulith.events.core.PublicationTargetIdentifier; 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-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 322f97fe..99361b3e 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 @@ -29,9 +29,9 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Update; import org.springframework.data.util.TypeInformation; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.EventPublicationRepository; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.EventPublicationRepository; +import org.springframework.modulith.events.core.PublicationTargetIdentifier; import org.springframework.util.Assert; /** diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java b/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java index 6f9a40c9..1e875fac 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbTransactionAutoConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfigu import org.springframework.context.annotation.Bean; import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.MongoTransactionManager; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.support.TransactionTemplate; diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/package-info.java b/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/package-info.java index 4423ea27..7cf4668c 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/package-info.java +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/package-info.java @@ -1,5 +1,5 @@ /** - * MongoDB integration for {@link org.springframework.modulith.events.EventPublicationRepository}. + * MongoDB integration for {@link org.springframework.modulith.events.core.EventPublicationRepository}. */ @org.springframework.lang.NonNullApi package org.springframework.modulith.events.mongodb; diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java index 7bdfb745..154d5a93 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.data.mongodb.MongoTransactionManager; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; import org.springframework.modulith.testapp.TestApplication; /** diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java index 6957ac98..ee5517b0 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java @@ -33,8 +33,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest; import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.modulith.events.EventPublication; -import org.springframework.modulith.events.PublicationTargetIdentifier; +import org.springframework.modulith.events.core.EventPublication; +import org.springframework.modulith.events.core.PublicationTargetIdentifier; import org.springframework.modulith.testapp.TestApplication; import org.springframework.test.context.ContextConfiguration; 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 964cbb28..3e20d021 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 @@ -29,10 +29,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.EventListener; import org.springframework.core.env.MapPropertySource; -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.core.EventPublication; +import org.springframework.modulith.events.core.EventPublicationRegistry; +import org.springframework.modulith.events.core.PublicationTargetIdentifier; import org.springframework.modulith.events.support.PersistentApplicationEventMulticaster; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; diff --git a/spring-modulith-examples/spring-modulith-example-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java b/spring-modulith-examples/spring-modulith-example-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java index 808d8806..58ec74d0 100644 --- a/spring-modulith-examples/spring-modulith-example-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java +++ b/spring-modulith-examples/spring-modulith-example-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java @@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; import org.springframework.modulith.test.EnableScenarios; import org.springframework.modulith.test.Scenario; import org.testcontainers.containers.PostgreSQLContainer; diff --git a/spring-modulith-examples/spring-modulith-example-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java b/spring-modulith-examples/spring-modulith-example-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java index 4cfe7cbd..46f279f7 100644 --- a/spring-modulith-examples/spring-modulith-example-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java +++ b/spring-modulith-examples/spring-modulith-example-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java @@ -27,7 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; import org.springframework.modulith.test.EnableScenarios; import org.springframework.modulith.test.Scenario; import org.testcontainers.containers.MongoDBContainer; diff --git a/spring-modulith-examples/spring-modulith-example-full/src/test/java/example/order/EventPublicationRegistryTests.java b/spring-modulith-examples/spring-modulith-example-full/src/test/java/example/order/EventPublicationRegistryTests.java index 4c7cf931..652a1360 100644 --- a/spring-modulith-examples/spring-modulith-example-full/src/test/java/example/order/EventPublicationRegistryTests.java +++ b/spring-modulith-examples/spring-modulith-example-full/src/test/java/example/order/EventPublicationRegistryTests.java @@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import org.springframework.modulith.ApplicationModuleListener; -import org.springframework.modulith.events.EventPublicationRegistry; +import org.springframework.modulith.events.core.EventPublicationRegistry; import org.springframework.modulith.test.ApplicationModuleTest; import org.springframework.modulith.test.Scenario; import org.springframework.test.annotation.DirtiesContext;