From a957efbdc571ac867fe10ea88132c4083d4b354e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 17 Jun 2022 15:40:01 +0200 Subject: [PATCH] Add missing org.yaml.snakeyaml.Yaml reflection hint Closes gh-31441 --- .../PropertySourceRuntimeHintsRegistrar.java | 36 +++++++++++++++++++ .../resources/META-INF/spring/aot.factories | 1 + 2 files changed, 37 insertions(+) create mode 100644 spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceRuntimeHintsRegistrar.java diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceRuntimeHintsRegistrar.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceRuntimeHintsRegistrar.java new file mode 100644 index 0000000000..33181f29f3 --- /dev/null +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceRuntimeHintsRegistrar.java @@ -0,0 +1,36 @@ +/* + * 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.env; + +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.TypeReference; + +/** + * {@link RuntimeHintsRegistrar} implementation for property source support. + * + * @author Stephane Nicoll + */ +class PropertySourceRuntimeHintsRegistrar implements RuntimeHintsRegistrar { + + @Override + public void registerHints(RuntimeHints hints, ClassLoader classLoader) { + hints.reflection().registerTypeIfPresent(classLoader, "org.yaml.snakeyaml.Yaml", + hint -> hint.onReachableType(TypeReference.of(YamlPropertySourceLoader.class))); + } + +} diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories index 354b591e16..da1de10fee 100644 --- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories +++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories @@ -1,5 +1,6 @@ org.springframework.aot.hint.RuntimeHintsRegistrar=\ org.springframework.boot.context.config.ConfigDataLocationRuntimeHintsRegistrar,\ +org.springframework.boot.env.PropertySourceRuntimeHintsRegistrar,\ org.springframework.boot.logging.logback.LogbackRuntimeHintsRegistrar,\ org.springframework.boot.WebApplicationType.WebApplicationTypeRuntimeHintsRegistrar