Update spring core to v7

admin/broadleaf-admin-functional-tests/pom.xml

@@ -111,5 +111,15 @@
             <artifactId>junit</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opentest4j</groupId>
+            <artifactId>opentest4j</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/admin/web/controller/AdminMultipartUploadConfig.java

@@ -20,9 +20,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.broadleafcommerce.common.config.PostAutoConfigurationImport;
-import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.servlet.autoconfigure.MultipartAutoConfiguration;
+import org.springframework.boot.servlet.autoconfigure.MultipartProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/admin/web/controller/NonAutoconfigMultiPartConfiguration.java

@@ -19,7 +19,7 @@
 
 import org.broadleafcommerce.common.config.PostAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
+import org.springframework.boot.servlet.autoconfigure.MultipartAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 import org.springframework.web.multipart.MultipartResolver;

admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/file/service/StaticAssetStorageServiceImpl.java

@@ -43,7 +43,7 @@
 import org.broadleafcommerce.openadmin.server.service.artifact.image.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties;
+import org.springframework.boot.servlet.autoconfigure.MultipartProperties;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -86,7 +86,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

@@ -80,7 +80,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

@@ -66,7 +66,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

@@ -80,7 +80,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

@@ -86,7 +86,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

@@ -69,7 +69,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-contentmanagement-module/src/main/resources/META-INF/persistence-cms.xml

@@ -66,7 +66,6 @@
             <property name="hibernate.generate_statistics" value="false" />
             <property name="hibernate.archive.autodetection" value="false" />
             <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
-            <property name="hibernate.id.new_generator_mappings" value="true"/>
             <property name="hibernate.id.optimizer.pooled.prefer_lo" value="true"/>
             <property name="hibernate.jdbc.log.warnings" value="false"/>
         </properties>

admin/broadleaf-contentmanagement-module/src/main/resources/bl-cms-contentClient-applicationContext.xml

@@ -45,6 +45,8 @@
         <property name="jpaVendorAdapter" ref="blJpaVendorAdapter"/>
         <property name="persistenceUnitManager" ref="blPersistenceUnitManager" />
         <property name="persistenceUnitName" value="blCMSStorage"/>
+        <!-- Spring 7.x: Set entityManagerFactoryInterface to plain EntityManagerFactory to avoid conflict with Spring's EntityManagerFactoryInfo mixin -->
+        <property name="entityManagerFactoryInterface" value="jakarta.persistence.EntityManagerFactory"/>
     </bean>
 
     <bean id="blTransactionManagerAssetStorageInfo" class="org.springframework.orm.jpa.JpaTransactionManager">

admin/broadleaf-open-admin-platform/pom.xml

@@ -172,6 +172,11 @@
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-webmvc</artifactId>
+            <version>${spring.boot.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-jpeg</artifactId>

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,7 +1095,7 @@ protected Map<String, FieldMetadata> getPropertiesForEntityClass(
         propertyTypes.add(idType);
 
         PersistentClass persistentClass = getPersistentClass(targetClass.getName());
-        Iterator testIter = persistentClass.getPropertyIterator();
+        Iterator<Property> testIter = persistentClass.getProperties().iterator();
         List<Property> propertyList = new ArrayList<>();
 
         //check the properties for problems

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

@@ -52,6 +52,7 @@
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -173,15 +174,18 @@ 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;
+                    Iterator<?> columnIterator = property.getColumns().iterator();
+                    if (columnIterator.hasNext()) {
+                        Object columnObject = columnIterator.next();
+                        if (columnObject instanceof Column) {
+                            column = (Column) columnObject;
+                        }
                     }
                     break;
                 }
             }
             if (column != null) {
-                fieldMetadata.setLength(column.getLength());
+                fieldMetadata.setLength(column.getLength() != null ? column.getLength().intValue() : null);
                 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,10 @@
 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.SessionFactory;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.metamodel.model.domain.JpaMetamodel;
 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;
@@ -125,38 +125,55 @@ public MetadataProviderResponse addMetadataFromFieldType(AddMetadataFromFieldTyp
         //look for any map field metadata that was previously added for the requested field
         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));
+                SessionFactory sessionFactory = addMetadataFromFieldTypeRequest.getDynamicEntityDao()
+                        .getStandardEntityManager().getEntityManagerFactory().unwrap(SessionFactory.class);
+                TypeConfiguration typeConfiguration = ((SessionFactoryImplementor) sessionFactory).getTypeConfiguration();
 
                 Type myType = null;
+                String typeName = null;
+
                 //first, check if an explicit type was declared
                 String valueClass = ((BasicFieldMetadata) entry.getValue()).getMapFieldValueClass();
                 if (valueClass != null) {
-                    myType = typeLocator.entity(valueClass);
+                    typeName = valueClass;
                 }
-                if (myType == null) {
+                if (typeName == null) {
                     SupportedFieldType fieldType = ((BasicFieldMetadata) entry.getValue()).getExplicitFieldType();
                     Class<?> basicJavaType = getBasicJavaType(fieldType);
                     if (basicJavaType != null) {
-                        myType = typeLocator.basic(basicJavaType);
+                        typeName = basicJavaType.getName();
                     }
                 }
-                if (myType == null) {
+                if (typeName == null) {
                     java.lang.reflect.Type genericType = addMetadataFromFieldTypeRequest.getRequestedField().getGenericType();
                     if (genericType instanceof ParameterizedType) {
                         ParameterizedType pType = (ParameterizedType) genericType;
                         Class<?> clazz = (Class<?>) pType.getActualTypeArguments()[1];
                         Class<?>[] entities = addMetadataFromFieldTypeRequest.getDynamicEntityDao().getAllPolymorphicEntitiesFromCeiling(clazz);
                         if (!ArrayUtils.isEmpty(entities)) {
-                            myType = typeLocator.entity(entities[entities.length-1]);
+                            typeName = entities[entities.length-1].getName();
                         }
                     }
                 }
-                if (myType == null) {
+                if (typeName == null) {
                     throw new IllegalArgumentException("Unable to establish the type for the property (" + entry
                             .getKey() + ")");
                 }
+
+                // Get the Hibernate Type for the resolved type name
+                try {
+                    myType = typeConfiguration.getBasicTypeRegistry().getRegisteredType(typeName);
+                    if (myType == null) {
+                        // Try as entity type
+                        JpaMetamodel metamodel = (JpaMetamodel) sessionFactory.getMetamodel();
+                        metamodel.entity(Class.forName(typeName));
+                        // If we get here, it's an entity type - use a placeholder
+                        myType = typeConfiguration.getBasicTypeRegistry().getRegisteredType("string");
+                    }
+                } catch (Exception e) {
+                    LOG.warn("Unable to resolve type for: " + typeName + ", using string type as fallback", e);
+                    myType = typeConfiguration.getBasicTypeRegistry().getRegisteredType("string");
+                }
                 //add property for this map field as if it was a normal field
                 super.addMetadataFromFieldType(new AddMetadataFromFieldTypeRequest(addMetadataFromFieldTypeRequest.getRequestedField(),
                         addMetadataFromFieldTypeRequest.getTargetClass(),

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)));
                 }
             }