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

Fix native image hints for web support.

Browse Source 
This commit adds a required native image reflection hint to allow Jackson object mapping to resolve and invoke the constructor of PageMetadata.
It also fixes an issue that surfaced after changing the bean constructor argument for SpringDataWebSettings leading to failures during the native compilation.

Closes: #3171
This commit is contained in:
Christoph Strobl
2024-10-07 09:53:18 +02:00
parent fb978b8220
commit ca462e733e
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/data/web/aot/WebRuntimeHints.java
View File

@@ -20,6 +20,7 @@ import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
import org.springframework.data.web.PagedModel;
import org.springframework.data.web.config.EnableSpringDataWebSupport;
import org.springframework.data.web.config.SpringDataJacksonConfiguration.PageModule;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
@@ -35,12 +36,17 @@ class WebRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
hints.reflection().registerType(org.springframework.data.web.config.SpringDataWebSettings.class, hint -> hint
.withMembers(MemberCategory.INVOKE_DECLARED_METHODS).onReachableType(EnableSpringDataWebSupport.class));
if (ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader)) {
// Page Model for Jackson Rendering
hints.reflection().registerType(org.springframework.data.web.PagedModel.class,
MemberCategory.INVOKE_PUBLIC_METHODS);
hints.reflection().registerType(PagedModel.PageMetadata.class, MemberCategory.INVOKE_PUBLIC_METHODS);
hints.reflection().registerType(PagedModel.PageMetadata.class, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
MemberCategory.INVOKE_PUBLIC_METHODS);
// Type that might not be seen otherwise
hints.reflection().registerType(TypeReference.of("org.springframework.data.domain.Unpaged"),

11
src/test/java/org/springframework/data/web/aot/WebRuntimeHintsUnitTests.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.data.web.aot;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.jupiter.api.Test;
import org.springframework.aot.hint.ReflectionHints;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.TypeReference;
@@ -46,7 +46,7 @@ class WebRuntimeHintsUnitTests {
RuntimeHintsPredicates.reflection().onType(TypeReference.of("org.springframework.data.domain.Unpaged")));
}
@Test // GH-3033
@Test // GH-3033, GH-3171
@ClassPathExclusions(packages = { "com.fasterxml.jackson.databind" })
void shouldRegisterRuntimeHintWithTypeNameWhenJacksonNotPresent() {
@@ -56,6 +56,7 @@ class WebRuntimeHintsUnitTests {
new WebRuntimeHints().registerHints(runtimeHints, this.getClass().getClassLoader());
assertThat(runtimeHints.reflection().typeHints()).isEmpty();
assertThat(runtimeHints).matches(RuntimeHintsPredicates.reflection()
.onType(TypeReference.of("org.springframework.data.web.config.SpringDataWebSettings")));
}
}