From f976dd504dc4d6ef149ad259d4036b0407fae825 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 15 Jan 2024 14:05:23 +0100 Subject: [PATCH 1/3] Prepare issue branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79f4bd910c..7460eba377 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-commons - 3.2.3-SNAPSHOT + 3.2.x-3025-SNAPSHOT Spring Data Core Core Spring concepts underpinning every Spring Data module. From b0732b794126f14c6ba5d8d4a78a4be2875f2a26 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 15 Jan 2024 14:07:19 +0100 Subject: [PATCH 2/3] Polishing. Remove unused imports. --- .../data/web/config/SpringDataJacksonConfiguration.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java b/src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java index 18a689a75d..b6ab14dac4 100644 --- a/src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java +++ b/src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java @@ -15,19 +15,13 @@ */ package org.springframework.data.web.config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; import org.springframework.data.geo.GeoModule; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializerBase; -import com.fasterxml.jackson.databind.util.StdConverter; /** * JavaConfig class to export Jackson specific configuration. From e5065ae191d2d09c1a3a1fdd5d0433914a06f825 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 15 Jan 2024 14:34:05 +0100 Subject: [PATCH 3/3] Add missing runtime hit for Unpaged required by PageModule. The PageModule is loading the Unpaged type via its name which requires additional reflection configuration for native images. --- .../data/web/aot/hint/WebRuntimeHints.java | 37 +++++++++++++++++++ .../resources/META-INF/spring/aot.factories | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/springframework/data/web/aot/hint/WebRuntimeHints.java diff --git a/src/main/java/org/springframework/data/web/aot/hint/WebRuntimeHints.java b/src/main/java/org/springframework/data/web/aot/hint/WebRuntimeHints.java new file mode 100644 index 0000000000..6a36105996 --- /dev/null +++ b/src/main/java/org/springframework/data/web/aot/hint/WebRuntimeHints.java @@ -0,0 +1,37 @@ +/* + * Copyright 2024 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.data.web.aot.hint; + +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.TypeReference; +import org.springframework.data.web.config.SpringDataJacksonConfiguration.PageModule; +import org.springframework.lang.Nullable; + +/** + * @author Christoph Strobl + * @since 3.2.3 + */ +public class WebRuntimeHints implements RuntimeHintsRegistrar { + + @Override + public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { + + hints.reflection().registerType(TypeReference.of("org.springframework.data.domain.Unpaged"), hint -> { + hint.onReachableType(PageModule.class); + }); + } +} diff --git a/src/main/resources/META-INF/spring/aot.factories b/src/main/resources/META-INF/spring/aot.factories index f25bf746b1..e558f43481 100644 --- a/src/main/resources/META-INF/spring/aot.factories +++ b/src/main/resources/META-INF/spring/aot.factories @@ -3,7 +3,8 @@ org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\ org.springframework.aot.hint.RuntimeHintsRegistrar=\ org.springframework.data.repository.aot.hint.RepositoryRuntimeHints,\ - org.springframework.data.querydsl.aot.QuerydslHints + org.springframework.data.querydsl.aot.QuerydslHints,\ + org.springframework.data.web.aot.hint.WebRuntimeHints org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\ org.springframework.data.aot.AuditingBeanRegistrationAotProcessor