From 15d411b79ae46e6d01f0fe8611078240ed73262b Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 15 Jan 2024 14:34:05 +0100 Subject: [PATCH] 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. Closes: #3025 Original pull request: #3026 --- .../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 000000000..6a3610599 --- /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 f25bf746b..e558f4348 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