From 0cc0b48a675a1bc0589253ed803085d92203f8e0 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Tue, 23 Aug 2022 09:23:42 +0200 Subject: [PATCH] Add runtime hints for freemarker Registers reflection hints for the FreeMarkerTemplateAvailabilityProperties class. Closes gh-32052 --- .../FreeMarkerAutoConfiguration.java | 2 + .../freemarker/FreeMarkerRuntimeHints.java | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerRuntimeHints.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java index 1cd7eb15f6..1978674265 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java @@ -29,6 +29,7 @@ import org.springframework.boot.autoconfigure.template.TemplateLocation; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.ImportRuntimeHints; import org.springframework.ui.freemarker.FreeMarkerConfigurationFactory; /** @@ -44,6 +45,7 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactory; @EnableConfigurationProperties(FreeMarkerProperties.class) @Import({ FreeMarkerServletWebConfiguration.class, FreeMarkerReactiveWebConfiguration.class, FreeMarkerNonWebConfiguration.class }) +@ImportRuntimeHints(FreeMarkerRuntimeHints.class) public class FreeMarkerAutoConfiguration { private static final Log logger = LogFactory.getLog(FreeMarkerAutoConfiguration.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerRuntimeHints.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerRuntimeHints.java new file mode 100644 index 0000000000..88429be272 --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerRuntimeHints.java @@ -0,0 +1,37 @@ +/* + * Copyright 2012-2022 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.freemarker; + +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider.FreeMarkerTemplateAvailabilityProperties; +import org.springframework.boot.context.properties.ConfigurationPropertiesReflectionHintsProcessor; + +/** + * {@link RuntimeHintsRegistrar} for FreeMarker support. + * + * @author Moritz Halbritter + */ +class FreeMarkerRuntimeHints implements RuntimeHintsRegistrar { + + @Override + public void registerHints(RuntimeHints hints, ClassLoader classLoader) { + ConfigurationPropertiesReflectionHintsProcessor + .processConfigurationProperties(FreeMarkerTemplateAvailabilityProperties.class, hints.reflection()); + } + +}