Upgrade to Hibernate 7.2, Spring Framework 7 and Spring Data JPA 4

vladmihalcea · vladmihalcea · commit 7c0c4c77bbdc · 2025-12-03T16:54:52.000+02:00
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/concurrency/LockModePessimisticReadWriteTest.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/concurrency/LockModePessimisticReadWriteTest.java
@@ -121,7 +121,8 @@ public void testPessimisticWriteAfterFetchWithDetachedForHibernate() {
         });
         doInJPA(entityManager -> {
             LOGGER.info("Lock and reattach");
-            entityManager.unwrap(Session.class).lock(post, LockMode.PESSIMISTIC_WRITE);
+            Post mergedPost = entityManager.merge(post);
+            entityManager.unwrap(Session.class).lock(mergedPost, LockMode.PESSIMISTIC_WRITE);
             post.setTitle("High-Performance Hibernate");
         });
     }
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/connection/DataSourceProxyConnectionProvider.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/connection/DataSourceProxyConnectionProvider.java
@@ -2,15 +2,15 @@
 
 import net.ttddyy.dsproxy.listener.logging.SLF4JQueryLoggingListener;
 import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder;
-import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider;
 
 import javax.sql.DataSource;
 import java.util.Map;
 
 /**
  * @author Vlad Mihalcea
  */
-public class DataSourceProxyConnectionProvider extends DatasourceConnectionProviderImpl {
+public class DataSourceProxyConnectionProvider extends DataSourceConnectionProvider {
 
     @Override
     public void configure(Map configValues) {
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/connection/DriverManagerConnectionProviderTest.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/connection/DriverManagerConnectionProviderTest.java
@@ -2,7 +2,7 @@
 
 import com.vladmihalcea.hpjp.util.providers.DataSourceProvider;
 import com.vladmihalcea.hpjp.util.providers.SQLServerDataSourceProvider;
-import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.junit.jupiter.api.Test;
 
@@ -34,7 +34,7 @@ protected void appendDriverProperties(Properties properties) {
 
     @Override
     public Class<? extends ConnectionProvider> expectedConnectionProviderClass() {
-        return DriverManagerConnectionProviderImpl.class;
+        return DriverManagerConnectionProvider.class;
     }
 
     @Test
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/connection/JPADataSourceConnectionProviderTest.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/connection/JPADataSourceConnectionProviderTest.java
@@ -1,7 +1,7 @@
 package com.vladmihalcea.hpjp.hibernate.connection;
 
 import com.vladmihalcea.hpjp.util.PersistenceUnitInfoImpl;
-import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 
 import java.util.Properties;
@@ -14,7 +14,7 @@ protected void appendDriverProperties(Properties properties) {
 
     @Override
     public Class<? extends ConnectionProvider> expectedConnectionProviderClass() {
-        return DatasourceConnectionProviderImpl.class;
+        return DataSourceConnectionProvider.class;
     }
 
     @Override
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/identifier/HiloPooledDefaultSwitchTest.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/identifier/HiloPooledDefaultSwitchTest.java
@@ -32,7 +32,7 @@ public void testDefaultSwitch() {
                 fail("Should have thrown MappingException");
             } catch (Exception e) {
                 assertEquals(
-                    "The increment size of the [post_sequence] sequence is set to [3] in the entity mapping while the associated database sequence increment size is [1].",
+                    "The increment size of the [post_sequence] sequence is set to [3] in the entity mapping but the mapped database sequence increment size is [1]",
                     ExceptionUtil.rootCause(e).getMessage()
                 );
             }
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/inheritance/spring/service/CampaignServiceImpl.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/inheritance/spring/service/CampaignServiceImpl.java
@@ -3,11 +3,11 @@
 import com.vladmihalcea.hpjp.hibernate.inheritance.spring.dao.SubscriberDAO;
 import com.vladmihalcea.hpjp.hibernate.inheritance.spring.model.Subscriber;
 import com.vladmihalcea.hpjp.hibernate.inheritance.spring.service.sender.CampaignSender;
+import jakarta.annotation.PostConstruct;
 import jakarta.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/multitenancy/CatalogMultitenancyTest.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/multitenancy/CatalogMultitenancyTest.java
@@ -9,7 +9,8 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
-import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider;
+import org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider;
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
@@ -85,7 +86,7 @@ private void addTenantConnectionProvider(String tenantId) {
     }
     
     private void addTenantConnectionProvider(String tenantId, DataSource tenantDataSource, Map<String, Object> properties) {
-        DatasourceConnectionProviderImpl connectionProvider = new DatasourceConnectionProviderImpl();
+        DataSourceConnectionProvider connectionProvider = new DataSourceConnectionProvider();
         connectionProvider.setDataSource(tenantDataSource);
         connectionProvider.configure(properties);
         MultiTenantConnectionProvider.INSTANCE.getConnectionProviderMap().put(
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/hibernate/multitenancy/SchemaMultitenancyTest.java b/core/src/test/java/com/vladmihalcea/hpjp/hibernate/multitenancy/SchemaMultitenancyTest.java
@@ -7,7 +7,7 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
-import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider;
 import org.junit.jupiter.api.Test;
 import org.postgresql.ds.PGSimpleDataSource;
 
@@ -94,7 +94,7 @@ private void addTenantConnectionProvider(String tenantId) {
     }
     
     private void addTenantConnectionProvider(String tenantId, DataSource tenantDataSource, Map<String, Object> properties) {
-        DatasourceConnectionProviderImpl connectionProvider = new DatasourceConnectionProviderImpl();
+        DataSourceConnectionProvider connectionProvider = new DataSourceConnectionProvider();
         connectionProvider.setDataSource(tenantDataSource);
         connectionProvider.configure(properties);
         MultiTenantConnectionProvider.INSTANCE.getConnectionProviderMap().put(
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/spring/data/bytecode/SpringDataJPARuntimeBytecodeEnhancementTest.java b/core/src/test/java/com/vladmihalcea/hpjp/spring/data/bytecode/SpringDataJPARuntimeBytecodeEnhancementTest.java
@@ -4,6 +4,7 @@
 import com.vladmihalcea.hpjp.spring.common.AbstractSpringTest;
 import com.vladmihalcea.hpjp.spring.data.bytecode.config.SpringDataJPARuntimeBytecodeEnhancementConfiguration;
 import com.vladmihalcea.hpjp.spring.data.bytecode.repository.AttachmentRepository;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -13,6 +14,7 @@
 /**
  * @author Vlad Mihalcea
  */
+@Disabled
 @ContextConfiguration(classes = SpringDataJPARuntimeBytecodeEnhancementConfiguration.class)
 public class SpringDataJPARuntimeBytecodeEnhancementTest extends AbstractSpringTest {
 
@@ -29,7 +31,17 @@ protected Class<?>[] entities() {
     /*
      * Run like this:
      *
-     * java -Djavaagent=d:/.m2/repository/org/springframework/spring-instrument/6.2.14/spring-instrument-6.2.14.jar
+    <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin.version}</version>
+        <configuration>
+            <argLine>-javaagent:d:/.m2/repository/org/springframework/spring-instrument/6.2.14/spring-instrument-6.2.14.jar</argLine>
+            <systemPropertyVariables>
+                <hibernate.testing.bytecode.enhancement.extension.engine.enabled>true</hibernate.testing.bytecode.enhancement.extension.engine.enabled>
+            </systemPropertyVariables>
+        </configuration>
+    </plugin>
      */
     @Test
     public void test() throws URISyntaxException {
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/spring/data/bytecode/config/SpringDataJPARuntimeBytecodeEnhancementConfiguration.java b/core/src/test/java/com/vladmihalcea/hpjp/spring/data/bytecode/config/SpringDataJPARuntimeBytecodeEnhancementConfiguration.java
@@ -32,14 +32,13 @@ protected String packageToScan() {
     }
 
     public Database database() {
-        return Database.MYSQL;
+        return Database.POSTGRESQL;
     }
 
     @Override
     protected void additionalProperties(Properties properties) {
         super.additionalProperties(properties);
         properties.put("hibernate.jdbc.batch_size", "100");
         properties.put("hibernate.order_inserts", "true");
-        properties.put(BytecodeSettings.ENHANCER_ENABLE_DIRTY_TRACKING, "false");
     }
 }
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/spring/transaction/hibernate/config/HibernateTransactionManagerConfiguration.java b/core/src/test/java/com/vladmihalcea/hpjp/spring/transaction/hibernate/config/HibernateTransactionManagerConfiguration.java
@@ -19,8 +19,8 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.orm.hibernate5.HibernateTransactionManager;
-import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
+import org.springframework.orm.jpa.hibernate.HibernateTransactionManager;
+import org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.support.TransactionTemplate;
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/spring/transaction/hibernate/config/MonitoringHibernateTransactionManager.java b/core/src/test/java/com/vladmihalcea/hpjp/spring/transaction/hibernate/config/MonitoringHibernateTransactionManager.java
@@ -5,7 +5,7 @@
 import org.hibernate.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.jpa.hibernate.HibernateTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 
 import java.util.concurrent.atomic.LongAdder;
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/spring/transaction/jta/atomikos/AtomikosJTATransactionManagerTest.java b/core/src/test/java/com/vladmihalcea/hpjp/spring/transaction/jta/atomikos/AtomikosJTATransactionManagerTest.java
@@ -24,7 +24,7 @@
  * @author Vlad Mihalcea
  */
 @ContextConfiguration(classes = AtomikosJTATransactionManagerConfiguration.class)
-public class AromikosJTATransactionManagerTest extends AbstractSpringTest {
+public class AtomikosJTATransactionManagerTest extends AbstractSpringTest {
 
     @Autowired
     private ForumService forumService;
diff --git a/core/src/test/java/com/vladmihalcea/hpjp/util/AbstractTest.java b/core/src/test/java/com/vladmihalcea/hpjp/util/AbstractTest.java
@@ -26,7 +26,13 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cache.internal.EnabledCaching;
+import org.hibernate.cache.internal.QueryResultsCacheImpl;
 import org.hibernate.cache.jcache.internal.JCacheAccessImpl;
+import org.hibernate.cache.spi.CacheImplementor;
+import org.hibernate.cache.spi.QueryResultsCache;
+import org.hibernate.cache.spi.QueryResultsRegion;
+import org.hibernate.cache.spi.Region;
 import org.hibernate.cache.spi.entry.CollectionCacheEntry;
 import org.hibernate.cache.spi.entry.StandardCacheEntryImpl;
 import org.hibernate.cache.spi.support.*;
@@ -1103,18 +1109,12 @@ protected void printCacheRegionStatistics(String region) {
     private void printCacheRegionStatisticsEntries(String regionName) {
         SessionFactory sessionFactory = sessionFactory();
         Statistics statistics = sessionFactory.getStatistics();
-        if (sessionFactory.getSessionFactoryOptions().isQueryCacheEnabled()) {
-            ReflectionUtils.invokeMethod(statistics, "getQueryRegionStats", "default-query-results-region");
-        }
 
-        CacheRegionStatistics cacheRegionStatistics = "default-query-results-region".equals(regionName) ?
-            statistics.getQueryRegionStatistics(regionName) :
-            statistics.getDomainDataRegionStatistics(regionName);
+        CacheRegionStatistics cacheRegionStatistics = statistics.getCacheRegionStatistics(regionName);
 
         if (cacheRegionStatistics != null) {
-            AbstractRegion region = ReflectionUtils.getFieldValue(cacheRegionStatistics, "region");
-
-            StorageAccess storageAccess = getStorageAccess(region);
+            CacheImplementor cacheImplementor = ReflectionUtils.getFieldValue(statistics, "cache");
+            StorageAccess storageAccess = getStorageAccess(cacheImplementor, regionName);
             org.ehcache.core.Ehcache cache = getEhcache(storageAccess);
 
             if (cache != null) {
@@ -1214,16 +1214,20 @@ private org.ehcache.core.Ehcache getEhcache(StorageAccess storageAccess) {
         return ReflectionUtils.getFieldValue(cacheHolder, "ehCache");
     }
 
-
-    private StorageAccess getStorageAccess(AbstractRegion region) {
-        if (region instanceof DirectAccessRegionTemplate) {
-            DirectAccessRegionTemplate directAccessRegionTemplate = (DirectAccessRegionTemplate) region;
-            return directAccessRegionTemplate.getStorageAccess();
-        } else if (region instanceof DomainDataRegionTemplate) {
-            DomainDataRegionTemplate domainDataRegionTemplate = (DomainDataRegionTemplate) region;
-            return domainDataRegionTemplate.getCacheStorageAccess();
+    private StorageAccess getStorageAccess(CacheImplementor cacheImplementor, String regionName) {
+        Region cacheRegion = null;
+        Region region = cacheImplementor.getRegion(regionName);
+        if(region instanceof DomainDataRegionImpl) {
+            cacheRegion = region;
+        }
+        if (regionName.equals("default-query-results-region")) {
+            QueryResultsCache queryResultsCache = cacheImplementor.getDefaultQueryResultsCache();
+            cacheRegion = queryResultsCache.getRegion();
+        }
+        if (cacheRegion != null) {
+            return ReflectionUtils.getFieldValue(cacheRegion, "storageAccess");
         }
-        throw new IllegalArgumentException("Unsupported region: " + region);
+        throw new IllegalArgumentException("Unsupported region: " + regionName);
     }
 
     public static String stringValue(Object value) {
diff --git a/pom.xml b/pom.xml
@@ -89,6 +89,10 @@
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -425,6 +429,20 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -501,7 +519,7 @@
         <logback.version>1.5.6</logback.version>
         <commons-lang.version>3.17.0</commons-lang.version>
         <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
-        <hibernate.version>7.1.10.Final</hibernate.version>
+        <hibernate.version>7.2.0.CR3</hibernate.version>
         <hibernate.validator.version>6.2.5.Final</hibernate.validator.version>
         <javassist.version>3.18.1-GA</javassist.version>
         <ehcache.version>3.10.8</ehcache.version>
@@ -530,8 +548,8 @@
         <flexy-pool.version>3.1.0</flexy-pool.version>
 
         <aspectj.version>1.9.19</aspectj.version>
-        <spring.version>6.2.13</spring.version>
-        <spring-data.version>3.5.6</spring-data.version>
+        <spring.version>7.0.1</spring.version>
+        <spring-data.version>4.0.0</spring-data.version>
 
         <jackson.version>2.14.3</jackson.version>
 
@@ -543,7 +561,7 @@
 
         <hypersistence-optimizer.version>2.8.1</hypersistence-optimizer.version>
 
-        <junit.version>5.13.4</junit.version>
+        <junit.version>6.0.1</junit.version>
 
         <antlr.version>4.13.1</antlr.version>
     </properties>
@@ -575,6 +593,9 @@
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <argLine>${argLine}</argLine>
+                    <systemPropertyVariables>
+                        <hibernate.testing.bytecode.enhancement.extension.engine.enabled>true</hibernate.testing.bytecode.enhancement.extension.engine.enabled>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void testDefaultSwitch() {`
`32`	`32`	`fail("Should have thrown MappingException");`
`33`	`33`	`} catch (Exception e) {`
`34`	`34`	`assertEquals(`
`35`		`- "The increment size of the [post_sequence] sequence is set to [3] in the entity mapping while the associated database sequence increment size is [1].",`
	`35`	`+ "The increment size of the [post_sequence] sequence is set to [3] in the entity mapping but the mapped database sequence increment size is [1]",`
`36`	`36`	`ExceptionUtil.rootCause(e).getMessage()`
`37`	`37`	`);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,13 @@ protected String packageToScan() {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public Database database() {`
`35`		`- return Database.MYSQL;`
	`35`	`+ return Database.POSTGRESQL;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
`39`	`39`	`protected void additionalProperties(Properties properties) {`
`40`	`40`	`super.additionalProperties(properties);`
`41`	`41`	`properties.put("hibernate.jdbc.batch_size", "100");`
`42`	`42`	`properties.put("hibernate.order_inserts", "true");`
`43`		`- properties.put(BytecodeSettings.ENHANCER_ENABLE_DIRTY_TRACKING, "false");`
`44`	`43`	`}`
`45`	`44`	`}`