Polish "Add RuntimeHints for StackTracePrinter"

See gh-44242

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java

@@ -87,7 +87,7 @@ record StackTrace(String printer, Root root, Integer maxLength, Integer maxThrow
 			Boolean includeCommonFrames, Boolean includeHashes) {
 
 		StackTracePrinter createPrinter() {
-			String name = getPrinter();
+			String name = sanitizePrinter();
 			if ("loggingsystem".equals(name) || (name.isEmpty() && !hasAnyOtherProperty())) {
 				return null;
 			}
@@ -101,14 +101,14 @@ StackTracePrinter createPrinter() {
 		}
 
 		boolean hasCustomPrinter() {
-			String name = getPrinter();
+			String name = sanitizePrinter();
 			if (name.isEmpty()) {
 				return false;
 			}
 			return !("loggingsystem".equals(name) || "standard".equals(name));
 		}
 
-		private String getPrinter() {
+		private String sanitizePrinter() {
 			return Objects.toString(printer(), "").toLowerCase(Locale.ROOT).replace("-", "");
 		}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesBeanFactoryInitializationAotProcessor.java

@@ -32,7 +32,7 @@
 
 /**
  * {@link BeanFactoryInitializationAotProcessor} that registers {@link RuntimeHints} for
- * {@link StructuredLoggingJsonPropertiesJsonMembersCustomizer}.
+ * {@link StructuredLoggingJsonProperties}.
  *
  * @author Dmytro Nosan
  * @author Yanming Zhou
@@ -47,17 +47,34 @@ class StructuredLoggingJsonPropertiesBeanFactoryInitializationAotProcessor
 	public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
 		Environment environment = beanFactory.getBean(ENVIRONMENT_BEAN_NAME, Environment.class);
 		StructuredLoggingJsonProperties properties = StructuredLoggingJsonProperties.get(environment);
-		return (properties != null) ? AotContribution.get(properties) : null;
+		if (properties != null) {
+			Set<Class<? extends StructuredLoggingJsonMembersCustomizer<?>>> customizers = properties.customizer();
+			String stackTracePrinter = getCustomStackTracePrinter(properties);
+			if (stackTracePrinter != null || !customizers.isEmpty()) {
+				return new AotContribution(beanFactory.getBeanClassLoader(), customizers, stackTracePrinter);
+			}
+		}
+		return null;
+	}
+
+	private static String getCustomStackTracePrinter(StructuredLoggingJsonProperties properties) {
+		return Optional.ofNullable(properties.stackTrace())
+			.filter(StackTrace::hasCustomPrinter)
+			.map(StackTrace::printer)
+			.orElse(null);
 	}
 
 	private static final class AotContribution implements BeanFactoryInitializationAotContribution {
 
+		private final ClassLoader classLoader;
+
 		private final Set<Class<? extends StructuredLoggingJsonMembersCustomizer<?>>> customizers;
 
 		private final String stackTracePrinter;
 
-		private AotContribution(Set<Class<? extends StructuredLoggingJsonMembersCustomizer<?>>> customizers,
-				String stackTracePrinter) {
+		private AotContribution(ClassLoader classLoader,
+				Set<Class<? extends StructuredLoggingJsonMembersCustomizer<?>>> customizers, String stackTracePrinter) {
+			this.classLoader = classLoader;
 			this.customizers = customizers;
 			this.stackTracePrinter = stackTracePrinter;
 		}
@@ -69,27 +86,11 @@ public void applyTo(GenerationContext generationContext,
 			this.customizers.forEach((customizer) -> reflection.registerType(customizer,
 					MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
 			if (this.stackTracePrinter != null) {
-				reflection.registerTypeIfPresent(getClass().getClassLoader(), this.stackTracePrinter,
+				reflection.registerTypeIfPresent(this.classLoader, this.stackTracePrinter,
 						MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
 			}
 		}
 
-		static AotContribution get(StructuredLoggingJsonProperties properties) {
-			Set<Class<? extends StructuredLoggingJsonMembersCustomizer<?>>> customizers = properties.customizer();
-			String stackTracePrinter = getStackTracePrinter(properties);
-			if (stackTracePrinter == null && customizers.isEmpty()) {
-				return null;
-			}
-			return new AotContribution(customizers, stackTracePrinter);
-		}
-
-		private static String getStackTracePrinter(StructuredLoggingJsonProperties properties) {
-			return Optional.ofNullable(properties.stackTrace())
-				.filter(StackTrace::hasCustomPrinter)
-				.map(StackTrace::printer)
-				.orElse(null);
-		}
-
 	}
 
 }

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesBeanFactoryInitializationAotProcessorTests.java

@@ -67,7 +67,7 @@ void shouldRegisterRuntimeHintsWhenCustomizerIsPresent() {
 	}
 
 	@Test
-	void shouldRegisterRuntimeHintsWhenStackTracePrinterIsPresent() {
+	void shouldRegisterRuntimeHintsWhenCustomStackTracePrinterIsPresent() {
 		MockEnvironment environment = new MockEnvironment();
 		environment.setProperty("logging.structured.json.stacktrace.printer", TestStackTracePrinter.class.getName());