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

GH-662 - Fix named interface detection in case of nested packages.

Browse Source 
If named interfaces are declared in nested packages, the name detection might accidentally pick up the names declared in child packages. We now deliberately only inspect the base package.
This commit is contained in:
Oliver Drotbohm
2024-06-18 13:57:31 +02:00
parent 8d86615e91
commit d66259ed49
6 changed files with 87 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-modulith-core/src/main/java/org/springframework/modulith/core/NamedInterface.java
View File

@@ -72,12 +72,13 @@ public class NamedInterface implements Iterable<JavaClass> {
*/
static List<NamedInterface> of(JavaPackage javaPackage) {
var names = javaPackage.findAnnotation(org.springframework.modulith.NamedInterface.class) //
var basePackage = javaPackage.toSingle();
var names = basePackage.findAnnotation(org.springframework.modulith.NamedInterface.class) //
.map(it -> getDefaultedNames(it, javaPackage.getName())) //
.orElseThrow(() -> new IllegalArgumentException(
String.format("Couldn't find NamedInterface annotation on package %s!", javaPackage)));
var classes = javaPackage.toSingle().getExposedClasses();
var classes = basePackage.getExposedClasses();
return names.stream()
.<NamedInterface> map(it -> new NamedInterface(it, classes)) //