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 index 4209bca7c9a3..10f9fed1ceb9 100644 --- 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 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 index ae67f961a156..37beb02a51cb 100644 --- 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 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 index 7b7e9134b5be..fe50c8eab9c8 100644 --- 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; @@ -100,10 +102,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 index 34848c776966..f266772f0631 100644 --- 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 index f401e549076a..c665c23f8f30 100644 --- 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 index 1db65c80883a..dfa2ca3dc187 100644 --- 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 index 0249fd261baa..ef6ebbf2e8e3 100644 --- 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 @@ -27,6 +27,8 @@ import java.util.function.UnaryOperator; import java.util.stream.Stream; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.boot.context.properties.bind.BindableRuntimeHintsRegistrar; import org.springframework.boot.context.properties.bind.Binder; @@ -146,10 +148,12 @@ enum Root { } - 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); } }