From 791cf870efc9ba8ffd409ae665a8712dd983806b Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@vmware.com>
Date: Thu, 16 Nov 2023 15:09:22 +0100
Subject: [PATCH] Runtime hints to include rest-messages files.

Fixes GH-2330.
---
 .../RestMessagesResourcesRuntimeHints.java    | 39 +++++++++++++++++++
 .../resources/META-INF/spring/aot.factories   |  3 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/aot/RestMessagesResourcesRuntimeHints.java

diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/aot/RestMessagesResourcesRuntimeHints.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/aot/RestMessagesResourcesRuntimeHints.java
new file mode 100644
index 000000000..899d4b298
--- /dev/null
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/aot/RestMessagesResourcesRuntimeHints.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2023 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.rest.webmvc.aot;
+
+import org.springframework.aot.hint.ResourceHints;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+
+/**
+ * @author Oliver Drotbohm
+ */
+class RestMessagesResourcesRuntimeHints implements RuntimeHintsRegistrar {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.aot.hint.RuntimeHintsRegistrar#registerHints(org.springframework.aot.hint.RuntimeHints, java.lang.ClassLoader)
+	 */
+	@Override
+	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+
+		ResourceHints resources = hints.resources();
+
+		resources.registerPattern("rest-messages*.properties");
+		resources.registerPattern("rest-default-messages.properties");
+	}
+}
diff --git a/spring-data-rest-webmvc/src/main/resources/META-INF/spring/aot.factories b/spring-data-rest-webmvc/src/main/resources/META-INF/spring/aot.factories
index bd693b9bb..075a7c477 100644
--- a/spring-data-rest-webmvc/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-data-rest-webmvc/src/main/resources/META-INF/spring/aot.factories
@@ -2,4 +2,5 @@ org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
     org.springframework.data.rest.webmvc.aot.BasePathAwareControllerAotProcessor,\
     org.springframework.data.rest.webmvc.aot.ProjectionProxyAotProcessor
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-    org.springframework.data.rest.webmvc.aot.ValueInstantiatorCustomizerRuntimeHints
+    org.springframework.data.rest.webmvc.aot.ValueInstantiatorCustomizerRuntimeHints,\
+    org.springframework.data.rest.webmvc.aot.RestMessagesResourcesRuntimeHints