From 0985e3d2370fbe09347ea27542a99b2cfff60ca9 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 26 Oct 2022 15:59:50 +0200 Subject: [PATCH] Add resource hint for banner.txt Closes gh-32882 --- .../boot/SpringApplicationBannerPrinter.java | 11 +++++ .../resources/META-INF/spring/aot.factories | 1 + .../SpringApplicationBannerPrinterTests.java | 41 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java index edd7b730c1..fc8bba92ea 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java @@ -23,6 +23,8 @@ import java.io.UnsupportedEncodingException; import org.apache.commons.logging.Log; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.core.env.Environment; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; @@ -122,4 +124,13 @@ class SpringApplicationBannerPrinter { } + static class SpringApplicationBannerPrinterRuntimeHints implements RuntimeHintsRegistrar { + + @Override + public void registerHints(RuntimeHints hints, ClassLoader classLoader) { + hints.resources().registerPattern("banner.txt"); + } + + } + } 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 f219219f58..5a439c1fd5 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.SpringApplication.SpringApplicationRuntimeHints,\ +org.springframework.boot.SpringApplicationBannerPrinter.SpringApplicationBannerPrinterRuntimeHints,\ org.springframework.boot.WebApplicationType.WebApplicationTypeRuntimeHints,\ org.springframework.boot.context.config.ConfigDataLocationRuntimeHints,\ org.springframework.boot.context.config.ConfigDataPropertiesRuntimeHints,\ diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java new file mode 100644 index 0000000000..30a112e705 --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java @@ -0,0 +1,41 @@ +/* + * 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; + +import org.junit.jupiter.api.Test; + +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link SpringApplicationBannerPrinter}. + * + * @author Moritz Halbritter + */ +class SpringApplicationBannerPrinterTests { + + @Test + void shouldRegisterRuntimeHints() { + RuntimeHints runtimeHints = new RuntimeHints(); + new SpringApplicationBannerPrinter.SpringApplicationBannerPrinterRuntimeHints().registerHints(runtimeHints, + getClass().getClassLoader()); + assertThat(RuntimeHintsPredicates.resource().forResource("banner.txt")).accepts(runtimeHints); + } + +}