GH-1015 - ModulithMetadata obtained from a package now considers @Modulithic annotations.

Author: odrotbohm

spring-modulith-core/pom.xml

@@ -40,6 +40,11 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -73,12 +78,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>

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

@@ -18,12 +18,17 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
+import java.util.Set;
 import java.util.stream.Stream;
 
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.modulith.Modulith;
 import org.springframework.modulith.Modulithic;
 import org.springframework.modulith.core.Types.SpringTypes;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * Core metadata about the modulithic application.
@@ -56,13 +61,26 @@ public static ModulithMetadata of(Class<?> annotated) {
 	}
 
 	/**
-	 * Creates a new {@link ModulithMetadata} instance for the given package.
+	 * Creates a new {@link ModulithMetadata} instance for the given package. Inspects the package for classes annotated
+	 * with {@link Modulithic} to pick up additional configuration.
 	 *
 	 * @param javaPackage must not be {@literal null} or empty.
 	 * @return will never be {@literal null}.
 	 */
 	public static ModulithMetadata of(String javaPackage) {
-		return SpringBootModulithMetadata.of(javaPackage);
+
+		var provider = new ClassPathScanningCandidateComponentProvider(false);
+		provider.addIncludeFilter(new AnnotationTypeFilter(Modulithic.class));
+
+		Set<BeanDefinition> candidates = provider.findCandidateComponents(javaPackage);
+
+		if (candidates.size() != 1) {
+			return SpringBootModulithMetadata.of(javaPackage);
+		}
+
+		var className = candidates.iterator().next().getBeanClassName();
+
+		return of(ClassUtils.resolveClassName(className, ModulithMetadata.class.getClassLoader()));
 	}
 
 	/**

spring-modulith-core/src/test/java/empty/EmptyApplication.java

@@ -20,5 +20,5 @@
 /**
  * @author Oliver Drotbohm
  */
-@Modulithic
+@Modulithic(systemName = "customSystemName")
 public class EmptyApplication {}

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

@@ -74,6 +74,14 @@ void returnsUniqueBasePackages() {
 		assertThat(metadata.getBasePackages()).containsExactly(getClass().getPackageName());
 	}
 
+	@Test // GH-1015
+	void considersModulithicOnPackageLookup() {
+
+		var metadata = ModulithMetadata.of("empty");
+
+		assertThat(metadata.getSystemName()).hasValue("customSystemName");
+	}
+
 	@Modulith(additionalPackages = "com.acme.foo", //
 			sharedModules = "shared.module", //
 			systemName = "systemName", //