-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GH-348 - Avoid eager reference to runtime artifact from core starter.
Removed the inclusion of the spring-modulith-runtime artifact from the …-starter-core one to avoid issues in native images in a Spring Modulith default setup. As the artifact is still needed to support ApplicationModuleInitializer implementations, we now explicitly check for the presence of those and verify the artifact is actually available and hint the user at explicitly adding it if missing.
- Loading branch information
Showing
4 changed files
with
119 additions
and
7 deletions.
There are no files selected for viewing
57 changes: 57 additions & 0 deletions
57
...springframework/modulith/core/config/ApplicationModuleInitializerRuntimeVerification.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* 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.core.config; | ||
|
||
import java.util.Arrays; | ||
|
||
import org.springframework.beans.BeansException; | ||
import org.springframework.beans.factory.config.BeanFactoryPostProcessor; | ||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; | ||
import org.springframework.boot.autoconfigure.AutoConfiguration; | ||
import org.springframework.modulith.ApplicationModuleInitializer; | ||
import org.springframework.util.ClassUtils; | ||
|
||
/** | ||
* A {@link BeanFactoryPostProcessor} verifying that the {@code spring-modulith-runtime} artifact is on the classpath in | ||
* case any beans implementing {@link ApplicationModuleInitializer} are found in the | ||
* {@code org.springframework.context.ApplicationContext}. | ||
* | ||
* @author Oliver Drotbohm | ||
* @since 1.1 | ||
*/ | ||
@AutoConfiguration | ||
class ApplicationModuleInitializerRuntimeVerification implements BeanFactoryPostProcessor { | ||
|
||
private static final String ARTIFACT_MISSING = "Detected bean(s) (%s) implementing ApplicationModuleInitializer but Spring Modulith Runtime artifact not on the classpath! Please add org.springframework.modulith:spring-modulith-runtime to your project!"; | ||
|
||
/* | ||
* (non-Javadoc) | ||
* @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory(org.springframework.beans.factory.config.ConfigurableListableBeanFactory) | ||
*/ | ||
@Override | ||
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { | ||
|
||
var initializerBeanNames = beanFactory.getBeanNamesForType(ApplicationModuleInitializer.class); | ||
|
||
if (initializerBeanNames.length == 0) { | ||
return; | ||
} | ||
|
||
if (!ClassUtils.isPresent("org.springframework.modulith.runtime.ApplicationRuntime", getClass().getClassLoader())) { | ||
throw new IllegalStateException(ARTIFACT_MISSING.formatted(Arrays.toString(initializerBeanNames))); | ||
} | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.springframework.modulith.core.config.ApplicationModuleInitializerRuntimeVerification |
61 changes: 61 additions & 0 deletions
61
...gframework/modulith/core/config/ApplicationModuleInitializerRuntimeVerificationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
* 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.core.config; | ||
|
||
import static org.assertj.core.api.Assertions.*; | ||
import static org.mockito.Mockito.*; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.springframework.boot.autoconfigure.AutoConfigurations; | ||
import org.springframework.boot.test.context.runner.ApplicationContextRunner; | ||
import org.springframework.modulith.ApplicationModuleInitializer; | ||
|
||
/** | ||
* Tests for {@link ApplicationModuleInitializerRuntimeVerification}. | ||
* | ||
* @author Oliver Drotbohm | ||
* @since 1.1 | ||
*/ | ||
class ApplicationModuleInitializerRuntimeVerificationTests { | ||
|
||
@Test // GH-348 | ||
void startsWithoutApplicationModuleInititalizersPresent() { | ||
|
||
new ApplicationContextRunner() | ||
.withConfiguration(AutoConfigurations.of(ApplicationModuleInitializerRuntimeVerification.class)) | ||
.run(ctx -> { | ||
assertThat(ctx).hasNotFailed(); | ||
}); | ||
} | ||
|
||
@Test // GH-348 | ||
void rejectsPresenceOfAppliactionModuleInitializerBeanIfRuntimeArtifactIsMissing() { | ||
|
||
new ApplicationContextRunner() | ||
.withConfiguration(AutoConfigurations.of(ApplicationModuleInitializerRuntimeVerification.class)) | ||
.withBean(ApplicationModuleInitializer.class, () -> mock(ApplicationModuleInitializer.class)) | ||
.run(ctx -> { | ||
|
||
assertThat(ctx) | ||
.hasFailed() | ||
.getFailure() | ||
.isInstanceOf(IllegalStateException.class) | ||
.hasMessageContaining("ApplicationModuleInitializer") // Type | ||
.hasMessageContaining("applicationModuleInitializer") // Bean name | ||
.hasMessageContaining("spring-modulith-runtime"); // Missing artifact | ||
}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters