Upgrade Hibernate version and adjust dependencies

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/page/domain/PageFieldImpl.java

@@ -28,7 +28,6 @@
 import org.broadleafcommerce.openadmin.audit.AdminAuditableListener;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -86,7 +85,6 @@ public class PageFieldImpl implements PageField, ProfileEntity {
 
     @Column(name = "LOB_VALUE", length = Integer.MAX_VALUE-1)
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
     @AdminPresentation
     protected String lobValue;
 

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/page/domain/PageItemCriteriaImpl.java

@@ -28,7 +28,6 @@
 import org.broadleafcommerce.common.presentation.client.VisibilityEnum;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -80,7 +79,6 @@ public class PageItemCriteriaImpl implements PageItemCriteria, ProfileEntity {
     protected Integer quantity;
 
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
     @Column(name = "ORDER_ITEM_MATCH_RULE", length = Integer.MAX_VALUE - 1)
     @AdminPresentation(friendlyName = "PageItemCriteriaImpl_Order_Item_Match_Rule",
             group = "PageItemCriteriaImpl_Description", visibility = VisibilityEnum.HIDDEN_ALL)

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/page/domain/PageRuleImpl.java

@@ -25,7 +25,6 @@
 import org.broadleafcommerce.common.extensibility.jpa.copy.ProfileEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -66,7 +65,6 @@ public class PageRuleImpl implements PageRule, ProfileEntity {
     protected Long id;
 
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
     @Column(name = "MATCH_RULE", length = Integer.MAX_VALUE - 1)
     protected String matchRule;
 

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/structure/domain/StructuredContentFieldImpl.java

@@ -27,7 +27,6 @@
 import org.broadleafcommerce.openadmin.audit.AdminAuditableListener;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -80,7 +79,6 @@ public class StructuredContentFieldImpl implements StructuredContentField, Profi
     @AdminPresentation
     @Column (name = "LOB_VALUE", length = Integer.MAX_VALUE - 1)
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
     protected String lobValue;
 
     @Override

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/structure/domain/StructuredContentItemCriteriaImpl.java

@@ -30,7 +30,6 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -86,7 +85,6 @@ public class StructuredContentItemCriteriaImpl
     protected Integer quantity;
 
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
     @Column(name = "ORDER_ITEM_MATCH_RULE", length = Integer.MAX_VALUE - 1)
     @AdminPresentation(friendlyName = "StructuredContentItemCriteriaImpl_Order_Item_Match_Rule",
             group = "StructuredContentItemCriteriaImpl_Description",

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/structure/domain/StructuredContentRuleImpl.java

@@ -27,7 +27,6 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -69,7 +68,6 @@ public class StructuredContentRuleImpl implements StructuredContentRule, Profile
     protected Long id;
 
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
     @Column(name = "MATCH_RULE", length = Integer.MAX_VALUE - 1)
     protected String matchRule;
 

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/dao/DynamicEntityDao.java

@@ -28,7 +28,6 @@
 import org.broadleafcommerce.openadmin.dto.TabMetadata;
 import org.broadleafcommerce.openadmin.server.dao.provider.metadata.FieldMetadataProvider;
 import org.broadleafcommerce.openadmin.server.service.persistence.module.FieldManager;
-import org.hibernate.Criteria;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.type.Type;
 
@@ -119,8 +118,6 @@ public interface DynamicEntityDao {
 
     List<String> getPropertyNames(Class<?> entityClass);
 
-    Criteria createCriteria(Class<?> entityClass);
-
     Field[] getAllFields(Class<?> targetClass);
 
     Metadata getMetadata();

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/dao/DynamicEntityDaoImpl.java

@@ -49,7 +49,6 @@
 import org.broadleafcommerce.openadmin.server.service.persistence.module.FieldManager;
 import org.broadleafcommerce.openadmin.server.service.persistence.validation.FieldNamePropertyValidator;
 import org.broadleafcommerce.openadmin.server.service.type.MetadataProviderResponse;
-import org.hibernate.Criteria;
 import org.hibernate.MappingException;
 import org.hibernate.Session;
 import org.hibernate.mapping.PersistentClass;
@@ -157,11 +156,6 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
         this.applicationContext = applicationContext;
     }
 
-    @Override
-    public Criteria createCriteria(Class<?> entityClass) {
-        return getStandardEntityManager().unwrap(Session.class).createCriteria(entityClass);
-    }
-
     @Override
     public <T> T persist(T entity) {
         standardEntityManager.persist(entity);
@@ -1101,12 +1095,10 @@ protected Map<String, FieldMetadata> getPropertiesForEntityClass(
         propertyTypes.add(idType);
 
         PersistentClass persistentClass = getPersistentClass(targetClass.getName());
-        Iterator testIter = persistentClass.getPropertyIterator();
         List<Property> propertyList = new ArrayList<>();
 
         //check the properties for problems
-        while (testIter.hasNext()) {
-            Property property = (Property) testIter.next();
+        for (Property property : persistentClass.getPropertyClosure()) {
             if (property.getName().contains(".")) {
                 throw new IllegalArgumentException("Properties from entities that utilize a period character ('.') in their name are incompatible with this system. The property name in question is: (" + property.getName() + ") from the class: (" + targetClass.getName() + ")");
             }
@@ -1677,11 +1669,9 @@ protected void buildComponentProperties(
             property = persistentClass.getProperty(prefix + propertyName);
         }
 
-        Iterator componentPropertyIterator = ((org.hibernate.mapping.Component) property.getValue()).getPropertyIterator();
         List<Property> componentPropertyList = new ArrayList<>();
-
-        while (componentPropertyIterator.hasNext()) {
-            componentPropertyList.add((Property) componentPropertyIterator.next());
+        for (Property componentProperty : ((org.hibernate.mapping.Component) property.getValue()).getProperties()) {
+            componentPropertyList.add(componentProperty);
         }
 
         Map<String, FieldMetadata> newFields = new HashMap<>();

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/dao/provider/metadata/DefaultFieldMetadataProvider.java

@@ -40,7 +40,6 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.engine.jdbc.Size;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
@@ -173,15 +172,17 @@ public MetadataProviderResponse addMetadataFromMappingData(
             Column column = null;
             for (Property property : addMetadataFromMappingDataRequest.getComponentProperties()) {
                 if (property.getName().equals(addMetadataFromMappingDataRequest.getPropertyName())) {
-                    Object columnObject = property.getColumnIterator().next();
-                    if (columnObject instanceof Column) {
-                        column = (Column) columnObject;
+                    if (!property.getColumns().isEmpty()) {
+                        Object columnObject = property.getColumns().get(0);
+                        if (columnObject instanceof Column) {
+                            column = (Column) columnObject;
+                        }
                     }
                     break;
                 }
             }
             if (column != null) {
-                fieldMetadata.setLength(column.getLength());
+                fieldMetadata.setLength(column.getLength().intValue());
                 fieldMetadata.setScale(column.getScale());
                 fieldMetadata.setPrecision(column.getPrecision());
                 fieldMetadata.setRequired(!column.isNullable());

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/dao/provider/metadata/MapFieldsFieldMetadataProvider.java

@@ -35,10 +35,7 @@
 import org.broadleafcommerce.openadmin.server.dao.provider.metadata.request.OverrideViaXmlRequest;
 import org.broadleafcommerce.openadmin.server.service.persistence.module.FieldManager;
 import org.broadleafcommerce.openadmin.server.service.type.MetadataProviderResponse;
-import org.hibernate.internal.TypeLocatorImpl;
 import org.hibernate.type.Type;
-import org.hibernate.type.TypeFactory;
-import org.hibernate.type.TypeResolver;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -126,20 +123,23 @@ public MetadataProviderResponse addMetadataFromFieldType(AddMetadataFromFieldTyp
         for (Map.Entry<String, FieldMetadata> entry : addMetadataFromFieldTypeRequest.getPresentationAttributes().entrySet()) {
             if (entry.getKey().startsWith(addMetadataFromFieldTypeRequest.getRequestedPropertyName() + FieldManager.MAPFIELDSEPARATOR)) {
                 TypeConfiguration typeConfiguration = new TypeConfiguration();
-                TypeFactory typeFactory = new TypeFactory(typeConfiguration);
-                TypeLocatorImpl typeLocator = new TypeLocatorImpl(new TypeResolver(typeConfiguration, typeFactory));
 
                 Type myType = null;
                 //first, check if an explicit type was declared
                 String valueClass = ((BasicFieldMetadata) entry.getValue()).getMapFieldValueClass();
                 if (valueClass != null) {
-                    myType = typeLocator.entity(valueClass);
+                    try {
+                        // Try to resolve as an entity type
+                        myType = typeConfiguration.getBasicTypeRegistry().getRegisteredType(valueClass);
+                    } catch (Exception e) {
+                        // Ignore, will try other methods
+                    }
                 }
                 if (myType == null) {
                     SupportedFieldType fieldType = ((BasicFieldMetadata) entry.getValue()).getExplicitFieldType();
                     Class<?> basicJavaType = getBasicJavaType(fieldType);
                     if (basicJavaType != null) {
-                        myType = typeLocator.basic(basicJavaType);
+                        myType = typeConfiguration.getBasicTypeRegistry().getRegisteredType(basicJavaType);
                     }
                 }
                 if (myType == null) {
@@ -149,7 +149,11 @@ public MetadataProviderResponse addMetadataFromFieldType(AddMetadataFromFieldTyp
                         Class<?> clazz = (Class<?>) pType.getActualTypeArguments()[1];
                         Class<?>[] entities = addMetadataFromFieldTypeRequest.getDynamicEntityDao().getAllPolymorphicEntitiesFromCeiling(clazz);
                         if (!ArrayUtils.isEmpty(entities)) {
-                            myType = typeLocator.entity(entities[entities.length-1]);
+                            try {
+                                myType = typeConfiguration.getBasicTypeRegistry().getRegisteredType(entities[entities.length-1]);
+                            } catch (Exception e) {
+                                // Ignore, will fail later with better error message
+                            }
                         }
                     }
                 }

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/criteria/CriteriaTranslatorImpl.java

@@ -26,7 +26,7 @@
 import org.broadleafcommerce.openadmin.server.security.remote.SecurityVerifier;
 import org.broadleafcommerce.openadmin.server.security.service.RowLevelSecurityService;
 import org.broadleafcommerce.openadmin.server.service.persistence.module.EmptyFilterValues;
-import org.hibernate.type.SingleColumnType;
+import org.hibernate.type.BasicType;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
@@ -133,7 +133,7 @@ public TypedQuery<Serializable> translateQuery(
             if (idMetaData != null) {
                 Object idFldName = idMetaData.get("name");
                 Object type = idMetaData.get("type");
-                if ((idFldName instanceof String) && (type instanceof SingleColumnType)) {
+                if ((idFldName instanceof String) && (type instanceof BasicType)) {
                     criteria.orderBy(criteriaBuilder.asc(original.get((String) idFldName)));
                 }
             }

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/criteria/FieldPathBuilder.java

@@ -20,14 +20,12 @@
 import org.apache.commons.lang3.StringUtils;
 import org.broadleafcommerce.common.util.dao.DynamicDaoHelper;
 import org.broadleafcommerce.common.util.dao.DynamicDaoHelperImpl;
-import org.hibernate.internal.SessionFactoryImpl;
-import org.hibernate.query.criteria.internal.CriteriaBuilderImpl;
-import org.hibernate.query.criteria.internal.path.PluralAttributePath;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import jakarta.persistence.Embeddable;
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.From;
@@ -37,6 +35,7 @@
 import jakarta.persistence.metamodel.Attribute;
 import jakarta.persistence.metamodel.ManagedType;
 import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.PluralAttribute;
 
 /**
  * @author Jeff Fischer
@@ -47,6 +46,7 @@ public class FieldPathBuilder {
 
     protected CriteriaQuery criteria;
     protected List<Predicate> restrictions;
+    protected EntityManager entityManager;
 
     public FieldPath getFieldPath(From root, String fullPropertyName) {
         String[] pieces = fullPropertyName.split("\\.");
@@ -56,10 +56,16 @@ public FieldPath getFieldPath(From root, String fullPropertyName) {
         for (String piece : pieces) {
             checkPiece: {
                 if (j == 0) {
-                    Path path = root.get(piece);
-                    if (path instanceof PluralAttributePath) {
-                        associationPath.add(piece);
-                        break checkPiece;
+                    try {
+                        if (root.getModel() instanceof ManagedType) {
+                            Attribute<?, ?> attribute = ((ManagedType<?>) root.getModel()).getAttribute(piece);
+                            if (attribute instanceof PluralAttribute) {
+                                associationPath.add(piece);
+                                break checkPiece;
+                            }
+                        }
+                    } catch (IllegalArgumentException e) {
+                        // Attribute doesn't exist, treat as basic property
                     }
                 }
                 basicProperties.add(piece);
@@ -98,8 +104,7 @@ public Path getPath(From root, FieldPath fieldPath, final CriteriaBuilder builde
                 // We weren't able to resolve the requested piece, likely because it's in a polymoprhic version
                 // of the path we're currently on. Let's see if there's any polymoprhic version of our class to
                 // use instead.
-                SessionFactoryImpl em = ((CriteriaBuilderImpl) builder).getEntityManagerFactory();
-                Metamodel mm = em.getMetamodel();
+                Metamodel mm = entityManager.getMetamodel();
                 boolean found = false;
 
                 Class<?>[] polyClasses = dynamicDaoHelper.getAllPolymorphicEntitiesFromCeiling(
@@ -127,7 +132,13 @@ public Path getPath(From root, FieldPath fieldPath, final CriteriaBuilder builde
                 }
             }
 
-            if (path.getParentPath() != null && path.getParentPath().getJavaType().isAnnotationPresent(Embeddable.class) && path instanceof PluralAttributePath) {
+            boolean isPlural = false;
+            try {
+                isPlural = path.getModel() instanceof PluralAttribute;
+            } catch (IllegalStateException e) {
+                // Path doesn't have a model, skip check
+            }
+            if (path.getParentPath() != null && path.getParentPath().getJavaType().isAnnotationPresent(Embeddable.class) && isPlural) {
                 //We need a workaround for this problem until it is resolved in Hibernate (loosely related to and likely resolved by https://hibernate.atlassian.net/browse/HHH-8802)
                 //We'll throw a specialized exception (and handle in an alternate flow for calls from BasicPersistenceModule)
                 throw new CriteriaConversionException(String.format("Unable to create a JPA criteria Path through an @Embeddable object to a collection that resides therein (%s)", fieldPath.getTargetProperty()), fieldPath);
@@ -164,4 +175,12 @@ public void setRestrictions(List<Predicate> restrictions) {
         this.restrictions = restrictions;
     }
 
+    public EntityManager getEntityManager() {
+        return entityManager;
+    }
+
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
 }

common/pom.xml

@@ -313,8 +313,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <optional>true</optional>
+            <artifactId>log4j-to-slf4j</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -479,9 +478,9 @@
             <artifactId>javassist</artifactId>
         </dependency>
         <dependency>
-            <groupId>jakarta.cache</groupId>
-            <artifactId>jakarta.cache-api</artifactId>
-            <version>3.0.0</version>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
+            <version>1.1.0</version>
         </dependency>
     </dependencies>
 </project>

common/src/main/java/org/broadleafcommerce/common/config/domain/AbstractModuleConfiguration.java

@@ -72,6 +72,7 @@ public abstract class AbstractModuleConfiguration implements ModuleConfiguration
 
     @Id
     @GeneratedValue(generator = "ModuleConfigurationId")
+    @SuppressWarnings("removal")
     @GenericGenerator(
             name = "ModuleConfigurationId",
             strategy="org.broadleafcommerce.common.persistence.IdOverrideTableGenerator",

common/src/main/java/org/broadleafcommerce/common/config/domain/SystemPropertyImpl.java

@@ -69,6 +69,7 @@ public class SystemPropertyImpl implements SystemProperty, AdminMainEntity, Syst
 
     @Id
     @GeneratedValue(generator = "SystemPropertyId")
+    @SuppressWarnings("removal")
     @GenericGenerator(
             name = "SystemPropertyId",
             strategy="org.broadleafcommerce.common.persistence.IdOverrideTableGenerator",