improve SessionImpl.unwrap()

Author: gavinking

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -153,7 +153,6 @@
 import jakarta.persistence.CacheRetrieveMode;
 import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.EntityGraph;
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.FindOption;
 import jakarta.persistence.FlushModeType;
@@ -2949,27 +2948,18 @@ public ProcedureCall createStoredProcedureQuery(String procedureName, String...
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T unwrap(Class<T> clazz) {
+	public <T> T unwrap(Class<T> type) {
 		checkOpen();
 
-		if ( Session.class.isAssignableFrom( clazz ) ) {
-			return (T) this;
+		if ( type.isInstance( this ) ) {
+			return type.cast( this );
 		}
-		if ( SessionImplementor.class.isAssignableFrom( clazz ) ) {
-			return (T) this;
-		}
-		if ( SharedSessionContractImplementor.class.isAssignableFrom( clazz ) ) {
-			return (T) this;
-		}
-		if ( EntityManager.class.isAssignableFrom( clazz ) ) {
-			return (T) this;
-		}
-		if ( PersistenceContext.class.isAssignableFrom( clazz ) ) {
-			return (T) this;
+
+		if ( type.isInstance( persistenceContext ) ) {
+			return type.cast( persistenceContext );
 		}
 
-		throw new PersistenceException( "Hibernate cannot unwrap " + clazz );
+		throw new PersistenceException( "Hibernate cannot unwrap EntityManager as '" + type.getName() + "'" );
 	}
 
 	@Override