Fixes for PersistentCollectionSerializer

Author: mshima

hibernate5/src/main/java/com/fasterxml/jackson/datatype/hibernate5/Hibernate5Version.java

@@ -0,0 +1,38 @@
+package com.fasterxml.jackson.datatype.hibernate5;
+
+public class Hibernate5Version {
+
+    public static String getHibernateVersion(){
+        try {
+            return Class.forName("org.hibernate.Version").getPackage().getImplementationVersion();
+        } catch (Exception e) {
+            // Should not happen: hibernate not found in the classpath
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static boolean isHibernate5_2_Plus(){
+        String version = getHibernateVersion();
+        String[] split = version.split("\\.");
+        int isV5 = split[0].compareTo("5");
+        if(isV5 != 0){
+            return isV5 > 0;
+        }
+        int isV52 = split[1].compareTo("2");
+        return isV52 >= 0;
+    }
+
+    public static Class<?> getTransactionCoordinatorClass() {
+        try {
+            return Class.forName("org.hibernate.resource.transaction.TransactionCoordinator");
+        } catch (ClassNotFoundException e) {
+            try {
+                return Class.forName("org.hibernate.resource.transaction.spi.TransactionCoordinator");
+            } catch (Exception e2) {
+                // should never happen
+                throw new RuntimeException(e); 
+            }
+        }
+    }
+
+}

hibernate5/src/main/java/com/fasterxml/jackson/datatype/hibernate5/PersistentCollectionSerializer.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.datatype.hibernate5;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -340,9 +341,7 @@ private void initializeCollection(PersistentCollection coll, Session session) {
 //                .getTransactionFactory()
 //                .compatibleWithJtaSynchronization();
         //Above is removed after Hibernate 5
-        boolean isJTA = ((SessionImplementor) session).getTransactionCoordinator()
-                .getTransactionCoordinatorBuilder()
-                .isJta();
+        boolean isJTA = SessionReader.isJTA(session);
 
         if (!isJTA) {
             session.beginTransaction();
@@ -422,4 +421,55 @@ private Object convertToMap(Map<?, ?> value) {
     private Object convertToSet(Set<?> value) {
         return new HashSet<>(value);
     }
+    
+    protected static class SessionReader {
+        
+        /**
+         *  Return changed from org.hibernate.resource.transaction.TransactionCoordinator
+         *  to org.hibernate.resource.transaction.spi.TransactionCoordinator 
+         */
+        protected static final Method getTransactionCoordinatorMethod;
+        /**
+         *  Return changed from org.hibernate.resource.transaction.TransactionCoordinatorBuilder
+         *  to org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder 
+         */
+        protected static final Method getTransactionCoordinatorBuilderMethod;
+        /**
+         *  Class changed from org.hibernate.resource.transaction.TransactionCoordinatorBuilder
+         *  to org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder 
+         */
+        protected static final Method isJtaMethod;
+        
+        static {
+            try {
+                getTransactionCoordinatorMethod = SessionImplementor.class.getMethod("getTransactionCoordinator");
+            } catch (Exception e) {
+                // should never happen: the class and method exists in all versions of hibernate 5
+                throw new RuntimeException(e); 
+            }
+            try{
+                getTransactionCoordinatorBuilderMethod = Hibernate5Version.getTransactionCoordinatorClass().getMethod("getTransactionCoordinatorBuilder");
+            } catch (Exception e) {
+                // should never happen
+                throw new RuntimeException(e); 
+            }
+            try{
+                isJtaMethod = Hibernate5Version.getTransactionCoordinatorClass().getMethod("isJta");
+            } catch (Exception e) {
+                // should never happen
+                throw new RuntimeException(e); 
+            }
+        }
+        
+        public static boolean isJTA(Session session) {
+            try {
+                Object transactionCoordinator = getTransactionCoordinatorMethod.invoke(session);
+                Object transactionCoordinatorBuilder = getTransactionCoordinatorBuilderMethod.invoke(transactionCoordinator);
+                return (boolean) isJtaMethod.invoke(transactionCoordinatorBuilder);
+            } catch (Exception e) {
+                // Should never happen
+                throw new RuntimeException(e);
+            }
+        }
+    }
 }

hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/BaseTest.java

@@ -10,7 +10,10 @@ public abstract class BaseTest extends junit.framework.TestCase
 {
     protected BaseTest() {
     	try {
-			Logger.getLogger(this.getClass()).info("Testing using hibernate " + Class.forName("org.hibernate.Version").getMethod("getVersionString").invoke(null));
+    		System.out.println(Hibernate5Version.getHibernateVersion());
+    		System.out.println(Hibernate5Version.isHibernate5_2_Plus());
+			Logger.getLogger(this.getClass()).info("Testing using hibernate " + Hibernate5Version.getHibernateVersion() +
+					", is 5.2+: " + Hibernate5Version.isHibernate5_2_Plus());
 		} catch (Exception e) {
 			// Should not happen
 			throw new RuntimeException(e);