From 68af0bb804cb74df89db277776ea8e587dd95f08 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 7 Sep 2022 09:58:25 +0100
Subject: [PATCH] Move runtime hints from sample to core

- Relates #490
---
 .../java/org/springframework/shell/JnaRuntimeHints.java     | 4 ++--
 .../src/main/resources/META-INF/spring/aot.factories        | 3 ++-
 .../org/springframework/shell/JnaRuntimeHintsTests.java     | 6 +++---
 .../src/main/resources/META-INF/spring/aot.factories        | 2 --
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java => spring-shell-core/src/main/java/org/springframework/shell/JnaRuntimeHints.java (98%)
 rename spring-shell-samples/src/test/java/org/springframework/shell/samples/config/SamplesRuntimeHintsTests.java => spring-shell-core/src/test/java/org/springframework/shell/JnaRuntimeHintsTests.java (90%)
 delete mode 100644 spring-shell-samples/src/main/resources/META-INF/spring/aot.factories

diff --git a/spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java b/spring-shell-core/src/main/java/org/springframework/shell/JnaRuntimeHints.java
similarity index 98%
rename from spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java
rename to spring-shell-core/src/main/java/org/springframework/shell/JnaRuntimeHints.java
index 2f691068..fbac4dcf 100644
--- a/spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/JnaRuntimeHints.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.shell.samples.config;
+package org.springframework.shell;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -28,7 +28,7 @@ import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeHint;
 import org.springframework.aot.hint.TypeReference;
 
-public class SamplesRuntimeHints implements RuntimeHintsRegistrar {
+public class JnaRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
diff --git a/spring-shell-core/src/main/resources/META-INF/spring/aot.factories b/spring-shell-core/src/main/resources/META-INF/spring/aot.factories
index 3b5d200b..9119c6fd 100644
--- a/spring-shell-core/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-shell-core/src/main/resources/META-INF/spring/aot.factories
@@ -1,2 +1,3 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.shell.CoreResourcesRuntimeHints
+org.springframework.shell.CoreResourcesRuntimeHints,\
+org.springframework.shell.JnaRuntimeHints
diff --git a/spring-shell-samples/src/test/java/org/springframework/shell/samples/config/SamplesRuntimeHintsTests.java b/spring-shell-core/src/test/java/org/springframework/shell/JnaRuntimeHintsTests.java
similarity index 90%
rename from spring-shell-samples/src/test/java/org/springframework/shell/samples/config/SamplesRuntimeHintsTests.java
rename to spring-shell-core/src/test/java/org/springframework/shell/JnaRuntimeHintsTests.java
index 7cfb4e80..48c63f08 100644
--- a/spring-shell-samples/src/test/java/org/springframework/shell/samples/config/SamplesRuntimeHintsTests.java
+++ b/spring-shell-core/src/test/java/org/springframework/shell/JnaRuntimeHintsTests.java
@@ -1,4 +1,4 @@
-package org.springframework.shell.samples.config;
+package org.springframework.shell;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -14,7 +14,7 @@ import org.springframework.aot.hint.TypeReference;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SamplesRuntimeHintsTests {
+public class JnaRuntimeHintsTests {
 
 	@Test
 	void test() {
@@ -35,7 +35,7 @@ public class SamplesRuntimeHintsTests {
 
 	private ReflectionHints registerHints() {
 		RuntimeHints hints = new RuntimeHints();
-		new SamplesRuntimeHints().registerHints(hints, getClass().getClassLoader());
+		new JnaRuntimeHints().registerHints(hints, getClass().getClassLoader());
 		return hints.reflection();
 	}
 
diff --git a/spring-shell-samples/src/main/resources/META-INF/spring/aot.factories b/spring-shell-samples/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 9044e9ad..00000000
--- a/spring-shell-samples/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.shell.samples.config.SamplesRuntimeHints