Merge pull request #210 from AxonFramework/bugfix/multitenancyconfigu…

…ration Incorrect Spring Boot Auto-configuration ordering
AxonFramework · Jul 31, 2024 · caa002c · caa002c
2 parents d86ded7 + 5596b5e
commit caa002c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...framework/extensions/multitenancy/autoconfig/MultiTenancyAxonServerAutoConfiguration.java b/...framework/extensions/multitenancy/autoconfig/MultiTenancyAxonServerAutoConfiguration.java
@@ -70,7 +70,7 @@
 @AutoConfiguration
 @ConditionalOnClass(AxonServerConfiguration.class)
 @ConditionalOnProperty(value = {"axon.axonserver.enabled", "axon.multi-tenancy.enabled"}, matchIfMissing = true)
-@AutoConfigureAfter(AxonServerAutoConfiguration.class)
+@AutoConfigureBefore(AxonServerAutoConfiguration.class)
 @ComponentScan(excludeFilters = {
         @ComponentScan.Filter(
                 type = FilterType.REGEX,

diff --git a/...g/axonframework/extensions/multitenancy/autoconfig/MultiTenancyAutoConfigurationTest.java b/...g/axonframework/extensions/multitenancy/autoconfig/MultiTenancyAutoConfigurationTest.java
@@ -16,6 +16,7 @@
 
 package org.axonframework.extensions.multitenancy.autoconfig;
 
+import org.axonframework.axonserver.connector.event.axon.PersistentStreamMessageSource;
 import org.axonframework.axonserver.connector.event.axon.PersistentStreamMessageSourceFactory;
 import org.axonframework.extensions.multitenancy.components.TargetTenantResolver;
 import org.axonframework.extensions.multitenancy.components.TenantConnectPredicate;
@@ -39,6 +40,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
 
 /**
  * Test class validating the multi-tenancy auto-configuration.
@@ -121,6 +123,22 @@ void multiTenancyDisabled() {
                      });
     }
 
+    @Test
+    void multiTenancyAutoConfigurationMultiTenantPersistentStreamMessageSource() {
+        contextRunner
+                .withConfiguration(AutoConfigurations.of(AxonServerAutoConfiguration.class))
+
+                .withConfiguration(AutoConfigurations.of(MultiTenancyAxonServerAutoConfiguration.class))
+                .withConfiguration(AutoConfigurations.of(MultiTenantPersistentStreamAutoConfiguration.class))
+                .withPropertyValues("axon.axonserver.contexts=tenant-1,tenant-2")
+                .run(context -> {
+                    PersistentStreamMessageSourceFactory persistentStreamMessageSourceFactory =
+                            context.getBean("persistentStreamMessageSourceFactory", PersistentStreamMessageSourceFactory.class);
+                    PersistentStreamMessageSource persistentStreamMessageSource = persistentStreamMessageSourceFactory.build("testName", mock(), mock(), 100, "testContext", mock());
+                    assertThat(persistentStreamMessageSource).isInstanceOf(MultiTenantPersistentStreamMessageSource.class);
+                });
+    }
+
     @Test
     void multiTenancyMetaDataHelperDisabled() {
         TargetTenantResolver<Message<?>> userResolver = (message, tenants) ->