diff --git a/hypersistence-optimizer-config-example/pom.xml b/hypersistence-optimizer-config-example/pom.xml index accadc1..9e5e043 100644 --- a/hypersistence-optimizer-config-example/pom.xml +++ b/hypersistence-optimizer-config-example/pom.xml @@ -32,6 +32,7 @@ io.hypersistence hypersistence-optimizer ${hypersistence-optimizer.version} + jakarta @@ -48,12 +49,6 @@ ${hibernate.version} - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - com.zaxxer HikariCP @@ -94,4 +89,8 @@ + + 11 + + diff --git a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/AddEventHandlerTest.java b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/AddEventHandlerTest.java index 60b136e..e5e0ab1 100644 --- a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/AddEventHandlerTest.java +++ b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/AddEventHandlerTest.java @@ -9,10 +9,10 @@ import io.hypersistence.optimizer.util.AbstractTest; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ChainEventHandlerTest.java b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ChainEventHandlerTest.java index fa44cda..45a3afc 100644 --- a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ChainEventHandlerTest.java +++ b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ChainEventHandlerTest.java @@ -9,10 +9,10 @@ import io.hypersistence.optimizer.util.AbstractTest; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/EventFilterTest.java b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/EventFilterTest.java index 6837b85..bbb167e 100644 --- a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/EventFilterTest.java +++ b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/EventFilterTest.java @@ -9,7 +9,7 @@ import io.hypersistence.optimizer.util.providers.Database; import org.junit.Test; -import javax.persistence.*; +import jakarta.persistence.*; import static org.junit.Assert.fail; diff --git a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/FailFastOnPerformanceIssuesTest.java b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/FailFastOnPerformanceIssuesTest.java index 7740ef6..416434a 100644 --- a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/FailFastOnPerformanceIssuesTest.java +++ b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/FailFastOnPerformanceIssuesTest.java @@ -5,10 +5,10 @@ import io.hypersistence.optimizer.util.AbstractTest; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import static org.junit.Assert.assertTrue; diff --git a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ListEventHandlerTest.java b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ListEventHandlerTest.java index f756b75..50e533c 100644 --- a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ListEventHandlerTest.java +++ b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/ListEventHandlerTest.java @@ -9,10 +9,10 @@ import io.hypersistence.optimizer.util.providers.Database; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import static org.junit.Assert.assertSame; diff --git a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/RuntimeConfigurationPropertiesTest.java b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/RuntimeConfigurationPropertiesTest.java index 5aaf270..45036c5 100644 --- a/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/RuntimeConfigurationPropertiesTest.java +++ b/hypersistence-optimizer-config-example/src/test/java/io/hypersistence/optimizer/config/RuntimeConfigurationPropertiesTest.java @@ -11,7 +11,7 @@ import io.hypersistence.optimizer.util.transaction.JPATransactionVoidFunction; import org.junit.Test; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Collections; diff --git a/hypersistence-optimizer-glassfish-hibernate-example/pom.xml b/hypersistence-optimizer-glassfish-hibernate-example/pom.xml index fe13471..0af3d09 100644 --- a/hypersistence-optimizer-glassfish-hibernate-example/pom.xml +++ b/hypersistence-optimizer-glassfish-hibernate-example/pom.xml @@ -132,6 +132,7 @@ 1.0.3.Final 1.0.0.CR3 5.1.0 + 5.6.15.Final diff --git a/hypersistence-optimizer-micronaut-example/pom.xml b/hypersistence-optimizer-micronaut-example/pom.xml index 3bf19c0..ed52dc5 100644 --- a/hypersistence-optimizer-micronaut-example/pom.xml +++ b/hypersistence-optimizer-micronaut-example/pom.xml @@ -102,7 +102,7 @@ 3.9.6 true - 2.8.1 + 2.8.2 diff --git a/hypersistence-optimizer-micronaut2-example/pom.xml b/hypersistence-optimizer-micronaut2-example/pom.xml index 40d4c84..300b695 100644 --- a/hypersistence-optimizer-micronaut2-example/pom.xml +++ b/hypersistence-optimizer-micronaut2-example/pom.xml @@ -102,7 +102,7 @@ 2.5.13 true - 2.8.1 + 2.8.2 diff --git a/hypersistence-optimizer-spring-hibernate-example/pom.xml b/hypersistence-optimizer-spring-hibernate-example/pom.xml index f5bf678..ff4c30c 100644 --- a/hypersistence-optimizer-spring-hibernate-example/pom.xml +++ b/hypersistence-optimizer-spring-hibernate-example/pom.xml @@ -32,6 +32,7 @@ io.hypersistence hypersistence-optimizer ${hypersistence-optimizer.version} + jakarta @@ -40,12 +41,6 @@ ${hibernate.version} - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - com.zaxxer HikariCP @@ -135,8 +130,10 @@ + 17 + 1.8.7 - 5.3.18 + 6.1.6 diff --git a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java index 06909f0..315745f 100644 --- a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java +++ b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java @@ -1,6 +1,7 @@ package io.hypersistence.optimizer.forum.dao; -import io.hypersistence.optimizer.forum.domain.Post; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -59,9 +60,13 @@ public T persist(T entity) { */ @Override public List findAll(int maxResults) { + CriteriaBuilder builder = getSession().getCriteriaBuilder(); + CriteriaQuery criteria = builder.createQuery(entityClass); + criteria.from(entityClass); + return getSession() - .createCriteria(entityClass) + .createQuery(criteria) .setMaxResults(maxResults) - .list(); + .getResultList(); } } diff --git a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java index d3f9ce3..d015e9b 100644 --- a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java +++ b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java index 33b86e2..9f6607a 100644 --- a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java +++ b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Vlad Mihalcea diff --git a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java index 3f102bd..952c934 100644 --- a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java +++ b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java index e547d02..a6c57f9 100644 --- a/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java +++ b/hypersistence-optimizer-spring-hibernate-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java @@ -1,9 +1,9 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Vlad Mihalcea diff --git a/hypersistence-optimizer-spring-jpa-example/pom.xml b/hypersistence-optimizer-spring-jpa-example/pom.xml index 12c3cb7..5e125c8 100644 --- a/hypersistence-optimizer-spring-jpa-example/pom.xml +++ b/hypersistence-optimizer-spring-jpa-example/pom.xml @@ -32,6 +32,7 @@ io.hypersistence hypersistence-optimizer ${hypersistence-optimizer.version} + jakarta @@ -40,12 +41,6 @@ ${hibernate.version} - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - com.zaxxer HikariCP @@ -135,8 +130,10 @@ + 17 + 1.8.7 - 5.3.18 + 6.1.6 diff --git a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java index 5e11ee6..f4f3da3 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java +++ b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/dao/GenericDAOImpl.java @@ -3,10 +3,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import java.io.Serializable; import java.util.List; diff --git a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java index d3f9ce3..d015e9b 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java +++ b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Post.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java index 33b86e2..9f6607a 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java +++ b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostComment.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Vlad Mihalcea diff --git a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java index 3f102bd..952c934 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java +++ b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/PostDetails.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java index e547d02..a6c57f9 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java +++ b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/domain/Tag.java @@ -1,9 +1,9 @@ package io.hypersistence.optimizer.forum.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Vlad Mihalcea diff --git a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/service/ForumServiceImpl.java b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/service/ForumServiceImpl.java index 53d127e..7477aa5 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/service/ForumServiceImpl.java +++ b/hypersistence-optimizer-spring-jpa-example/src/main/java/io/hypersistence/optimizer/forum/service/ForumServiceImpl.java @@ -7,8 +7,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; /** diff --git a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/JpaTransactionManagerConfiguration.java b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/JpaTransactionManagerConfiguration.java index d832bd4..969b0a8 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/JpaTransactionManagerConfiguration.java +++ b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/JpaTransactionManagerConfiguration.java @@ -15,7 +15,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import java.util.Properties; diff --git a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaTest.java b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaTest.java index ef5c53d..06f34ac 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaTest.java +++ b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaTest.java @@ -27,8 +27,8 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import static org.junit.Assert.*; diff --git a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlBootstrapExecutorTest.java b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlBootstrapExecutorTest.java index 3c1d64c..e5acac5 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlBootstrapExecutorTest.java +++ b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlBootstrapExecutorTest.java @@ -27,8 +27,8 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import static org.junit.Assert.*; diff --git a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlTest.java b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlTest.java index 4fc9434..1cb88f0 100644 --- a/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlTest.java +++ b/hypersistence-optimizer-spring-jpa-example/src/test/java/io/hypersistence/optimizer/jpa/SpringJpaXmlTest.java @@ -27,8 +27,8 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.List; import static org.junit.Assert.*; diff --git a/hypersistence-optimizer-test-case/pom.xml b/hypersistence-optimizer-test-case/pom.xml index a98b1d9..8ad8ef2 100644 --- a/hypersistence-optimizer-test-case/pom.xml +++ b/hypersistence-optimizer-test-case/pom.xml @@ -32,6 +32,7 @@ io.hypersistence hypersistence-optimizer ${hypersistence-optimizer.version} + jakarta @@ -40,12 +41,6 @@ ${hibernate.version} - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - com.zaxxer HikariCP @@ -110,4 +105,8 @@ + + 11 + + diff --git a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/config/mapping/association/fetching/eager/EagerFetchingManyToOneTest.java b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/config/mapping/association/fetching/eager/EagerFetchingManyToOneTest.java index 7c80805..88ebacd 100644 --- a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/config/mapping/association/fetching/eager/EagerFetchingManyToOneTest.java +++ b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/config/mapping/association/fetching/eager/EagerFetchingManyToOneTest.java @@ -3,10 +3,10 @@ import io.hypersistence.optimizer.hibernate.event.mapping.association.fetching.EagerFetchingEvent; import io.hypersistence.optimizer.util.AbstractHypersistenceOptimizerTest; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Vlad Mihalcea diff --git a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/AbstractTest.java b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/AbstractTest.java index e64267d..6121de0 100644 --- a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/AbstractTest.java +++ b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/AbstractTest.java @@ -31,10 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.spi.PersistenceUnitInfo; import javax.sql.DataSource; import java.util.*; @@ -136,7 +136,6 @@ private SessionFactory newSessionFactory() { } final MetadataBuilder metadataBuilder = metadataSources.getMetadataBuilder(); - metadataBuilder.enableNewIdentifierGeneratorSupport(true); MetadataImplementor metadata = (MetadataImplementor) metadataBuilder.build(); diff --git a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/PersistenceUnitInfoImpl.java b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/PersistenceUnitInfoImpl.java index d474d05..1c9597e 100644 --- a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/PersistenceUnitInfoImpl.java +++ b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/PersistenceUnitInfoImpl.java @@ -2,11 +2,11 @@ import org.hibernate.jpa.HibernatePersistenceProvider; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import java.net.URL; import java.util.ArrayList; diff --git a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/providers/PostgreSQLDataSourceProvider.java b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/providers/PostgreSQLDataSourceProvider.java index 7626c4f..713df94 100644 --- a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/providers/PostgreSQLDataSourceProvider.java +++ b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/providers/PostgreSQLDataSourceProvider.java @@ -1,5 +1,6 @@ package io.hypersistence.optimizer.util.providers; +import org.hibernate.dialect.PostgreSQLDialect; import org.postgresql.ds.PGSimpleDataSource; import javax.sql.DataSource; @@ -12,7 +13,7 @@ public class PostgreSQLDataSourceProvider implements DataSourceProvider { @Override public String hibernateDialect() { - return "org.hibernate.dialect.PostgreSQL95Dialect"; + return PostgreSQLDialect.class.getName(); } @Override diff --git a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionFunction.java b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionFunction.java index 7d2a870..527c639 100644 --- a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionFunction.java +++ b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionFunction.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.util.transaction; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Vlad Mihalcea diff --git a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionVoidFunction.java b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionVoidFunction.java index 5414290..0edf4bb 100644 --- a/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionVoidFunction.java +++ b/hypersistence-optimizer-test-case/src/test/java/io/hypersistence/optimizer/util/transaction/JPATransactionVoidFunction.java @@ -1,6 +1,6 @@ package io.hypersistence.optimizer.util.transaction; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Vlad Mihalcea diff --git a/pom.xml b/pom.xml index b0b24e4..f825813 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 2.8.2 - 5.6.10.Final + 6.4.8.Final 1.1 3.8.0