some code that only needed reflection in Hibernate5

Author: pjfanning

hibernate6/src/main/java/com/fasterxml/jackson/datatype/hibernate6/Hibernate6ProxySerializer.java

@@ -8,7 +8,7 @@
 
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.proxy.pojo.BasicLazyInitializer;
@@ -301,47 +301,12 @@ static String getIdentifierPropertyName(LazyInitializer init) {
         }
     }
 
-    /**
-     * Hibernate 5.2 broke abi compatibility of org.hibernate.proxy.LazyInitializer.getSession()
-     * The api contract changed
-     * from org.hibernate.proxy.LazyInitializer.getSession()Lorg.hibernate.engine.spi.SessionImplementor;
-     * to org.hibernate.proxy.LazyInitializer.getSession()Lorg.hibernate.engine.spi.SharedSessionContractImplementor
-     * 
-     * On hibernate 5.2 the interface SessionImplementor extends SharedSessionContractImplementor.
-     * And an instance of org.hibernate.internal.SessionImpl is returned from getSession().
-     */
     protected static class ProxySessionReader {
-    	
-    	/**
-    	 * The getSession method must be executed using reflection for compatibility purpose.
-    	 * For efficiency keep the method cached.
-    	 */
-        protected static final Method lazyInitializerGetSessionMethod;
-        
-        static {
-            try {
-                lazyInitializerGetSessionMethod = LazyInitializer.class.getMethod("getSession");
-            } catch (Exception e) {
-                // should never happen: the class and method exists in all versions of hibernate 5
-                throw new RuntimeException(e); 
-            }
-        }
-        
         static String getIdentifierPropertyName(LazyInitializer init) {
-            final Object session;
-            try{
-                session = lazyInitializerGetSessionMethod.invoke(init);
-            } catch (Exception e) {
-                // Should never happen
-                throw new RuntimeException(e);
-            }
-            if(session instanceof SessionImplementor){
-            	SessionFactoryImplementor factory = ((SessionImplementor)session).getFactory();
-            	return factory.getIdentifierPropertyName(init.getEntityName());
-            }else if (session != null) {
-                // Should never happen: session should be an instance of org.hibernate.internal.SessionImpl
-                // factory = session.getClass().getMethod("getFactory").invoke(session);
-                throw new RuntimeException("Session is not instance of SessionImplementor");
+            final SharedSessionContractImplementor session = init.getSession();
+            if (session != null) {
+                SessionFactoryImplementor factory = session.getFactory();
+                return factory.getIdentifierPropertyName(init.getEntityName());
             }
             return null;
         }

hibernate7/src/main/java/com/fasterxml/jackson/datatype/hibernate7/Hibernate7Module.java

@@ -1,10 +1,10 @@
 package com.fasterxml.jackson.datatype.hibernate7;
 
 import org.hibernate.SessionFactory;
+import org.hibernate.type.MappingContext;
 
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import org.hibernate.type.MappingContext;
 
 public class Hibernate7Module extends com.fasterxml.jackson.databind.Module
 {

hibernate7/src/main/java/com/fasterxml/jackson/datatype/hibernate7/Hibernate7ProxySerializer.java

@@ -8,9 +8,11 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.proxy.pojo.BasicLazyInitializer;
+import org.hibernate.type.MappingContext;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
@@ -25,7 +27,6 @@
 import com.fasterxml.jackson.databind.util.NameTransformer;
 
 import jakarta.persistence.EntityNotFoundException;
-import org.hibernate.type.MappingContext;
 
 /**
  * Serializer to use for values proxied using {@link HibernateProxy}.
@@ -300,48 +301,13 @@ static String getIdentifierPropertyName(LazyInitializer init) {
             }
         }
     }
-    
-    /**
-     * Hibernate 5.2 broke abi compatibility of org.hibernate.proxy.LazyInitializer.getSession()
-     * The api contract changed
-     * from org.hibernate.proxy.LazyInitializer.getSession()Lorg.hibernate.engine.spi.SessionImplementor;
-     * to org.hibernate.proxy.LazyInitializer.getSession()Lorg.hibernate.engine.spi.SharedSessionContractImplementor
-     * 
-     * On hibernate 5.2 the interface SessionImplementor extends SharedSessionContractImplementor.
-     * And an instance of org.hibernate.internal.SessionImpl is returned from getSession().
-     */
+
     protected static class ProxySessionReader {
-    	
-    	/**
-    	 * The getSession method must be executed using reflection for compatibility purpose.
-    	 * For efficiency keep the method cached.
-    	 */
-        protected static final Method lazyInitializerGetSessionMethod;
-        
-        static {
-            try {
-                lazyInitializerGetSessionMethod = LazyInitializer.class.getMethod("getSession");
-            } catch (Exception e) {
-                // should never happen: the class and method exists in all versions of hibernate 5
-                throw new RuntimeException(e); 
-            }
-        }
-        
         static String getIdentifierPropertyName(LazyInitializer init) {
-            final Object session;
-            try{
-                session = lazyInitializerGetSessionMethod.invoke(init);
-            } catch (Exception e) {
-                // Should never happen
-                throw new RuntimeException(e);
-            }
-            if(session instanceof SessionImplementor){
-            	SessionFactoryImplementor factory = ((SessionImplementor)session).getFactory();
-            	return factory.getIdentifierPropertyName(init.getEntityName());
-            }else if (session != null) {
-                // Should never happen: session should be an instance of org.hibernate.internal.SessionImpl
-                // factory = session.getClass().getMethod("getFactory").invoke(session);
-                throw new RuntimeException("Session is not instance of SessionImplementor");
+            final SharedSessionContractImplementor session = init.getSession();
+            if (session != null) {
+                SessionFactoryImplementor factory = session.getFactory();
+                return factory.getIdentifierPropertyName(init.getEntityName());
             }
             return null;
         }