GH-1247 - Avoid registering nested packages as additional ones.

Author: odrotbohm

spring-modulith-core/src/main/java/org/springframework/modulith/core/AnnotationModulithMetadata.java

@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import org.springframework.core.annotation.AnnotatedElementUtils;
@@ -146,11 +147,14 @@ public List<String> getBasePackages() {
 		var result = new ArrayList<String>();
 		result.add(basePackage);
 
-		for (var candidate : annotation.additionalPackages()) {
-			if (!result.contains(candidate)) {
-				result.add(candidate);
-			}
-		}
+		var name = PackageName.of(basePackage);
+
+		// Only add non-nested additional packages
+		Stream.of(annotation.additionalPackages())
+				.map(PackageName::of)
+				.filter(Predicate.not(name::contains))
+				.map(PackageName::getName)
+				.forEach(result::add);
 
 		return result;
 	}

spring-modulith-core/src/test/java/org/springframework/modulith/core/AnnotationModulithMetadataUnitTest.java

@@ -54,6 +54,16 @@ void usesSimpleClassNameAsDefaultSystemName() {
 		});
 	}
 
+	@Test // GH-1247
+	void skipsNestedAdditionalPackages() {
+
+		assertThat(AnnotationModulithMetadata.of(WithInvalidAdditionalpackages.class)).hasValueSatisfying(it -> {
+			assertThat(it.getBasePackages())
+					.hasSize(1)
+					.contains(WithInvalidAdditionalpackages.class.getPackageName());
+		});
+	}
+
 	@Modulithic(useFullyQualifiedModuleNames = true)
 	static class Sample {}
 
@@ -63,4 +73,7 @@ static class MetaSample {}
 	@Retention(RetentionPolicy.RUNTIME)
 	@Modulithic(useFullyQualifiedModuleNames = true)
 	@interface Intermediate {}
+
+	@Modulithic(additionalPackages = "org.springframework.modulith.core.nested")
+	static class WithInvalidAdditionalpackages {}
 }