From a28abb7d2ed49a09d8decbaf46914f8b3a7aec3a Mon Sep 17 00:00:00 2001 From: Harry9656 Date: Wed, 6 Mar 2024 21:53:45 +0100 Subject: [PATCH] [JAVA-28954] Migrate spring-data-jpa-enterprise-2 module to parent-boot-3. (#16054) --- .../spring-data-jpa-enterprise-2/pom.xml | 13 +++++++++++-- .../baeldung/elementcollection/model/Employee.java | 10 +++++----- .../com/baeldung/elementcollection/model/Phone.java | 2 +- .../repository/EmployeeRepository.java | 8 ++++---- .../java/com/baeldung/namingstrategy/Person.java | 4 ++-- .../QuotedLowerCaseNamingStrategy.java | 4 ++-- .../QuotedUpperCaseNamingStrategy.java | 4 ++-- .../UnquotedLowerCaseNamingStrategy.java | 4 ++-- .../UnquotedUpperCaseNamingStrategy.java | 4 ++-- ...tedLowerCaseNamingStrategyH2IntegrationTest.java | 9 ++++----- ...otedLowerCaseNamingStrategyPostgresLiveTest.java | 9 ++++----- ...tedUpperCaseNamingStrategyH2IntegrationTest.java | 9 ++++----- ...otedUpperCaseNamingStrategyPostgresLiveTest.java | 12 +++++------- ...ringPhysicalNamingStrategyH2IntegrationTest.java | 9 ++++----- ...pringPhysicalNamingStrategyPostgresLiveTest.java | 9 ++++----- ...tedLowerCaseNamingStrategyH2IntegrationTest.java | 9 ++++----- ...otedLowerCaseNamingStrategyPostgresLiveTest.java | 11 +++++------ ...tedUpperCaseNamingStrategyH2IntegrationTest.java | 9 ++++----- ...otedUpperCaseNamingStrategyPostgresLiveTest.java | 9 ++++----- ...-physical-naming-strategy-on-postgres.properties | 6 +----- .../spring-physical-naming-strategy.properties | 6 +----- 21 files changed, 75 insertions(+), 85 deletions(-) diff --git a/persistence-modules/spring-data-jpa-enterprise-2/pom.xml b/persistence-modules/spring-data-jpa-enterprise-2/pom.xml index f35ee378d1..2f3bf36bcc 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/pom.xml +++ b/persistence-modules/spring-data-jpa-enterprise-2/pom.xml @@ -8,9 +8,9 @@ com.baeldung - parent-boot-2 + parent-boot-3 0.0.1-SNAPSHOT - ../../parent-boot-2 + ../../parent-boot-3 @@ -26,6 +26,11 @@ com.h2database h2 + + org.postgresql + postgresql + runtime + com.google.guava guava @@ -33,4 +38,8 @@ + + com.baeldung.Application + + \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Employee.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Employee.java index 9bc0663016..a733a8cbf0 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Employee.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Employee.java @@ -3,11 +3,11 @@ package com.baeldung.elementcollection.model; import java.util.List; import java.util.Objects; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; @Entity public class Employee { diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Phone.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Phone.java index 15d05aea98..03db37dcff 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Phone.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/model/Phone.java @@ -2,7 +2,7 @@ package com.baeldung.elementcollection.model; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Phone { diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/repository/EmployeeRepository.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/repository/EmployeeRepository.java index 996cac7cd9..142ae68291 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/repository/EmployeeRepository.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/elementcollection/repository/EmployeeRepository.java @@ -3,15 +3,15 @@ package com.baeldung.elementcollection.repository; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import com.baeldung.elementcollection.model.Employee; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + @Repository public class EmployeeRepository { diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/Person.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/Person.java index 35dd2dc226..cbd230f1ef 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/Person.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/Person.java @@ -1,7 +1,7 @@ package com.baeldung.namingstrategy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Person { diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategy.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategy.java index 16b01e50e3..31f24c7e26 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategy.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategy.java @@ -1,10 +1,10 @@ package com.baeldung.namingstrategy; +import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy; -public class QuotedLowerCaseNamingStrategy extends SpringPhysicalNamingStrategy { +public class QuotedLowerCaseNamingStrategy extends CamelCaseToUnderscoresNamingStrategy { @Override protected Identifier getIdentifier(String name, boolean quoted, JdbcEnvironment jdbcEnvironment) { return new Identifier(name.toLowerCase(), true); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategy.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategy.java index 3cb62aa5a2..bc1b6c2535 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategy.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategy.java @@ -1,10 +1,10 @@ package com.baeldung.namingstrategy; +import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy; -public class QuotedUpperCaseNamingStrategy extends SpringPhysicalNamingStrategy { +public class QuotedUpperCaseNamingStrategy extends CamelCaseToUnderscoresNamingStrategy { @Override protected Identifier getIdentifier(String name, boolean quoted, JdbcEnvironment jdbcEnvironment) { return new Identifier(name.toUpperCase(), true); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategy.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategy.java index 69e96aee27..2edfda0c22 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategy.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategy.java @@ -1,10 +1,10 @@ package com.baeldung.namingstrategy; +import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy; -public class UnquotedLowerCaseNamingStrategy extends SpringPhysicalNamingStrategy { +public class UnquotedLowerCaseNamingStrategy extends CamelCaseToUnderscoresNamingStrategy { @Override protected Identifier getIdentifier(String name, boolean quoted, JdbcEnvironment jdbcEnvironment) { return new Identifier(name.toLowerCase(), false); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategy.java b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategy.java index cb87af10f4..16442941ff 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategy.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/main/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategy.java @@ -1,10 +1,10 @@ package com.baeldung.namingstrategy; +import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy; -public class UnquotedUpperCaseNamingStrategy extends SpringPhysicalNamingStrategy { +public class UnquotedUpperCaseNamingStrategy extends CamelCaseToUnderscoresNamingStrategy { @Override protected Identifier getIdentifier(String name, boolean quoted, JdbcEnvironment jdbcEnvironment) { return new Identifier(name.toUpperCase(), false); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyH2IntegrationTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyH2IntegrationTest.java index b3225175ca..33cc1aadd6 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyH2IntegrationTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyH2IntegrationTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -73,8 +73,7 @@ class QuotedLowerCaseNamingStrategyH2IntegrationTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyPostgresLiveTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyPostgresLiveTest.java index b21fdf9edd..80a4232add 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyPostgresLiveTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedLowerCaseNamingStrategyPostgresLiveTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -77,8 +77,7 @@ class QuotedLowerCaseNamingStrategyPostgresLiveTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyH2IntegrationTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyH2IntegrationTest.java index 74f82f0d39..cb670c2158 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyH2IntegrationTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyH2IntegrationTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -77,8 +77,7 @@ class QuotedUpperCaseNamingStrategyH2IntegrationTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyPostgresLiveTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyPostgresLiveTest.java index 6741b09366..4bd492da0f 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyPostgresLiveTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/QuotedUpperCaseNamingStrategyPostgresLiveTest.java @@ -3,15 +3,10 @@ package com.baeldung.namingstrategy; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import java.math.BigInteger; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; - import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,6 +17,10 @@ import org.springframework.boot.test.autoconfigure.jdbc.TestDatabaseAutoConfigur import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.test.context.TestPropertySource; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; + @DataJpaTest(excludeAutoConfiguration = TestDatabaseAutoConfiguration.class) @TestPropertySource("quoted-upper-case-naming-strategy-on-postgres.properties") class QuotedUpperCaseNamingStrategyPostgresLiveTest { @@ -73,8 +72,7 @@ class QuotedUpperCaseNamingStrategyPostgresLiveTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyH2IntegrationTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyH2IntegrationTest.java index dbbccdd61d..9238f0c4c4 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyH2IntegrationTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyH2IntegrationTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -77,8 +77,7 @@ class SpringPhysicalNamingStrategyH2IntegrationTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyPostgresLiveTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyPostgresLiveTest.java index 760dacdaa2..cdcc7a6c67 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyPostgresLiveTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/SpringPhysicalNamingStrategyPostgresLiveTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -77,8 +77,7 @@ class SpringPhysicalNamingStrategyPostgresLiveTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyH2IntegrationTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyH2IntegrationTest.java index d0e86384b8..f7431e6000 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyH2IntegrationTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyH2IntegrationTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -77,8 +77,7 @@ class UnquotedLowerCaseNamingStrategyH2IntegrationTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyPostgresLiveTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyPostgresLiveTest.java index 121b184a3c..8eb5a8a493 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyPostgresLiveTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedLowerCaseNamingStrategyPostgresLiveTest.java @@ -8,10 +8,6 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; - import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,6 +18,10 @@ import org.springframework.boot.test.autoconfigure.jdbc.TestDatabaseAutoConfigur import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.test.context.TestPropertySource; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; + @DataJpaTest(excludeAutoConfiguration = TestDatabaseAutoConfiguration.class) @TestPropertySource("unquoted-lower-case-naming-strategy-on-postgres.properties") class UnquotedLowerCaseNamingStrategyPostgresLiveTest { @@ -77,8 +77,7 @@ class UnquotedLowerCaseNamingStrategyPostgresLiveTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyH2IntegrationTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyH2IntegrationTest.java index b4f25605bd..36ba4f62a1 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyH2IntegrationTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyH2IntegrationTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -77,8 +77,7 @@ class UnquotedUpperCaseNamingStrategyH2IntegrationTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyPostgresLiveTest.java b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyPostgresLiveTest.java index 7ecd4cc80e..1d4c8bb43c 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyPostgresLiveTest.java +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/java/com/baeldung/namingstrategy/UnquotedUpperCaseNamingStrategyPostgresLiveTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.exception.SQLGrammarException; import org.junit.jupiter.api.BeforeEach; @@ -77,8 +77,7 @@ class UnquotedUpperCaseNamingStrategyPostgresLiveTest { public Person fromDatabase(Object databaseRow) { Object[] typedDatabaseRow = (Object[]) databaseRow; - return new Person( - ((BigInteger) typedDatabaseRow[0]).longValue(), + return new Person((Long) typedDatabaseRow[0], (String) typedDatabaseRow[1], (String) typedDatabaseRow[2] ); diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy-on-postgres.properties b/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy-on-postgres.properties index 706b12b1b6..a2774db882 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy-on-postgres.properties +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy-on-postgres.properties @@ -2,8 +2,4 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/spring-strategy spring.datasource.username=postgres spring.datasource.password=root -spring.jpa.hibernate.ddl-auto=create-drop -spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy -#spring.jpa.properties.javax.persistence.schema-generation.create-source=metadata -#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create -#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=default-naming-strategy-ddl.sql \ No newline at end of file +spring.jpa.hibernate.ddl-auto=create-drop \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy.properties b/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy.properties index c9a0c6f24c..13c0e5ebdf 100644 --- a/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy.properties +++ b/persistence-modules/spring-data-jpa-enterprise-2/src/test/resources/com/baeldung/namingstrategy/spring-physical-naming-strategy.properties @@ -2,8 +2,4 @@ spring.datasource.url=jdbc:h2:mem:spring-strategy spring.datasource.username=sa spring.datasource.password= -spring.jpa.hibernate.ddl-auto=create-drop -spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy -#spring.jpa.properties.javax.persistence.schema-generation.create-source=metadata -#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create -#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=default-naming-strategy-ddl.sql \ No newline at end of file +spring.jpa.hibernate.ddl-auto=create-drop \ No newline at end of file