hibernate 6 migration

java/code/src/com/redhat/rhn/common/hibernate/AbstractConnectionManager.java

@@ -26,7 +26,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.metadata.ClassMetadata;
+import jakarta.persistence.metamodel.Metamodel;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -105,20 +105,13 @@ public boolean isTransactionPending() {
         return info.getTransaction() != null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
-    public ClassMetadata getMetadata(Object target) {
+    public Metamodel getMetadata(Object target) {
         if (target == null) {
             return null;
         }
 
-        if (target instanceof Class) {
-            return sessionFactory.getClassMetadata((Class<?>) target);
-        }
-
-        return sessionFactory.getClassMetadata(target.getClass());
+        return sessionFactory.getMetamodel();
     }
 
     /**

java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java

@@ -16,7 +16,8 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
-import org.hibernate.metadata.ClassMetadata;
+
+import jakarta.persistence.metamodel.Metamodel;
 
 import java.util.Optional;
 
@@ -54,29 +55,32 @@ public interface ConnectionManager {
 
     /**
      * Check if this connection manager has already been initialized.
-
-     * @return true if {@link #initialize()} has been called and the session factory is available.
+     * 
+     * @return true if {@link #initialize()} has been called and the session
+     * factory is available.
      */
     boolean isInitialized();
 
     /**
      * Allow loading hbm.xml files from additional locations.
      *
-     * @param additionalLocation the array of package names to be added to the scan.
+     * @param additionalLocation the array of package names to be added to the
+     * scan.
      */
     void setAdditionalPackageNames(String[] additionalLocation);
 
     /**
      * Set the name for Prometheus Hiberante Statistics collector
      *
-     * @param componentName The component name for collector registration, used for metric label value
+     * @param componentName The component name for collector registration, used
+     * for metric label value
      */
     void setComponentName(String componentName);
 
     /**
-     * Returns Hibernate session stored in ThreadLocal storage. If not
-     * present, creates a new one and stores it in ThreadLocal; creating the
-     * session also begins a transaction implicitly.
+     * Returns Hibernate session stored in ThreadLocal storage. If not present,
+     * creates a new one and stores it in ThreadLocal; creating the session also
+     * begins a transaction implicitly.
      * @return Session asked for
      */
     Session getSession();
@@ -113,7 +117,7 @@ public interface ConnectionManager {
      * @param target an object instance or a class to retrieve the metadata for
      * @return the {@link ClassMetadata} for the given object.
      */
-    ClassMetadata getMetadata(Object target);
+    Metamodel getMetadata(Object target);
 
     /**
      * Closes Hibernate Session stored in ThreadLocal storage.