Polishing.

Rename store-specific property to spring.aot.%s.repositories.enabled.

See #3322
Original pull request: #3323

Author: mp911de

pom.xml

@@ -325,6 +325,7 @@
 			<version>${jmolecules-integration}</version>
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>

src/main/java/org/springframework/data/aot/AotContext.java

@@ -87,32 +87,32 @@ static AotContext from(BeanFactory beanFactory, Environment environment) {
 
 	/**
 	 * Checks if repository code generation is enabled for a given module by checking environment variables for general
-	 * enablement ({@link #GENERATED_REPOSITORIES_ENABLED}) and store specific ones following the pattern
-	 * {@literal spring.aot.repositories.<module-name>.enabled}.
+	 * enablement ({@link #GENERATED_REPOSITORIES_ENABLED}) and store-specific ones following the pattern
+	 * {@literal spring.aot.<module-name>.repositories.enabled}.
 	 * <p>
-	 * {@link #GENERATED_REPOSITORIES_ENABLED} acts as a kill switch, if disabled, store specific flags have no effect.
+	 * {@link #GENERATED_REPOSITORIES_ENABLED} acts as a main switch, if disabled, store specific flags have no effect.
 	 * <p>
-	 * Missing properties are interpreted as {@literal true}.
+	 * Unset properties are considered being {@literal true}.
 	 *
-	 * @param moduleName The name of the module. Can be {@literal null} or {@literal empty}, in which case it will only
-	 *          check the general {@link #GENERATED_REPOSITORIES_ENABLED} flag.
+	 * @param moduleName name of the module. Can be {@literal null} or {@literal empty}, in which case it will only check
+	 *          the general {@link #GENERATED_REPOSITORIES_ENABLED} flag.
 	 * @return indicator if repository code generation is enabled.
 	 * @since 5.0
 	 */
 	default boolean isGeneratedRepositoriesEnabled(@Nullable String moduleName) {
 
 		Environment environment = getEnvironment();
-		Boolean codeGenerationEnabled = environment.getProperty(GENERATED_REPOSITORIES_ENABLED, Boolean.class, true);
-		if (!codeGenerationEnabled) {
+
+		if (!environment.getProperty(GENERATED_REPOSITORIES_ENABLED, Boolean.class, true)) {
 			return false;
 		}
 
 		if (!StringUtils.hasText(moduleName)) {
 			return true;
 		}
 
-		String modulePropertyName = GENERATED_REPOSITORIES_ENABLED.replace("enabled",
-				"%s.enabled".formatted(moduleName.toLowerCase(Locale.US)));
+		String modulePropertyName = GENERATED_REPOSITORIES_ENABLED.replace("repositories",
+				"%s.repositories".formatted(moduleName.toLowerCase(Locale.ROOT)));
 		return environment.getProperty(modulePropertyName, Boolean.class, true);
 	}
 

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java

@@ -216,9 +216,6 @@ public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegist
 							configurations.size() == 1 ? "" : "s"));
 		}
 
-		// TODO: AOT Processing -> guard this one with a flag so it's not always present
-		// TODO: With regard to AOT Processing, perhaps we need to be smart and detect whether "core" AOT components are
-		// (or rather configuration is) present on the classpath to enable Spring Data AOT component registration.
 		registerAotComponents(registry, extension, metadataByRepositoryBeanName);
 
 		return definitions;

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtension.java

@@ -43,8 +43,7 @@ public interface RepositoryConfigurationExtension {
 	 * @since 3.0
 	 */
 	default String getModuleIdentifier() {
-
-		return getModuleName().toLowerCase(Locale.ENGLISH).replace(' ', '-');
+		return getModuleName().toLowerCase(Locale.ROOT).replace(' ', '-');
 	}
 
 	/**

src/test/java/org/springframework/data/aot/AotContextUnitTests.java

@@ -49,13 +49,13 @@ void considersEnvironmentSettingsForGeneratedRepositories(String generalFlag, St
 			ctx.withProperty(generalFlag, generalValue);
 		}
 		if (StringUtils.hasText(storeName) && StringUtils.hasText(storeValue)) {
-			ctx.withProperty("spring.aot.repositories.%s.enabled".formatted(storeName), storeValue);
+			ctx.withProperty("spring.aot.%s.repositories.enabled".formatted(storeName), storeValue);
 		}
 
 		Assertions.assertThat(ctx.isGeneratedRepositoriesEnabled(storeName)).isEqualTo(enabled);
 	}
 
-	class MockAotContext implements AotContext {
+	static class MockAotContext implements AotContext {
 
 		private final MockEnvironment environment;