Skip to content

GH-374 - fix for EnablePersistentDomainEvents incompatibility with EventPublicationAutoConfiguration #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-374 - fix for EnablePersistentDomainEvents incompatibility with EventPublicationAutoConfiguration #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...in/java/org/springframework/modulith/events/config/EventPublicationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class EventPublicationAutoConfiguration extends EventPublicationConfigura
@Bean
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@ConditionalOnBean(EventPublicationRepository.class)
@ConditionalOnMissingBean
EventPublicationRegistry eventPublicationRegistry(EventPublicationRepository repository,
ObjectProvider<Clock> clock) {
return super.eventPublicationRegistry(repository, clock);
Expand All @@ -70,6 +71,7 @@ EventPublicationRegistry eventPublicationRegistry(EventPublicationRepository rep
@Bean
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@ConditionalOnBean(EventPublicationRegistry.class)
@ConditionalOnMissingBean
static PersistentApplicationEventMulticaster applicationEventMulticaster(
ObjectFactory<EventPublicationRegistry> eventPublicationRegistry, ObjectFactory<Environment> environment) {

Expand All @@ -79,6 +81,7 @@ static PersistentApplicationEventMulticaster applicationEventMulticaster(
@Bean
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@ConditionalOnBean(EventPublicationRegistry.class)
@ConditionalOnMissingBean
static CompletionRegisteringAdvisor completionRegisteringAdvisor(ObjectFactory<EventPublicationRegistry> registry) {
return EventPublicationConfiguration.completionRegisteringAdvisor(registry);
}
Expand Down
12 changes: 12 additions & 0 deletions ...ngframework/modulith/events/config/EventPublicationAutoConfigurationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,15 @@ void exposesCompletedAndIncompleteEventPublications() {
});
}

@Test // GH-374
void compatibleWithEnablePersistentDomainEvents() {
basicSetup()
.withUserConfiguration(EnablePersistentDomainEventConfiguration.class)
.run(context -> {
assertThat(context).hasNotFailed();
});
}

private static <T> ContextConsumer<AssertableApplicationContext> expect(Function<Shutdown, T> extractor,
@Nullable T expected) {

Expand All @@ -155,4 +164,7 @@ private ApplicationContextRunner basicSetup() {

@EnableAsync(mode = AdviceMode.ASPECTJ)
static class CustomAsyncConfiguration {}

@EnablePersistentDomainEvents
static class EnablePersistentDomainEventConfiguration {}
}