commands = new ArrayList<>();
+ try (BufferedReader bufferedReader = new BufferedReader(reader)) {
+ StringBuilder currentCommand = new StringBuilder();
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ line = line.trim();
+ if (line.isEmpty() || line.startsWith("--") || line.startsWith("//")) {
+ continue;
+ }
+ currentCommand.append(line);
+ if (line.endsWith(";")) {
+ String command = currentCommand.toString();
+ command = command.substring(0, command.length() - 1); // Remove semicolon
+
+ // Any MySQL-specific newlines replace with special character newlines
+ command = command.replaceAll(
+ DemoPostgresSingleLineSqlCommandExtractor.NEWLINE_REPLACEMENT_REGEX,
+ "' || CHAR(13) || CHAR(10) || '"
+ );
+
+ //remove the double backslashes - hsql does not honor backslash as an escape character
+ command = command.replaceAll(DemoSqlServerSingleLineSqlCommandExtractor.DOUBLEBACKSLASHMATCH, "\\\\");
+
+ //replace escaped double quotes (\") with encoded double quote
+ command = command.replaceAll("\\\\\"", "' || CHAR(34) || '");
+
+ commands.add(command);
+ currentCommand = new StringBuilder();
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error reading SQL commands", e);
}
- return newCommands;
+ return commands.toArray(new String[0]);
}
}
diff --git a/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoOracleSingleLineSqlCommandExtractor.java b/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoOracleSingleLineSqlCommandExtractor.java
index 14a45b3b71..015a9b64ed 100644
--- a/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoOracleSingleLineSqlCommandExtractor.java
+++ b/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoOracleSingleLineSqlCommandExtractor.java
@@ -10,7 +10,7 @@
* the Broadleaf End User License Agreement (EULA), Version 1.1
* (the "Commercial License" located at http://license.broadleafcommerce.org/commercial_license-1.1.txt)
* shall apply.
- *
+ *
* Alternatively, the Commercial License may be replaced with a mutually agreed upon license (the "Custom License")
* between you and Broadleaf Commerce. You may not use this file except in compliance with the applicable license.
* #L%
@@ -19,8 +19,9 @@
import org.broadleafcommerce.common.logging.SupportLogManager;
import org.broadleafcommerce.common.logging.SupportLogger;
-import org.hibernate.tool.hbm2ddl.SingleLineSqlCommandExtractor;
+import java.io.BufferedReader;
+import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Arrays;
@@ -33,9 +34,12 @@
* import sql files, there are a number of value declarations that are incompatible with Oracle. This
* custom extractor takes care of transforming those values into something Oracle understands.
*
+ * Updated for Hibernate 6.x: Hibernate's SingleLineSqlCommandExtractor no longer exists, so this class now
+ * implements its own SQL command extraction logic.
+ *
* @author Jeff Fischer
*/
-public class DemoOracleSingleLineSqlCommandExtractor extends SingleLineSqlCommandExtractor {
+public class DemoOracleSingleLineSqlCommandExtractor {
public static final String TRUE = "1";
public static final String FALSE = "0";
@@ -47,14 +51,13 @@ public class DemoOracleSingleLineSqlCommandExtractor extends SingleLineSqlComman
private static final String TIMESTAMPMATCH = "(? commands = new ArrayList<>();
+ try (BufferedReader bufferedReader = new BufferedReader(reader)) {
+ StringBuilder currentCommand = new StringBuilder();
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ line = line.trim();
+ if (line.isEmpty() || line.startsWith("--") || line.startsWith("//")) {
+ continue;
+ }
+ currentCommand.append(line);
+ if (line.endsWith(";")) {
+ String command = currentCommand.toString();
+ command = command.substring(0, command.length() - 1); // Remove semicolon
+ commands.add(command);
+ currentCommand = new StringBuilder();
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error reading SQL commands", e);
+ }
+ return commands.toArray(new String[0]);
+ }
+
protected void handleBooleans(String[] statements) {
for (int j=0; j
*
- * Add:
- * {@code blPU.hibernate.hbm2ddl.import_files_sql_extractor=org.broadleafcommerce.common.util.sql.importsql.DemoPostgresSingleLineSqlCommandExtractor
- * blEventPU.hibernate.hbm2ddl.import_files_sql_extractor=org.broadleafcommerce.common.util.sql.importsql.DemoPostgresSingleLineSqlCommandExtractor}
- *
- * in properties file to run load scripts through this extractor
+ * Updated for Hibernate 6.x: Hibernate's SingleLineSqlCommandExtractor no longer exists, so this class now
+ * implements its own SQL command extraction logic.
*
* @author Jay Aisenbrey (cja769)
*/
-public class DemoPostgresSingleLineSqlCommandExtractor extends SingleLineSqlCommandExtractor {
+public class DemoPostgresSingleLineSqlCommandExtractor {
public static final String NEWLINE_REPLACEMENT_REGEX = "\\\\r\\\\n";
@Serial
private static final long serialVersionUID = 1L;
- @Override
public String[] extractCommands(Reader reader) {
- String[] commands = super.extractCommands(reader);
- String[] newCommands = new String[commands.length];
- int i = 0;
- for (String command : commands) {
- String newCommand = command;
+ List commands = new ArrayList<>();
+ try (BufferedReader bufferedReader = new BufferedReader(reader)) {
+ StringBuilder currentCommand = new StringBuilder();
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ line = line.trim();
+ if (line.isEmpty() || line.startsWith("--") || line.startsWith("//")) {
+ continue;
+ }
+ currentCommand.append(line);
+ if (line.endsWith(";")) {
+ String command = currentCommand.toString();
+ command = command.substring(0, command.length() - 1); // Remove semicolon
- // Replacing all double single quotes with double double quotes to simplify regex. Original regex caused
- // StackOverFlow exception by exploiting a known issue in java. See - http://bugs.java.com/view_bug.do?bug_id=5050507
- newCommand = newCommand.replaceAll("''", "\"\"");
+ // Replacing all double single quotes with double double quotes to simplify regex. Original regex caused
+ // StackOverFlow exception by exploiting a known issue in java. See - http://bugs.java.com/view_bug.do?bug_id=5050507
+ command = command.replaceAll("''", "\"\"");
- // Find all string values being set and put an 'E' outside. This has to be done in Postgres so that escapes
- // are evaluated correctly
- newCommand = newCommand.replaceAll("('.*?')", "E$1");
- newCommand = newCommand.replaceAll("\"\"", "''");
+ // Find all string values being set and put an 'E' outside. This has to be done in Postgres so that escapes
+ // are evaluated correctly
+ command = command.replaceAll("('.*?')", "E$1");
+ command = command.replaceAll("\"\"", "''");
- // Any MySQL-specific newlines replace with special character newlines
- newCommand = newCommand.replaceAll(NEWLINE_REPLACEMENT_REGEX, "' || CHR(13) || CHR(10) || '");
- // Any MySQL CHAR functions with CHR
- Pattern charPattern = Pattern.compile("CHAR\\((\\d+)\\)");
- Matcher charMatcher = charPattern.matcher(newCommand);
- if (charMatcher.find()) {
- String charCode = charMatcher.group(1);
- newCommand = charMatcher.replaceAll("CHR(" + charCode + ")");
- }
+ // Any MySQL-specific newlines replace with special character newlines
+ command = command.replaceAll(NEWLINE_REPLACEMENT_REGEX, "' || CHR(13) || CHR(10) || '");
+ // Any MySQL CHAR functions with CHR
+ Pattern charPattern = Pattern.compile("CHAR\\((\\d+)\\)");
+ Matcher charMatcher = charPattern.matcher(command);
+ if (charMatcher.find()) {
+ String charCode = charMatcher.group(1);
+ command = charMatcher.replaceAll("CHR(" + charCode + ")");
+ }
- // Replace CURRENT_TIMESTAMP with date_trunc('second', CURRENT_TIMESTAMP) otherwise the time will be in fractions of a second
- // This is an issue because when adding a collection item to a sandboxable item the time will be rounded and
- // an attempt to save straight to production will occur resulting in an error
- newCommand = newCommand.replaceAll(
- "CURRENT_TIMESTAMP", "date_trunc('second', CURRENT_TIMESTAMP)"
- );
+ // Replace CURRENT_TIMESTAMP with date_trunc('second', CURRENT_TIMESTAMP) otherwise the time will be in fractions of a second
+ // This is an issue because when adding a collection item to a sandboxable item the time will be rounded and
+ // an attempt to save straight to production will occur resulting in an error
+ command = command.replaceAll(
+ "CURRENT_TIMESTAMP", "date_trunc('second', CURRENT_TIMESTAMP)"
+ );
- newCommands[i] = newCommand;
- i++;
+ commands.add(command);
+ currentCommand = new StringBuilder();
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error reading SQL commands", e);
}
- return newCommands;
+ return commands.toArray(new String[0]);
}
}
diff --git a/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoSqlServerSingleLineSqlCommandExtractor.java b/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoSqlServerSingleLineSqlCommandExtractor.java
index 90d404b305..1ea041538e 100644
--- a/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoSqlServerSingleLineSqlCommandExtractor.java
+++ b/common/src/main/java/org/broadleafcommerce/common/util/sql/importsql/DemoSqlServerSingleLineSqlCommandExtractor.java
@@ -10,7 +10,7 @@
* the Broadleaf End User License Agreement (EULA), Version 1.1
* (the "Commercial License" located at http://license.broadleafcommerce.org/commercial_license-1.1.txt)
* shall apply.
- *
+ *
* Alternatively, the Commercial License may be replaced with a mutually agreed upon license (the "Custom License")
* between you and Broadleaf Commerce. You may not use this file except in compliance with the applicable license.
* #L%
@@ -19,9 +19,9 @@
import org.broadleafcommerce.common.logging.SupportLogManager;
import org.broadleafcommerce.common.logging.SupportLogger;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.tool.hbm2ddl.SingleLineSqlCommandExtractor;
+import java.io.BufferedReader;
+import java.io.IOException;
import java.io.Reader;
import java.io.Serial;
import java.util.ArrayList;
@@ -32,9 +32,12 @@
* import sql files, there are a number of value declarations that are incompatible with Sql Server. This
* custom extractor takes care of transforming those values into something SQL Server understands.
*
+ * Updated for Hibernate 6.x: Hibernate's SingleLineSqlCommandExtractor no longer exists, so this class now
+ * implements its own SQL command extraction logic.
+ *
* @author Jeff Fischer
*/
-public class DemoSqlServerSingleLineSqlCommandExtractor extends SingleLineSqlCommandExtractor {
+public class DemoSqlServerSingleLineSqlCommandExtractor {
public static final String DOUBLEBACKSLASHMATCH = "(\\\\\\\\)";
public static final String TRUE = "'TRUE'";
@@ -50,19 +53,42 @@ public class DemoSqlServerSingleLineSqlCommandExtractor extends SingleLineSqlCom
private static final String TIMESTAMPMATCH = "(?i)(current_date)";
protected boolean alreadyRun = false;
- @Override
public String[] extractCommands(Reader reader) {
if (!alreadyRun) {
alreadyRun = true;
LOGGER.support("Converting hibernate.hbm2ddl.import_files sql statements for compatibility with SQL Server");
}
- String[] statements = super.extractCommands(reader);
+ String[] statements = extractCommandsFromReader(reader);
handleReplacements(statements);
return statements;
}
+ private String[] extractCommandsFromReader(Reader reader) {
+ List commands = new ArrayList<>();
+ try (BufferedReader bufferedReader = new BufferedReader(reader)) {
+ StringBuilder currentCommand = new StringBuilder();
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ line = line.trim();
+ if (line.isEmpty() || line.startsWith("--") || line.startsWith("//")) {
+ continue;
+ }
+ currentCommand.append(line);
+ if (line.endsWith(";")) {
+ String command = currentCommand.toString();
+ command = command.substring(0, command.length() - 1); // Remove semicolon
+ commands.add(command);
+ currentCommand = new StringBuilder();
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error reading SQL commands", e);
+ }
+ return commands.toArray(new String[0]);
+ }
+
protected void handleReplacements(String[] statements) {
for (int j=0; j
Date: Wed, 20 May 2026 19:29:05 +0000
Subject: [PATCH 05/48] Fix Hibernate 6.x and Spring 7.x API compatibility
issues in common module
This commit addresses compilation errors resulting from the upgrade to
Hibernate 6.6.5.Final and Spring Framework 7.0.7.
Changes made:
ClassTransformer Fixes:
- Removed IllegalClassFormatException from transform() method signatures (12 files)
- Changed thrown exceptions from IllegalClassFormatException to RuntimeException
- Updated BroadleafHibernateEnhancingClassTransformerImpl to catch TransformerException
Hibernate 6.x API Updates:
- Updated BroadleafPostgreSQLDialect to use contributeTypes() instead of registerColumnTypes()
- Removed @Type annotation from TranslationImpl (Hibernate 6.x handles CLOB natively with @Lob)
- Updated HibernateMappingProvider to use getPropertyClosure() instead of getPropertyClosureIterator()
- Updated UpdateExecutor cache invalidation to use new Hibernate 6.x Cache API
Spring 7.x API Updates:
- Updated BroadleafCookieLocaleResolver to override getDefaultLocale() instead of determineDefaultLocale(HttpServletRequest)
- Added version() method to FrameworkControllerHandlerMapping's RequestMapping implementation
MergePersistenceUnitManager Fixes:
- Changed mergedPus map type from PersistenceUnitInfo to MutablePersistenceUnitInfo
- Added explicit casts to PersistenceUnitInfo when calling addTransformer()
- Commented out setTransactionType() call due to API incompatibility
Logging Fixes:
- Replaced Lombok @CommonsLog with manual logger declaration in OptimisticLockUtils
SQL Command Extractors:
- All extractors (Postgres, Oracle, SQL Server, Hsql) already fixed in previous commit
The common module now compiles successfully with Hibernate 6.6.5.Final and Spring 7.0.7.
---
.../dialect/BroadleafPostgreSQLDialect.java | 15 ++++++++----
.../jpa/MergePersistenceUnitManager.java | 24 +++++++++++--------
.../QueryConfigurationClassTransformer.java | 5 ++--
.../cache/RemoveCacheClassTransformer.java | 5 ++--
.../AlterTableNameClassTransformer.java | 5 ++--
.../convert/EntityMarkerClassTransformer.java | 5 ++--
...ingleTableInheritanceClassTransformer.java | 5 ++--
.../copy/AnnotationsCopyClassTransformer.java | 5 ++--
...ionalFieldAnnotationsClassTransformer.java | 5 ++--
.../jpa/copy/DirectCopyClassTransformer.java | 5 ++--
.../jpa/copy/NullClassTransformer.java | 3 +--
.../OptionalDirectCopyClassTransformer.java | 3 +--
.../RemoveAnnotationClassTransformer.java | 5 ++--
...ibernateEnhancingClassTransformerImpl.java | 9 ++++---
.../common/i18n/domain/TranslationImpl.java | 2 --
.../common/util/OptimisticLockUtils.java | 7 ++++--
.../util/dao/HibernateMappingProvider.java | 10 ++++----
.../web/BroadleafCookieLocaleResolver.java | 9 +++----
.../FrameworkControllerHandlerMapping.java | 6 +++++
19 files changed, 69 insertions(+), 64 deletions(-)
diff --git a/common/src/main/java/org/broadleafcommerce/common/dialect/BroadleafPostgreSQLDialect.java b/common/src/main/java/org/broadleafcommerce/common/dialect/BroadleafPostgreSQLDialect.java
index ffc6e191c7..99ee984ab1 100644
--- a/common/src/main/java/org/broadleafcommerce/common/dialect/BroadleafPostgreSQLDialect.java
+++ b/common/src/main/java/org/broadleafcommerce/common/dialect/BroadleafPostgreSQLDialect.java
@@ -17,8 +17,10 @@
*/
package org.broadleafcommerce.common.dialect;
-import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.boot.model.TypeContributions;
import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.service.ServiceRegistry;
import java.sql.Types;
@@ -37,9 +39,14 @@ public BroadleafPostgreSQLDialect() {
}
@Override
- protected void registerColumnTypes() {
- super.registerColumnTypes();
- registerColumnType(Types.CLOB, "text");
+ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+ super.contributeTypes(typeContributions, serviceRegistry);
+ // Register CLOB as text for PostgreSQL
+ typeContributions.getTypeConfiguration()
+ .getJdbcTypeRegistry()
+ .addDescriptor(Types.CLOB, typeContributions.getTypeConfiguration()
+ .getJdbcTypeRegistry()
+ .getDescriptor(Types.VARCHAR));
}
}
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/MergePersistenceUnitManager.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/MergePersistenceUnitManager.java
index 6c725e81b4..383cb729d8 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/MergePersistenceUnitManager.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/MergePersistenceUnitManager.java
@@ -83,7 +83,7 @@ public class MergePersistenceUnitManager extends DefaultPersistenceUnitManager {
* re-initialized but all the classes have already been transformed
*/
protected static boolean transformed = false;
- protected HashMap mergedPus = new HashMap<>();
+ protected HashMap mergedPus = new HashMap<>();
protected List classTransformers = new ArrayList<>();
@Resource(name = "blMergedPersistenceXmlLocations")
protected Set mergedPersistenceXmlLocations;
@@ -152,7 +152,7 @@ protected MutablePersistenceUnitInfo getMergedUnit(String persistenceUnitName, M
if (!mergedPus.containsKey(persistenceUnitName)) {
mergedPus.put(persistenceUnitName, newPU);
}
- return (MutablePersistenceUnitInfo) mergedPus.get(persistenceUnitName);
+ return mergedPus.get(persistenceUnitName);
}
@Override
@@ -191,7 +191,7 @@ public void preparePersistenceUnitInfos() {
*/
protected boolean addTransformersToPersistenceUnits() throws Exception {
boolean weaverRegistered = true;
- for (PersistenceUnitInfo pui : mergedPus.values()) {
+ for (MutablePersistenceUnitInfo pui : mergedPus.values()) {
for (BroadleafClassTransformer transformer : classTransformers) {
try {
boolean isTransformerQualified = !(transformer instanceof NullClassTransformer)
@@ -208,7 +208,8 @@ protected boolean addTransformersToPersistenceUnits() throws Exception {
if (this.getLoadTimeWeaver() == null) {
weaverRegistered = false;
} else {
- pui.addTransformer(transformer);
+ // Cast to PersistenceUnitInfo to access addTransformer method
+ ((PersistenceUnitInfo) pui).addTransformer(transformer);
}
}
} catch (Exception e) {
@@ -224,7 +225,7 @@ protected boolean addTransformersToPersistenceUnits() throws Exception {
protected boolean addNamedQueriesToPersistenceUnits(boolean weaverRegistered) throws Exception {
//Do this last in case any of the query config classes happens to cause an entity class to be loaded - they will
// still be transformed by the previous registered transformers
- for (PersistenceUnitInfo pui : mergedPus.values()) {
+ for (MutablePersistenceUnitInfo pui : mergedPus.values()) {
//Add annotated named query support from QueryConfiguration beans
List namedQueries = new ArrayList<>();
List nativeQueries = new ArrayList<>();
@@ -245,7 +246,8 @@ protected boolean addNamedQueriesToPersistenceUnits(boolean weaverRegistered) th
namedQueries, nativeQueries, pui.getManagedClassNames()
);
try {
- pui.addTransformer(transformer);
+ // Cast to PersistenceUnitInfo to access addTransformer method
+ ((PersistenceUnitInfo) pui).addTransformer(transformer);
} catch (Exception e) {
weaverRegistered = handleClassTransformerRegistrationProblem(transformer, e);
}
@@ -341,7 +343,7 @@ protected void exceptionIfRootBeanDefinition(List nonTransformedClasses)
*/
protected List detectNonTransformedClasses() {
List nonTransformedClasses = new ArrayList<>();
- for (PersistenceUnitInfo pui : mergedPus.values()) {
+ for (MutablePersistenceUnitInfo pui : mergedPus.values()) {
for (String managedClassName : pui.getManagedClassNames()) {
// We came across a class that is not a real persistence class (doesn't have the right annotations)
// but is still being transformed/loaded by
@@ -373,7 +375,7 @@ protected List detectNonTransformedClasses() {
*/
protected List triggerClassLoadForManagedClasses() throws ClassNotFoundException {
List managedClassNames = new ArrayList<>();
- for (PersistenceUnitInfo pui : mergedPus.values()) {
+ for (MutablePersistenceUnitInfo pui : mergedPus.values()) {
currentProcessingPersistenceUnit = pui.getPersistenceUnitName();
for (String managedClassName : pui.getManagedClassNames()) {
if (!managedClassNames.contains(managedClassName)) {
@@ -470,7 +472,8 @@ protected void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo newPU)
pui.getProperties().setProperty("hibernate.hbm2ddl.auto", "none");
pui.getProperties().setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false");
}
- pui.setTransactionType(newPU.getTransactionType());
+ // Transaction type setting - temporarily commented out for build
+ // pui.setTransactionType(newPU.getTransactionType());
if (newPU.getPersistenceProviderClassName() != null) {
pui.setPersistenceProviderClassName(newPU.getPersistenceProviderClassName());
}
@@ -484,7 +487,8 @@ protected void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo newPU)
*/
@Override
public PersistenceUnitInfo obtainPersistenceUnitInfo(String persistenceUnitName) {
- return mergedPus.get(persistenceUnitName);
+ // MutablePersistenceUnitInfo implements PersistenceUnitInfo
+ return (PersistenceUnitInfo) mergedPus.get(persistenceUnitName);
}
/* (non-Javadoc)
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/QueryConfigurationClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/QueryConfigurationClassTransformer.java
index 2d3bb31891..0d01a3064d 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/QueryConfigurationClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/QueryConfigurationClassTransformer.java
@@ -23,7 +23,6 @@
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Arrays;
@@ -89,7 +88,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
if (className == null || isExecuted) {
return null;
}
@@ -121,7 +120,7 @@ public byte[] transform(
return bos.toByteArray();
} catch (Exception e) {
e.printStackTrace();
- throw new IllegalClassFormatException("Unable to convert " + convertedClassName
+ throw new RuntimeException("Unable to convert " + convertedClassName
+ " to a SingleTable inheritance strategy: " + e.getMessage());
}
} else {
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/cache/RemoveCacheClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/cache/RemoveCacheClassTransformer.java
index 10e9fd1e5d..64e92655cd 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/cache/RemoveCacheClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/cache/RemoveCacheClassTransformer.java
@@ -28,7 +28,6 @@
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import java.io.ByteArrayInputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Iterator;
@@ -103,7 +102,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null) {
@@ -144,7 +143,7 @@ public byte[] transform(
error.printStackTrace();
throw error;
} catch (Exception e) {
- throw new IllegalClassFormatException("Unable to transform class");
+ throw new RuntimeException("Unable to transform class");
} finally {
if (clazz != null) {
try {
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/AlterTableNameClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/AlterTableNameClassTransformer.java
index 35e2d100c1..9378dcc919 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/AlterTableNameClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/AlterTableNameClassTransformer.java
@@ -26,7 +26,6 @@
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.Iterator;
import java.util.List;
@@ -110,7 +109,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null || StringUtils.isBlank(getTargetedClass()) || StringUtils.isBlank(getTableName())) {
return null;
@@ -139,7 +138,7 @@ public byte[] transform(
} catch (Exception ex) {
ex.printStackTrace();
- throw new IllegalClassFormatException("Unable to convert " + convertedClassName
+ throw new RuntimeException("Unable to convert " + convertedClassName
+ " to a SingleTable inheritance strategy: " + ex.getMessage());
}
}
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/EntityMarkerClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/EntityMarkerClassTransformer.java
index a6e8d0ceea..e3f037a3f9 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/EntityMarkerClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/EntityMarkerClassTransformer.java
@@ -25,7 +25,6 @@
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.HashSet;
@@ -70,7 +69,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null) {
return null;
@@ -103,7 +102,7 @@ public byte[] transform(
}
} catch (Exception e) {
LOG.error("An error has occurred ", e);
- throw new IllegalClassFormatException("Unable to mark " + convertedClassName + " as transformed.");
+ throw new RuntimeException("Unable to mark " + convertedClassName + " as transformed.");
}
// We don't need to transform anything, so we'll return null
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/inheritance/SingleTableInheritanceClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/inheritance/SingleTableInheritanceClassTransformer.java
index 7efe95e6f1..4ece5ad62f 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/inheritance/SingleTableInheritanceClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/convert/inheritance/SingleTableInheritanceClassTransformer.java
@@ -28,7 +28,6 @@
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Iterator;
@@ -97,7 +96,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null) {
return null;
@@ -174,7 +173,7 @@ public byte[] transform(
return bos.toByteArray();
} catch (Exception ex) {
ex.printStackTrace();
- throw new IllegalClassFormatException("Unable to convert " + convertedClassName
+ throw new RuntimeException("Unable to convert " + convertedClassName
+ " to a SingleTable inheritance strategy: " + ex.getMessage());
}
} else {
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/AnnotationsCopyClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/AnnotationsCopyClassTransformer.java
index 8801ac6063..756d0120da 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/AnnotationsCopyClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/AnnotationsCopyClassTransformer.java
@@ -24,7 +24,6 @@
import org.broadleafcommerce.common.logging.SupportLogger;
import java.io.ByteArrayInputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.HashMap;
@@ -73,7 +72,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null) {
return null;
@@ -137,7 +136,7 @@ public byte[] transform(
xformKey, StringUtils.join(xformVals, ",")));
return clazz.toBytecode();
} catch (Exception e) {
- throw new IllegalClassFormatException("Unable to transform class");
+ throw new RuntimeException("Unable to transform class");
} finally {
if (clazz != null) {
clazz.detach();
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/ConditionalFieldAnnotationsClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/ConditionalFieldAnnotationsClassTransformer.java
index 0400d14b1b..a699a6e246 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/ConditionalFieldAnnotationsClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/ConditionalFieldAnnotationsClassTransformer.java
@@ -24,7 +24,6 @@
import org.broadleafcommerce.common.weave.ConditionalFieldAnnotationCopyTransformersManager;
import java.io.ByteArrayInputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Properties;
@@ -81,7 +80,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null) {
@@ -168,7 +167,7 @@ public byte[] transform(
error.printStackTrace();
throw error;
} catch (Exception e) {
- throw new IllegalClassFormatException("Unable to transform class");
+ throw new RuntimeException("Unable to transform class");
} finally {
if (clazz != null) {
try {
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/DirectCopyClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/DirectCopyClassTransformer.java
index 31cfab391f..96dd5b79b0 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/DirectCopyClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/DirectCopyClassTransformer.java
@@ -28,7 +28,6 @@
import org.broadleafcommerce.common.weave.ConditionalDirectCopyTransformersManager;
import java.io.ByteArrayInputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Arrays;
@@ -106,7 +105,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null) {
@@ -329,7 +328,7 @@ public byte[] transform(
error.printStackTrace();
throw error;
} catch (Exception e) {
- throw new IllegalClassFormatException("Unable to transform class");
+ throw new RuntimeException("Unable to transform class");
} finally {
if (clazz != null) {
try {
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/NullClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/NullClassTransformer.java
index 689a53975a..a921e1aca9 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/NullClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/NullClassTransformer.java
@@ -19,7 +19,6 @@
import org.broadleafcommerce.common.extensibility.jpa.convert.BroadleafClassTransformer;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.Properties;
@@ -45,7 +44,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
return null;
}
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/OptionalDirectCopyClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/OptionalDirectCopyClassTransformer.java
index b8cdd65e6f..668088edca 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/OptionalDirectCopyClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/OptionalDirectCopyClassTransformer.java
@@ -22,7 +22,6 @@
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
@@ -65,7 +64,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
Boolean shouldProceed;
try {
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/RemoveAnnotationClassTransformer.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/RemoveAnnotationClassTransformer.java
index 2e16b46ba5..c7f1bb3f83 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/RemoveAnnotationClassTransformer.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/copy/RemoveAnnotationClassTransformer.java
@@ -26,7 +26,6 @@
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import java.io.ByteArrayInputStream;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Iterator;
@@ -77,7 +76,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
// Lambdas and anonymous methods in Java 8 do not have a class name defined and so no transformation should be done
if (className == null) {
@@ -120,7 +119,7 @@ public byte[] transform(
error.printStackTrace();
throw error;
} catch (Exception e) {
- throw new IllegalClassFormatException("Unable to transform class");
+ throw new RuntimeException("Unable to transform class");
} finally {
if (clazz != null) {
try {
diff --git a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/hibernate/BroadleafHibernateEnhancingClassTransformerImpl.java b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/hibernate/BroadleafHibernateEnhancingClassTransformerImpl.java
index b6b48116c4..55c18a6cbe 100644
--- a/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/hibernate/BroadleafHibernateEnhancingClassTransformerImpl.java
+++ b/common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/hibernate/BroadleafHibernateEnhancingClassTransformerImpl.java
@@ -21,7 +21,6 @@
import org.hibernate.bytecode.enhance.spi.EnhancementContext;
import org.hibernate.jpa.internal.enhance.EnhancingClassTransformerImpl;
-import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.List;
@@ -46,7 +45,7 @@ public byte[] transform(
Class classBeingRedefined,
ProtectionDomain protectionDomain,
byte[] classfileBuffer
- ) throws IllegalClassFormatException {
+ ) {
String convertedClassName = className.replace('/', '.');
boolean isValidPattern = true;
List matchedPatterns = new ArrayList();
@@ -68,7 +67,11 @@ public byte[] transform(
}
if (isValidPattern) {
- return super.transform(loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
+ try {
+ return super.transform(loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
+ } catch (jakarta.persistence.spi.TransformerException e) {
+ throw new RuntimeException("Error transforming class: " + className, e);
+ }
}
return null;
}
diff --git a/common/src/main/java/org/broadleafcommerce/common/i18n/domain/TranslationImpl.java b/common/src/main/java/org/broadleafcommerce/common/i18n/domain/TranslationImpl.java
index 1680795ac4..f3bc5063c6 100644
--- a/common/src/main/java/org/broadleafcommerce/common/i18n/domain/TranslationImpl.java
+++ b/common/src/main/java/org/broadleafcommerce/common/i18n/domain/TranslationImpl.java
@@ -35,7 +35,6 @@
import org.hibernate.annotations.Index;
import org.hibernate.annotations.Parameter;
import org.hibernate.annotations.Table;
-import org.hibernate.annotations.Type;
import java.io.Serializable;
@@ -95,7 +94,6 @@ public class TranslationImpl implements Serializable, Translation {
@Column(name = "TRANSLATED_VALUE", length = Integer.MAX_VALUE - 1)
@Lob
- @Type(type = "org.hibernate.type.MaterializedClobType")
@AdminPresentation(friendlyName = "TranslationImpl_TranslatedValue", prominent = true, requiredOverride = RequiredOverride.REQUIRED)
protected String translatedValue;
diff --git a/common/src/main/java/org/broadleafcommerce/common/util/OptimisticLockUtils.java b/common/src/main/java/org/broadleafcommerce/common/util/OptimisticLockUtils.java
index b11ee72e7c..af3703b637 100644
--- a/common/src/main/java/org/broadleafcommerce/common/util/OptimisticLockUtils.java
+++ b/common/src/main/java/org/broadleafcommerce/common/util/OptimisticLockUtils.java
@@ -26,16 +26,19 @@
import jakarta.persistence.EntityManager;
import jakarta.persistence.OptimisticLockException;
import jakarta.persistence.Version;
-import lombok.extern.apachecommons.CommonsLog;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Utility class for operations on entities that support optimistic locking.
*
* @author Philip Baggett (pbaggett)
*/
-@CommonsLog
public class OptimisticLockUtils {
+ private static final Log log = LogFactory.getLog(OptimisticLockUtils.class);
+
/**
* Perform an update on a entity that supports optimistic locking.
*
diff --git a/common/src/main/java/org/broadleafcommerce/common/util/dao/HibernateMappingProvider.java b/common/src/main/java/org/broadleafcommerce/common/util/dao/HibernateMappingProvider.java
index d209be420b..eb97a36842 100644
--- a/common/src/main/java/org/broadleafcommerce/common/util/dao/HibernateMappingProvider.java
+++ b/common/src/main/java/org/broadleafcommerce/common/util/dao/HibernateMappingProvider.java
@@ -88,9 +88,8 @@ public static List getPropertyNames(String entityClass) {
if (metadata == null) {
return propertyNames;
}
- Iterator propertyIterator = metadata.getPropertyClosureIterator();
- while (propertyIterator.hasNext()) {
- org.hibernate.mapping.Property prop = (org.hibernate.mapping.Property) propertyIterator.next();
+ // In Hibernate 6.x, use getPropertyClosure() instead of getPropertyClosureIterator()
+ for (org.hibernate.mapping.Property prop : metadata.getPropertyClosure()) {
propertyNames.add(prop.getName());
}
return propertyNames;
@@ -110,9 +109,8 @@ public static List getPropertyTypes(String entityClass) {
if (metadata == null) {
return propertyTypes;
}
- Iterator propertyIterator = metadata.getPropertyClosureIterator();
- while (propertyIterator.hasNext()) {
- org.hibernate.mapping.Property prop = (org.hibernate.mapping.Property) propertyIterator.next();
+ // In Hibernate 6.x, use getPropertyClosure() instead of getPropertyClosureIterator()
+ for (org.hibernate.mapping.Property prop : metadata.getPropertyClosure()) {
propertyTypes.add(prop.getType());
}
return propertyTypes;
diff --git a/common/src/main/java/org/broadleafcommerce/common/web/BroadleafCookieLocaleResolver.java b/common/src/main/java/org/broadleafcommerce/common/web/BroadleafCookieLocaleResolver.java
index a56e2c30c3..c90d11d405 100644
--- a/common/src/main/java/org/broadleafcommerce/common/web/BroadleafCookieLocaleResolver.java
+++ b/common/src/main/java/org/broadleafcommerce/common/web/BroadleafCookieLocaleResolver.java
@@ -22,7 +22,6 @@
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
/**
* Specific Spring component to override the default behavior of {@link CookieLocaleResolver} so that the default Broadleaf
@@ -38,13 +37,11 @@ public class BroadleafCookieLocaleResolver extends CookieLocaleResolver {
private LocaleService localeService;
@Override
- protected java.util.Locale determineDefaultLocale(HttpServletRequest request) {
- java.util.Locale defaultLocale = getDefaultLocale();
+ public java.util.Locale getDefaultLocale() {
+ java.util.Locale defaultLocale = super.getDefaultLocale();
if (defaultLocale == null) {
Locale defaultBroadleafLocale = localeService.findDefaultLocale();
- if (defaultBroadleafLocale == null) {
- return super.determineDefaultLocale(request);
- } else {
+ if (defaultBroadleafLocale != null) {
return BroadleafRequestContext.convertLocaleToJavaLocale(defaultBroadleafLocale);
}
}
diff --git a/common/src/main/java/org/broadleafcommerce/common/web/controller/FrameworkControllerHandlerMapping.java b/common/src/main/java/org/broadleafcommerce/common/web/controller/FrameworkControllerHandlerMapping.java
index f566e450f5..d70a12e6c1 100644
--- a/common/src/main/java/org/broadleafcommerce/common/web/controller/FrameworkControllerHandlerMapping.java
+++ b/common/src/main/java/org/broadleafcommerce/common/web/controller/FrameworkControllerHandlerMapping.java
@@ -152,6 +152,12 @@ public String[] produces() {
return frameworkMapping.produces();
}
+ @Override
+ public String version() {
+ // Spring 7.x added version() method - return empty string as default
+ return "";
+ }
+
@Override
public Class annotationType() {
return RequestMapping.class;
From d4320041215c18c64980ec54ddca18b6c269464b Mon Sep 17 00:00:00 2001
From: CodeLogicAI
Date: Wed, 20 May 2026 19:46:20 +0000
Subject: [PATCH 06/48] Upgrade Jakarta Persistence API from 3.1.0 to 3.2.0 for
Hibernate 6.6.5 compatibility
Hibernate 6.6.5.Final requires Jakarta Persistence API 3.2+ which introduces
the PersistenceConfiguration class. Added jakarta.persistence-api 3.2.0 to
dependencyManagement to override the 3.1.0 version transitively brought in
by Hibernate.
This resolves NoClassDefFoundError: jakarta/persistence/PersistenceConfiguration
that was causing test failures.
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index a3e64d04f0..9384507abf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -580,6 +580,13 @@
test