diff --git a/spring-modulith-events/spring-modulith-events-amqp/src/main/java/org/springframework/modulith/events/amqp/RabbitEventExternalizerConfiguration.java b/spring-modulith-events/spring-modulith-events-amqp/src/main/java/org/springframework/modulith/events/amqp/RabbitEventExternalizerConfiguration.java index 5106b924..541b6dca 100644 --- a/spring-modulith-events/spring-modulith-events-amqp/src/main/java/org/springframework/modulith/events/amqp/RabbitEventExternalizerConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-amqp/src/main/java/org/springframework/modulith/events/amqp/RabbitEventExternalizerConfiguration.java @@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.expression.spel.support.StandardEvaluationContext; @@ -40,6 +41,9 @@ @AutoConfiguration @AutoConfigureAfter(EventExternalizationAutoConfiguration.class) @ConditionalOnClass(RabbitTemplate.class) +@ConditionalOnProperty(name = "spring.modulith.events.externalization.enabled", + havingValue = "true", + matchIfMissing = true) class RabbitEventExternalizerConfiguration { private static final Logger logger = LoggerFactory.getLogger(RabbitEventExternalizerConfiguration.class); diff --git a/spring-modulith-events/spring-modulith-events-amqp/src/test/java/org/springframework/modulith/events/amqp/RabbitEventExternalizerConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-amqp/src/test/java/org/springframework/modulith/events/amqp/RabbitEventExternalizerConfigurationIntegrationTests.java new file mode 100644 index 00000000..2570e6b3 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-amqp/src/test/java/org/springframework/modulith/events/amqp/RabbitEventExternalizerConfigurationIntegrationTests.java @@ -0,0 +1,63 @@ +/* + * Copyright 2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.modulith.events.amqp; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import org.junit.jupiter.api.Test; +import org.springframework.amqp.rabbit.core.RabbitMessageOperations; +import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.modulith.events.EventExternalizationConfiguration; +import org.springframework.modulith.events.support.DelegatingEventExternalizer; + +/** + * Integration tests for {@link RabbitEventExternalizerConfiguration}. + * + * @author Oliver Drotbohm + * @since 1.1 + */ +class RabbitEventExternalizerConfigurationIntegrationTests { + + @Test // GH-342 + void registersExternalizerByDefault() { + + basicSetup() + .run(ctxt -> { + assertThat(ctxt).hasSingleBean(DelegatingEventExternalizer.class); + }); + } + + @Test // GH-342 + void disablesExternalizationIfConfigured() { + + basicSetup() + .withPropertyValues("spring.modulith.events.externalization.enabled=false") + .run(ctxt -> { + assertThat(ctxt).doesNotHaveBean(DelegatingEventExternalizer.class); + }); + } + + private ApplicationContextRunner basicSetup() { + + return new ApplicationContextRunner() + .withConfiguration( + AutoConfigurations.of(RabbitEventExternalizerConfiguration.class)) + .withBean(EventExternalizationConfiguration.class, () -> EventExternalizationConfiguration.disabled()) + .withBean(RabbitMessageOperations.class, () -> mock(RabbitMessageOperations.class)); + } +} diff --git a/spring-modulith-events/spring-modulith-events-api/src/main/java/org/springframework/modulith/events/EventExternalizationConfiguration.java b/spring-modulith-events/spring-modulith-events-api/src/main/java/org/springframework/modulith/events/EventExternalizationConfiguration.java index 85287038..aaab7b72 100644 --- a/spring-modulith-events/spring-modulith-events-api/src/main/java/org/springframework/modulith/events/EventExternalizationConfiguration.java +++ b/spring-modulith-events/spring-modulith-events-api/src/main/java/org/springframework/modulith/events/EventExternalizationConfiguration.java @@ -77,6 +77,15 @@ public static Selector externalizing() { return new Selector(); } + /** + * Disables event externalization by not matching any events at all. + * + * @return will never be {@literal null}. + */ + public static EventExternalizationConfiguration disabled() { + return externalizing().select(__ -> false).build(); + } + /** * A {@link Predicate} to select all events annotated as to be externalized. The currently supported annotations are: *