Move wrongly placed test classes to test packages

Author: cowtowncoder

hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JakartaModule.java

@@ -171,9 +171,8 @@ public Hibernate5JakartaModule(Mapping mapping, SessionFactory sessionFactory) {
     @Override
     public void setupModule(SetupContext context)
     {
-        /* First, append annotation introspector (no need to override, esp.
-         * as we just implement couple of methods)
-         */
+        // First, append annotation introspector (no need to override, esp.
+        // as we just implement couple of methods)
         // Then add serializers we need
         AnnotationIntrospector ai = annotationIntrospector();
         if (ai != null) {
@@ -192,7 +191,7 @@ protected AnnotationIntrospector annotationIntrospector() {
         ai.setUseTransient(isEnabled(Feature.USE_TRANSIENT_ANNOTATION));
         return ai;
     }
-    
+
     /*
     /**********************************************************************
     /* Extended API, configuration

hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JakartaVersion.java renamed to hibernate5-jakarta/src/test/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JakartaVersion.java

@@ -1,10 +1,13 @@
 package tools.jackson.datatype.hibernate5.jakarta;
 
-public class Hibernate5JakartaVersion {
-
-    public static String getHibernateVersion(){
+public abstract class Hibernate5JakartaVersion
+{
+    public static String getHibernateVersion() {
         try {
-            return Class.forName("org.hibernate.Version").getPackage().getImplementationVersion();
+            // Use Version.getVersionString() instead of Package.getImplementationVersion()
+            // because the latter returns null in JPMS/module-info contexts
+            Class<?> versionClass = Class.forName("org.hibernate.Version");
+            return (String) versionClass.getMethod("getVersionString").invoke(null);        
         } catch (Exception e) {
             // Should not happen: hibernate not found in the classpath
             throw new RuntimeException(e);

hibernate5-jakarta/src/test/java/tools/jackson/datatype/hibernate5/jakarta/ReplacePersistentCollectionTest.java

@@ -8,8 +8,6 @@
 import tools.jackson.databind.DefaultTyping;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.json.JsonMapper;
-import tools.jackson.datatype.hibernate5.jakarta.BaseTest;
-import tools.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;
 import tools.jackson.datatype.hibernate5.jakarta.data.Customer;
 import tools.jackson.datatype.hibernate5.jakarta.data.Payment;
 import tools.jackson.datatype.hibernate5.jakarta.testutil.NoCheckSubTypeValidator;

hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6Version.java renamed to hibernate6/src/test/java/tools/jackson/datatype/hibernate6/Hibernate6Version.java

@@ -1,17 +1,20 @@
 package tools.jackson.datatype.hibernate6;
 
-public class Hibernate6Version {
-
-    public static String getHibernateVersion(){
+public class Hibernate6Version
+{
+    public static String getHibernateVersion() {
         try {
-            return Class.forName("org.hibernate.Version").getPackage().getImplementationVersion();
+            // Use Version.getVersionString() instead of Package.getImplementationVersion()
+            // because the latter returns null in JPMS/module-info contexts
+            Class<?> versionClass = Class.forName("org.hibernate.Version");
+            return (String) versionClass.getMethod("getVersionString").invoke(null);
         } catch (Exception e) {
             // Should not happen: hibernate not found in the classpath
             throw new RuntimeException(e);
         }
     }
 
-    public static boolean isHibernate6_Plus(){
+    public static boolean isHibernate6_Plus() {
         String version = getHibernateVersion();
         String[] split = version.split("\\.");
         return split[0].compareTo("6") == 0;

hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7Version.java renamed to hibernate7/src/test/java/tools/jackson/datatype/hibernate7/Hibernate7Version.java

@@ -1,17 +1,20 @@
 package tools.jackson.datatype.hibernate7;
 
-public class Hibernate7Version {
-
-    public static String getHibernateVersion(){
+public class Hibernate7Version
+{
+    public static String getHibernateVersion() {
         try {
-            return Class.forName("org.hibernate.Version").getPackage().getImplementationVersion();
+            // Use Version.getVersionString() instead of Package.getImplementationVersion()
+            // because the latter returns null in JPMS/module-info contexts
+            Class<?> versionClass = Class.forName("org.hibernate.Version");
+            return (String) versionClass.getMethod("getVersionString").invoke(null);
         } catch (Exception e) {
             // Should not happen: hibernate not found in the classpath
             throw new RuntimeException(e);
         }
     }
 
-    public static boolean isHibernate7_Plus(){
+    public static boolean isHibernate7_Plus() {
         String version = getHibernateVersion();
         String[] split = version.split("\\.");
         return split[0].compareTo("7") == 0;