Spring/spring-modulith
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-46 - Bootstrap dependencies must only contain DependencyType.USES_COMPONENT.

Browse Source
This commit is contained in:
Oliver Drotbohm
2022-10-21 00:45:14 +02:00
parent 1b06b8b689
commit 2430dc90e2
4 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-modulith-core/src/main/java/org/springframework/modulith/model/ApplicationModule.java
View File

@@ -177,7 +177,7 @@ public class ApplicationModule {
Assert.notNull(modules, "Modules must not be null!");
Assert.notNull(depth, "Dependency depth must not be null!");
return streamDependencies(modules, depth);
return streamBootstrapDependencies(modules, depth);
}
/**
@@ -187,12 +187,12 @@ public class ApplicationModule {
* @param depth must not be {@literal null}.
* @return
*/
public Stream<JavaPackage> getBasePackages(ApplicationModules modules, DependencyDepth depth) {
public Stream<JavaPackage> getBootstrapBasePackages(ApplicationModules modules, DependencyDepth depth) {
Assert.notNull(modules, "Modules must not be null!");
Assert.notNull(depth, "Dependency depth must not be null!");
Stream<ApplicationModule> dependencies = streamDependencies(modules, depth);
Stream<ApplicationModule> dependencies = streamBootstrapDependencies(modules, depth);
return Stream.concat(Stream.of(this), dependencies) //
.map(ApplicationModule::getBasePackage);
@@ -380,27 +380,28 @@ public class ApplicationModule {
.flatMap(it -> getModuleDependenciesOf(it, modules));
}
private Stream<ApplicationModule> streamDependencies(ApplicationModules modules, DependencyDepth depth) {
private Stream<ApplicationModule> streamBootstrapDependencies(ApplicationModules modules, DependencyDepth depth) {
switch (depth) {
case NONE:
return Stream.empty();
case IMMEDIATE:
return getDirectModuleDependencies(modules);
return getDirectModuleBootstrapDependencies(modules);
case ALL:
default:
return getDirectModuleDependencies(modules) //
.flatMap(it -> Stream.concat(Stream.of(it), it.streamDependencies(modules, DependencyDepth.ALL))) //
return getDirectModuleBootstrapDependencies(modules) //
.flatMap(it -> Stream.concat(Stream.of(it), it.streamBootstrapDependencies(modules, DependencyDepth.ALL))) //
.distinct();
}
}
private Stream<ApplicationModule> getDirectModuleDependencies(ApplicationModules modules) {
private Stream<ApplicationModule> getDirectModuleBootstrapDependencies(ApplicationModules modules) {
return getSpringBeansInternal().stream() //
.flatMap(it -> ModuleDependency.fromType(it)) //
.filter(it -> isDependencyToOtherModule(it.target, modules)) //
.filter(it -> it.hasType(DependencyType.USES_COMPONENT)) //
.map(it -> modules.getModuleByType(it.target)) //
.distinct() //
.flatMap(it -> it.map(Stream::of).orElseGet(Stream::empty));