Implement RuntimeHintsRegistrar

ngocnhan-tran1996 · snicoll · commit d212232d9d84 · 2025-02-17T11:21:04.000+01:00
CLoses gh-44299
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.boot.autoconfigure.template.PathBasedTemplateAvailabilityProvider;
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
 import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;
@@ -65,16 +66,13 @@ public void setTemplateLoaderPath(List<String> templateLoaderPath) {
 
 	}
 
-	static class FreeMarkerTemplateAvailabilityRuntimeHints extends BindableRuntimeHintsRegistrar {
-
-		FreeMarkerTemplateAvailabilityRuntimeHints() {
-			super(FreeMarkerTemplateAvailabilityProperties.class);
-		}
+	static class FreeMarkerTemplateAvailabilityRuntimeHints implements RuntimeHintsRegistrar {
 
 		@Override
 		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 			if (ClassUtils.isPresent(REQUIRED_CLASS_NAME, classLoader)) {
-				super.registerHints(hints, classLoader);
+				BindableRuntimeHintsRegistrar.forTypes(FreeMarkerTemplateAvailabilityProperties.class)
+					.registerHints(hints, classLoader);
 			}
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.boot.autoconfigure.template.PathBasedTemplateAvailabilityProvider;
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
 import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;
@@ -65,16 +66,13 @@ public void setResourceLoaderPath(List<String> resourceLoaderPath) {
 
 	}
 
-	static class GroovyTemplateAvailabilityRuntimeHints extends BindableRuntimeHintsRegistrar {
-
-		GroovyTemplateAvailabilityRuntimeHints() {
-			super(GroovyTemplateAvailabilityProperties.class);
-		}
+	static class GroovyTemplateAvailabilityRuntimeHints implements RuntimeHintsRegistrar {
 
 		@Override
 		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 			if (ClassUtils.isPresent(REQUIRED_CLASS_NAME, classLoader)) {
-				super.registerHints(hints, classLoader);
+				BindableRuntimeHintsRegistrar.forTypes(GroovyTemplateAvailabilityProperties.class)
+					.registerHints(hints, classLoader);
 			}
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.http;
 
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -31,6 +33,7 @@
 import org.springframework.boot.autoconfigure.jsonb.JsonbAutoConfiguration;
 import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;
 import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties;
 import org.springframework.boot.web.servlet.server.Encoding;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -100,10 +103,11 @@ private static final class ReactiveWebApplication {
 
 	}
 
-	static class HttpMessageConvertersAutoConfigurationRuntimeHints extends BindableRuntimeHintsRegistrar {
+	static class HttpMessageConvertersAutoConfigurationRuntimeHints implements RuntimeHintsRegistrar {
 
-		HttpMessageConvertersAutoConfigurationRuntimeHints() {
-			super(Encoding.class);
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			BindableRuntimeHintsRegistrar.forTypes(Encoding.class).registerHints(hints, classLoader);
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationProperties.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.boot.Banner.Mode;
 import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;
 import org.springframework.boot.logging.LoggingSystemProperty;
@@ -157,10 +159,11 @@ void setWebApplicationType(WebApplicationType webApplicationType) {
 		this.webApplicationType = webApplicationType;
 	}
 
-	static class ApplicationPropertiesRuntimeHints extends BindableRuntimeHintsRegistrar {
+	static class ApplicationPropertiesRuntimeHints implements RuntimeHintsRegistrar {
 
-		ApplicationPropertiesRuntimeHints() {
-			super(ApplicationProperties.class);
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			BindableRuntimeHintsRegistrar.forTypes(ApplicationProperties.class).registerHints(hints, classLoader);
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ElasticCommonSchemaProperties.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/ElasticCommonSchemaProperties.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.logging.structured;
 
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.json.JsonWriter;
@@ -92,10 +94,12 @@ Service withDefaults(Environment environment) {
 
 	}
 
-	static class ElasticCommonSchemaPropertiesRuntimeHints extends BindableRuntimeHintsRegistrar {
+	static class ElasticCommonSchemaPropertiesRuntimeHints implements RuntimeHintsRegistrar {
 
-		ElasticCommonSchemaPropertiesRuntimeHints() {
-			super(ElasticCommonSchemaProperties.class);
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			BindableRuntimeHintsRegistrar.forTypes(ElasticCommonSchemaProperties.class)
+				.registerHints(hints, classLoader);
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/GraylogExtendedLogFormatProperties.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/GraylogExtendedLogFormatProperties.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.logging.structured;
 
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.json.JsonWriter;
@@ -92,10 +94,12 @@ void jsonMembers(JsonWriter.Members<?> members) {
 
 	}
 
-	static class GraylogExtendedLogFormatPropertiesRuntimeHints extends BindableRuntimeHintsRegistrar {
+	static class GraylogExtendedLogFormatPropertiesRuntimeHints implements RuntimeHintsRegistrar {
 
-		GraylogExtendedLogFormatPropertiesRuntimeHints() {
-			super(GraylogExtendedLogFormatProperties.class);
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			BindableRuntimeHintsRegistrar.forTypes(GraylogExtendedLogFormatProperties.class)
+				.registerHints(hints, classLoader);
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java
@@ -19,6 +19,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.core.env.Environment;
@@ -43,10 +45,12 @@ static StructuredLoggingJsonProperties get(Environment environment) {
 			.orElse(null);
 	}
 
-	static class StructuredLoggingJsonPropertiesRuntimeHints extends BindableRuntimeHintsRegistrar {
+	static class StructuredLoggingJsonPropertiesRuntimeHints implements RuntimeHintsRegistrar {
 
-		StructuredLoggingJsonPropertiesRuntimeHints() {
-			super(StructuredLoggingJsonProperties.class);
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			BindableRuntimeHintsRegistrar.forTypes(StructuredLoggingJsonProperties.class)
+				.registerHints(hints, classLoader);
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`package org.springframework.boot.logging.structured;`
`18`	`18`
	`19`	`+import org.springframework.aot.hint.RuntimeHints;`
	`20`	`+import org.springframework.aot.hint.RuntimeHintsRegistrar;`
`19`	`21`	`import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar;`
`20`	`22`	`import org.springframework.boot.context.properties.bind.Binder;`
`21`	`23`	`import org.springframework.boot.json.JsonWriter;`
`@@ -92,10 +94,12 @@ Service withDefaults(Environment environment) {`
`92`	`94`
`93`	`95`	`}`
`94`	`96`
`95`		`- static class ElasticCommonSchemaPropertiesRuntimeHints extends BindableRuntimeHintsRegistrar {`
	`97`	`+ static class ElasticCommonSchemaPropertiesRuntimeHints implements RuntimeHintsRegistrar {`
`96`	`98`
`97`		`- ElasticCommonSchemaPropertiesRuntimeHints() {`
`98`		`- super(ElasticCommonSchemaProperties.class);`
	`99`	`+ @Override`
	`100`	`+ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {`
	`101`	`+ BindableRuntimeHintsRegistrar.forTypes(ElasticCommonSchemaProperties.class)`
	`102`	`+ .registerHints(hints, classLoader);`
`99`	`103`	`}`
`100`	`104`
`101`	`105`	`}`