From 9417ac26a3bba2e1aa1282aa8d934283912f6aa1 Mon Sep 17 00:00:00 2001 From: Amit Pandey Date: Tue, 6 Feb 2024 01:53:13 +0530 Subject: [PATCH] [JAVA-31115] Upgrade read-only-transactions to latest Hibernate and Spring Boot 3(#15814) --- persistence-modules/querydsl/pom.xml | 3 ++- .../com/baeldung/dao/PersonDaoIntegrationTest.java | 6 +++--- .../querydsl/intro/QueryDSLIntegrationTest.java | 4 ++-- persistence-modules/read-only-transactions/pom.xml | 8 ++++---- .../com/baeldung/readonlytransactions/h2/Book.java | 10 +++++----- .../baeldung/readonlytransactions/h2/BookService.java | 2 +- .../com/baeldung/readonlytransactions/h2/Config.java | 2 +- .../readonlytransactions/h2/TransactionConfig.java | 2 +- .../readonlytransactions/mysql/dao/MyRepoJPA.java | 6 +++--- .../readonlytransactions/mysql/entities/Book.java | 10 +++++----- .../readonlytransactions/mysql/spring/Config.java | 2 +- .../mysql/spring/entities/BookEntity.java | 10 +++++----- .../mysql/spring/repositories/BookRepository.java | 2 +- .../JPATransactionIntegrationTest.java | 4 ++-- .../SpringTransactionReadOnlyIntegrationTest.java | 4 ++-- 15 files changed, 38 insertions(+), 37 deletions(-) diff --git a/persistence-modules/querydsl/pom.xml b/persistence-modules/querydsl/pom.xml index 921d45815a..72cdb3a48a 100644 --- a/persistence-modules/querydsl/pom.xml +++ b/persistence-modules/querydsl/pom.xml @@ -33,7 +33,7 @@ org.hibernate hibernate-core - ${hibernate.version} + ${hibernate-core.version} compile @@ -131,6 +131,7 @@ 1.6 1.4 1.1.3 + 6.4.2.Final \ No newline at end of file diff --git a/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java b/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java index 879b4238db..b7e7871db2 100644 --- a/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java +++ b/persistence-modules/querydsl/src/test/java/com/baeldung/dao/PersonDaoIntegrationTest.java @@ -11,7 +11,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import junit.framework.Assert; +import org.junit.Assert; @ContextConfiguration("/test-context.xml") @RunWith(SpringJUnit4ClassRunner.class) @@ -64,7 +64,7 @@ public class PersonDaoIntegrationTest { personDao.save(new Person("Kent", "Zivago", 30)); final int maxAge = personDao.findMaxAge(); - Assert.assertTrue(maxAge == 35); + Assert.assertEquals(35, maxAge); } @Test @@ -74,7 +74,7 @@ public class PersonDaoIntegrationTest { personDao.save(new Person("Kent", "Zivago", 30)); final Map maxAge = personDao.findMaxAgeByName(); - Assert.assertTrue(maxAge.size() == 2); + Assert.assertEquals(2, maxAge.size()); Assert.assertSame(35, maxAge.get("Ralph")); Assert.assertSame(30, maxAge.get("Kent")); } diff --git a/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java b/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java index 29d49d114d..639638a82a 100644 --- a/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java +++ b/persistence-modules/querydsl/src/test/java/com/baeldung/querydsl/intro/QueryDSLIntegrationTest.java @@ -122,10 +122,10 @@ public class QueryDSLIntegrationTest { .fetch(); assertEquals("Hello World!", userTitleCounts.get(0).get(blogPost.title)); - assertEquals(new Long(2), userTitleCounts.get(0).get(count)); + assertEquals(Long.valueOf(2), userTitleCounts.get(0).get(count)); assertEquals("My Second Post", userTitleCounts.get(1).get(blogPost.title)); - assertEquals(new Long(1), userTitleCounts.get(1).get(count)); + assertEquals(Long.valueOf(1), userTitleCounts.get(1).get(count)); } diff --git a/persistence-modules/read-only-transactions/pom.xml b/persistence-modules/read-only-transactions/pom.xml index c485a0d2a8..a7eb3085e1 100644 --- a/persistence-modules/read-only-transactions/pom.xml +++ b/persistence-modules/read-only-transactions/pom.xml @@ -43,7 +43,7 @@ ${mysql.version} - org.hibernate + org.hibernate.orm hibernate-core ${hibernate.version} @@ -69,9 +69,9 @@ 8.2.0 4.0.3 - 5.6.1.Final - 2.6.1 - 5.3.13 + 6.4.2.Final + 3.2.2 + 6.0.16 5.8.2 2.1.214 diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java index 000859a201..b09ee1d6b1 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Book.java @@ -1,10 +1,10 @@ package com.baeldung.readonlytransactions.h2; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "book") diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java index 0ecbc4a0d4..c2f54a05af 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/BookService.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; @Service public class BookService { diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java index 2e661a9651..82f2046dbb 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/Config.java @@ -11,7 +11,7 @@ import com.zaxxer.hikari.HikariDataSource; import java.util.Properties; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; @Configuration diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java index 62abb85edd..1d25433afa 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/h2/TransactionConfig.java @@ -7,7 +7,7 @@ import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; @Configuration @EnableTransactionManagement diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java index 727e88219f..d93a1faac3 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/dao/MyRepoJPA.java @@ -7,9 +7,9 @@ import com.baeldung.readonlytransactions.mysql.entities.Book; import java.util.SplittableRandom; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; public class MyRepoJPA extends BaseRepo { diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java index 405cc9c2c2..91b3e672bf 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/entities/Book.java @@ -1,10 +1,10 @@ package com.baeldung.readonlytransactions.mysql.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "book") diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java index abaa63b197..87d5921e09 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/Config.java @@ -18,7 +18,7 @@ import com.zaxxer.hikari.HikariDataSource; import java.util.Properties; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; @Configuration diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java index 87c8988a8d..10e157308f 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/entities/BookEntity.java @@ -1,10 +1,10 @@ package com.baeldung.readonlytransactions.mysql.spring.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "book") diff --git a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java index 2cc61c016d..8de8cac083 100644 --- a/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java +++ b/persistence-modules/read-only-transactions/src/main/java/com/baeldung/readonlytransactions/mysql/spring/repositories/BookRepository.java @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import com.baeldung.readonlytransactions.mysql.spring.ReaderDS; import com.baeldung.readonlytransactions.mysql.spring.entities.BookEntity; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; public interface BookRepository extends JpaRepository { diff --git a/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java index a15651b273..547cebe022 100644 --- a/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java +++ b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/JPATransactionIntegrationTest.java @@ -21,8 +21,8 @@ import com.baeldung.readonlytransactions.mysql.spring.ReadOnlyInterception; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; @ExtendWith(SpringExtension.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class, initializers = JPATransactionIntegrationTest.TestConfig.class, classes = { ReadOnlyInterception.class }) diff --git a/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java index 2f5fd66140..ce45b8a466 100644 --- a/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java +++ b/persistence-modules/read-only-transactions/src/test/java/com/baeldung/readonlytransactions/SpringTransactionReadOnlyIntegrationTest.java @@ -21,8 +21,8 @@ import com.baeldung.readonlytransactions.h2.BookService; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; @ExtendWith(SpringExtension.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class, initializers = SpringTransactionReadOnlyIntegrationTest.TestConfig.class, classes = { BookService.class })