[JAVA-31115] Upgrade read-only-transactions to latest Hibernate and Spring Boot 3(#15814)

This commit is contained in:
Amit Pandey 2024-02-06 01:53:13 +05:30 committed by GitHub
parent 2de2d80c81
commit 9417ac26a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 38 additions and 37 deletions

View File

@ -33,7 +33,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
<version>${hibernate-core.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -131,6 +131,7 @@
<commons-pool.version>1.6</commons-pool.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
<hibernate-core.version>6.4.2.Final</hibernate-core.version>
</properties>
</project>

View File

@ -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<String, Integer> 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"));
}

View File

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

View File

@ -43,7 +43,7 @@
<version>${mysql.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
</dependency>
@ -69,9 +69,9 @@
<properties>
<mysql.version>8.2.0</mysql.version>
<hikari.version>4.0.3</hikari.version>
<hibernate.version>5.6.1.Final</hibernate.version>
<spring-boot.version>2.6.1</spring-boot.version>
<spring-test.version>5.3.13</spring-test.version>
<hibernate.version>6.4.2.Final</hibernate.version>
<spring-boot.version>3.2.2</spring-boot.version>
<spring-test.version>6.0.16</spring-test.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<h2.version>2.1.214</h2.version>
</properties>

View File

@ -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")

View File

@ -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 {

View File

@ -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

View File

@ -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

View File

@ -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 {

View File

@ -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")

View File

@ -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

View File

@ -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")

View File

@ -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<BookEntity, Long> {

View File

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

View File

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