Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x

Browse Source 
Closes gh-36121
This commit is contained in:
Andy Wilkinson
2023-06-29 18:10:33 +01:00
parent 20321b5685 6effd6061c
commit e2f8fcf292
9 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java
View File

@@ -18,6 +18,12 @@ package org.springframework.boot.autoconfigure.freemarker;
import org.junit.jupiter.api.Test;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeHint;
import org.springframework.beans.factory.aot.AotServices;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider.FreeMarkerTemplateAvailabilityProperties;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider.FreeMarkerTemplateAvailabilityRuntimeHints;
import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.ResourceLoader;
@@ -84,4 +90,14 @@ class FreeMarkerTemplateAvailabilityProviderTests {
.isTrue();
}
@Test
void shouldRegisterFreeMarkerTemplateAvailabilityPropertiesRuntimeHints() {
assertThat(AotServices.factories().load(RuntimeHintsRegistrar.class))
.hasAtLeastOneElementOfType(FreeMarkerTemplateAvailabilityRuntimeHints.class);
RuntimeHints hints = new RuntimeHints();
new FreeMarkerTemplateAvailabilityRuntimeHints().registerHints(hints, getClass().getClassLoader());
TypeHint typeHint = hints.reflection().getTypeHint(FreeMarkerTemplateAvailabilityProperties.class);
assertThat(typeHint).isNotNull();
}
}

16
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProviderTests.java
View File

@@ -18,6 +18,12 @@ package org.springframework.boot.autoconfigure.groovy.template;
import org.junit.jupiter.api.Test;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeHint;
import org.springframework.beans.factory.aot.AotServices;
import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilityProvider.GroovyTemplateAvailabilityProperties;
import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilityProvider.GroovyTemplateAvailabilityRuntimeHints;
import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.ResourceLoader;
@@ -84,4 +90,14 @@ class GroovyTemplateAvailabilityProviderTests {
.isTrue();
}
@Test
void shouldRegisterGroovyTemplateAvailabilityPropertiesRuntimeHints() {
assertThat(AotServices.factories().load(RuntimeHintsRegistrar.class))
.hasAtLeastOneElementOfType(GroovyTemplateAvailabilityRuntimeHints.class);
RuntimeHints hints = new RuntimeHints();
new GroovyTemplateAvailabilityRuntimeHints().registerHints(hints, getClass().getClassLoader());
TypeHint typeHint = hints.reflection().getTypeHint(GroovyTemplateAvailabilityProperties.class);
assertThat(typeHint).isNotNull();
}
}