From e624a6c893e7d57f8a79a5d39fec7cd1310d24a6 Mon Sep 17 00:00:00 2001 From: timis1 <12120641+timis1@users.noreply.github.com> Date: Fri, 19 May 2023 11:37:45 +0300 Subject: [PATCH] JAVA-20164 Upgrade java hibernate specific modules to JDK 11 (#13900) * JAVA-20164 Upgrade java hibernate specific modules to JDK 11 * JAVA-20164 Migrating java-jpa-2 * JAVA-20164 Migrating jnosql-artemis * JAVA-20164 Migrating querydsl * JAVA-20164 Migrating r2dbc * JAVA-20164 Migrating redis * JAVA-20164 Fixing test JPATextUnitTest#givenExam_whenSaveExam_thenReturnExpectedExam * JAVA-20164 Fixing givenIdentityStrategy_whenCommitTransction_thenReturnPrimaryKey * JAVA-20164 Changes after review * JAVA-20164 Migrating java-cassandra to jdk8 * JAVA-20164 Fix legacy mode error * Update pom.xml --------- Co-authored-by: timis1 Co-authored-by: Dhawal Kapil --- persistence-modules/java-jpa-2/pom.xml | 49 ++++-- .../criteria/CustomItemRepositoryImpl.java | 14 +- .../java/com/baeldung/jpa/criteria/Item.java | 6 +- .../com/baeldung/jpa/defaultvalues/User.java | 7 +- .../jpa/defaultvalues/UserRepository.java | 6 +- .../java/com/baeldung/jpa/entity/Article.java | 4 +- .../baeldung/jpa/generateidvalue/Admin.java | 10 +- .../baeldung/jpa/generateidvalue/Article.java | 14 +- .../jpa/generateidvalue/IdGenerator.java | 12 +- .../baeldung/jpa/generateidvalue/Task.java | 14 +- .../baeldung/jpa/generateidvalue/User.java | 12 +- .../multipleentities/AllergensAsEntity.java | 16 +- .../MealWithMultipleEntities.java | 14 +- .../secondarytable/MealAsSingleEntity.java | 16 +- .../embeddable/AllergensAsEmbeddable.java | 4 +- .../embeddable/MealWithEmbeddedAllergens.java | 18 +- .../com/baeldung/jpa/projections/Product.java | 6 +- .../jpa/projections/ProductRepository.java | 16 +- .../baeldung/jpa/queryparams/Employee.java | 12 +- .../jpa/querytypes/QueryTypesExamples.java | 16 +- .../baeldung/jpa/querytypes/UserEntity.java | 8 +- .../main/java/com/baeldung/jpa/text/Exam.java | 2 +- .../com/baeldung/jpa/text/ExamRepository.java | 6 +- .../jpa/unrelated/entities/Cocktail.java | 9 +- .../unrelated/entities/MultipleRecipe.java | 8 +- .../jpa/unrelated/entities/Recipe.java | 8 +- .../main/resources/META-INF/persistence.xml | 162 +++++++----------- .../UserDefaultValuesUnitTest.java | 3 - .../generateidvalue/PrimaryKeyUnitTest.java | 12 +- .../MultipleTablesIntegrationTest.java | 6 +- .../HibernateProjectionsIntegrationTest.java | 61 ++++--- .../queryparams/JPAQueryParamsUnitTest.java | 16 +- .../baeldung/jpa/text/JPATextUnitTest.java | 2 +- .../entities/UnrelatedEntitiesUnitTest.java | 7 +- .../test/resources/META-INF/persistence.xml | 162 +++++++----------- persistence-modules/java-jpa/pom.xml | 44 +++-- .../baeldung/jpa/basicannotation/Course.java | 8 +- .../jpa/convertdates/LocalDateConverter.java | 4 +- .../datetime/DateTimeEntityRepository.java | 6 +- .../jpa/datetime/JPA22DateTimeEntity.java | 2 +- .../java/com/baeldung/jpa/entity/Student.java | 22 +-- .../jpa/entitygraph/model/Comment.java | 2 +- .../baeldung/jpa/entitygraph/model/Post.java | 2 +- .../baeldung/jpa/entitygraph/model/User.java | 8 +- .../jpa/entitygraph/repo/PostRepository.java | 16 +- .../java/com/baeldung/jpa/enums/Article.java | 2 +- .../baeldung/jpa/enums/CategoryConverter.java | 4 +- .../main/java/com/baeldung/jpa/model/Car.java | 20 +-- .../com/baeldung/jpa/primarykeys/Account.java | 6 +- .../com/baeldung/jpa/primarykeys/Book.java | 4 +- .../com/baeldung/jpa/primarykeys/BookId.java | 2 +- .../jpa/sqlresultsetmapping/Employee.java | 2 +- .../jpa/sqlresultsetmapping/ScheduledDay.java | 2 +- .../com/baeldung/jpa/stringcast/Message.java | 2 +- .../jpa/stringcast/QueryExecutor.java | 4 +- .../main/resources/META-INF/persistence.xml | 106 ++++-------- .../BasicAnnotationIntegrationTest.java | 8 +- .../entity/StudentEntityIntegrationTest.java | 8 +- .../baeldung/jpa/enums/ArticleUnitTest.java | 10 +- .../CompositeKeysIntegrationTest.java | 6 +- .../SqlResultSetMappingUnitTest.java | 10 +- .../StoredProcedureLiveTest.java | 12 +- .../jpa/stringcast/SpringCastUnitTest.java | 2 +- .../src/test/resources/persistence.xml | 25 ++- .../jnosql/jnosql-artemis/pom.xml | 14 +- persistence-modules/pom.xml | 13 +- persistence-modules/querydsl/pom.xml | 16 +- .../java/com/baeldung/dao/PersonDaoImpl.java | 10 +- .../main/java/com/baeldung/entity/Person.java | 10 +- .../querydsl/intro/entities/BlogPost.java | 8 +- .../querydsl/intro/entities/User.java | 2 +- .../main/resources/META-INF/persistence.xml | 7 +- .../dao/PersonDaoIntegrationTest.java | 4 +- .../intro/QueryDSLIntegrationTest.java | 6 +- persistence-modules/r2dbc/pom.xml | 6 +- .../examples/r2dbc/DatasourceConfig.java | 5 +- .../r2dbc/src/main/resources/application.yml | 2 + ...2dbcExampleApplicationIntegrationTest.java | 12 +- persistence-modules/redis/pom.xml | 6 +- .../redis_scan/client/RedisClient.java | 6 +- .../redis_scan/iterator/RedisIterator.java | 4 +- .../redis_scan/strategy/ScanStrategy.java | 4 +- .../redis_scan/strategy/impl/Hscan.java | 4 +- .../redis_scan/strategy/impl/Scan.java | 4 +- .../redis_scan/strategy/impl/Sscan.java | 4 +- .../redis_scan/strategy/impl/Zscan.java | 6 +- .../com/baeldung/JedisIntegrationTest.java | 10 +- .../RedissonConfigurationIntegrationTest.java | 5 +- .../com/baeldung/RedissonIntegrationTest.java | 7 +- ...eleteEverythingInRedisIntegrationTest.java | 5 +- .../NaiveApproachIntegrationTest.java | 16 +- .../ScanStrategyIntegrationTest.java | 21 ++- pom.xml | 10 +- 93 files changed, 637 insertions(+), 677 deletions(-) diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml index 38dd64d7b2..34e7f9f349 100644 --- a/persistence-modules/java-jpa-2/pom.xml +++ b/persistence-modules/java-jpa-2/pom.xml @@ -14,32 +14,44 @@ - org.hibernate + org.hibernate.orm hibernate-core ${hibernate.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + + - org.hibernate + org.hibernate.orm hibernate-jpamodelgen ${hibernate.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + + com.h2database h2 ${h2.version} - - - javax.persistence - javax.persistence-api - ${javax.persistence-api.version} - org.eclipse.persistence eclipselink ${eclipselink.version} runtime + + + jakarta.xml.bind + jakarta.xml.bind-api + + org.postgresql @@ -51,13 +63,25 @@ com.querydsl querydsl-apt ${querydsl.version} + jakarta provided com.querydsl querydsl-jpa + jakarta ${querydsl.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.version} + + + javax.annotation + javax.annotation-api + ${javax.annotation.version} + @@ -130,14 +154,15 @@ - 5.4.14.Final - 2.7.4 + 4.0.1 2.2 3.5.1 3.3.3 3.0.0 - 4.3.1 - 2.1.214 + 5.0.0 + 1.4.200 + 4.0.0 + 1.3.2 \ No newline at end of file diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/CustomItemRepositoryImpl.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/CustomItemRepositoryImpl.java index c64cd14ca5..a014217b88 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/CustomItemRepositoryImpl.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/CustomItemRepositoryImpl.java @@ -2,13 +2,13 @@ package com.baeldung.jpa.criteria; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; public class CustomItemRepositoryImpl implements CustomItemRepository { diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/Item.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/Item.java index f6093e5735..3662d4918b 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/Item.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/criteria/Item.java @@ -1,8 +1,8 @@ package com.baeldung.jpa.criteria; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Table(name = "item") @Entity diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java index 83b05fbc59..b89432c051 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java @@ -1,9 +1,8 @@ package com.baeldung.jpa.defaultvalues; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = "users") public class User { diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java index 52f9807cfb..7639dc74c5 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/UserRepository.java @@ -1,8 +1,8 @@ package com.baeldung.jpa.defaultvalues; -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 UserRepository { diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java index 02082c3d92..9aaa6f3d34 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java @@ -1,7 +1,7 @@ package com.baeldung.jpa.entity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity(name = "MyArticle") @Table(name = Article.TABLE_NAME) diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Admin.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Admin.java index 1c59b33ab8..b9c50a3e88 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Admin.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Admin.java @@ -1,10 +1,10 @@ package com.baeldung.jpa.generateidvalue; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "app_admin") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Article.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Article.java index 06465de179..5ebb812638 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Article.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Article.java @@ -1,12 +1,12 @@ package com.baeldung.jpa.generateidvalue; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "article") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/IdGenerator.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/IdGenerator.java index 0fac86747f..371b844fd6 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/IdGenerator.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/IdGenerator.java @@ -1,11 +1,11 @@ package com.baeldung.jpa.generateidvalue; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Table(name = "id_gen") @Entity diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Task.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Task.java index a51ec53418..e2f67ee0de 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Task.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/Task.java @@ -1,12 +1,12 @@ package com.baeldung.jpa.generateidvalue; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; @Entity @Table(name = "task") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/User.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/User.java index 88fefe7ba6..7b976c5ee1 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/User.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/generateidvalue/User.java @@ -1,11 +1,11 @@ package com.baeldung.jpa.generateidvalue; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "app_user") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/AllergensAsEntity.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/AllergensAsEntity.java index e5e228d013..fc1777abe8 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/AllergensAsEntity.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/AllergensAsEntity.java @@ -1,13 +1,13 @@ package com.baeldung.jpa.multipletables.multipleentities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import com.baeldung.jpa.multipletables.secondarytable.MealAsSingleEntity; diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/MealWithMultipleEntities.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/MealWithMultipleEntities.java index 74105f8f1f..f14540e7ae 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/MealWithMultipleEntities.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/multipleentities/MealWithMultipleEntities.java @@ -2,13 +2,13 @@ package com.baeldung.jpa.multipletables.multipleentities; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "meal") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/MealAsSingleEntity.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/MealAsSingleEntity.java index 2929f391a4..d967d7618d 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/MealAsSingleEntity.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/MealAsSingleEntity.java @@ -2,14 +2,14 @@ package com.baeldung.jpa.multipletables.secondarytable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; @Entity @Table(name = "meal") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/AllergensAsEmbeddable.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/AllergensAsEmbeddable.java index 1c1f05890b..b95649029e 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/AllergensAsEmbeddable.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/AllergensAsEmbeddable.java @@ -1,7 +1,7 @@ package com.baeldung.jpa.multipletables.secondarytable.embeddable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class AllergensAsEmbeddable { diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/MealWithEmbeddedAllergens.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/MealWithEmbeddedAllergens.java index 87a83157d7..ada6328226 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/MealWithEmbeddedAllergens.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/multipletables/secondarytable/embeddable/MealWithEmbeddedAllergens.java @@ -2,15 +2,15 @@ package com.baeldung.jpa.multipletables.secondarytable.embeddable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; @Entity @Table(name = "meal") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/Product.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/Product.java index 90f90be0c0..b9cb0076ab 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/Product.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/Product.java @@ -2,10 +2,8 @@ package com.baeldung.jpa.projections; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Product { diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/ProductRepository.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/ProductRepository.java index bb269e1de6..402e5325ef 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/ProductRepository.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/projections/ProductRepository.java @@ -2,14 +2,14 @@ package com.baeldung.jpa.projections; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; public class ProductRepository { private EntityManager entityManager; diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java index bf3d459530..ed8788cad6 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/queryparams/Employee.java @@ -1,11 +1,11 @@ package com.baeldung.jpa.queryparams; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "employees") diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/QueryTypesExamples.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/QueryTypesExamples.java index 523fc348f9..9738e0923b 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/QueryTypesExamples.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/QueryTypesExamples.java @@ -3,14 +3,14 @@ package com.baeldung.jpa.querytypes; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; /** * JPA Query Types examples. All using the UserEntity class. diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/UserEntity.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/UserEntity.java index 1d4a231b31..14ccc15a9c 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/UserEntity.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/querytypes/UserEntity.java @@ -1,9 +1,9 @@ package com.baeldung.jpa.querytypes; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * User entity class. Used as an asset for JPA Query Types examples. diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/Exam.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/Exam.java index 8bea8e0121..a674069a63 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/Exam.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/Exam.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.text; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Exam { diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/ExamRepository.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/ExamRepository.java index 2ee502bf4c..7b783be365 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/ExamRepository.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/text/ExamRepository.java @@ -1,8 +1,8 @@ package com.baeldung.jpa.text; -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 ExamRepository { diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Cocktail.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Cocktail.java index 96310c1cc5..e896efe0ec 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Cocktail.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Cocktail.java @@ -1,11 +1,9 @@ package com.baeldung.jpa.unrelated.entities; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.Objects; @@ -27,18 +25,17 @@ public class Cocktail { @JoinColumn(name = "cocktail_name", referencedColumnName = "cocktail", insertable = false, updatable = false, - foreignKey = @javax.persistence + foreignKey = @jakarta.persistence .ForeignKey(value = ConstraintMode.NO_CONSTRAINT)) private Recipe recipe; @OneToMany(fetch = FetchType.LAZY) - @NotFound(action = NotFoundAction.IGNORE) @JoinColumn( name = "cocktail", referencedColumnName = "cocktail_name", insertable = false, updatable = false, - foreignKey = @javax.persistence + foreignKey = @jakarta.persistence .ForeignKey(value = ConstraintMode.NO_CONSTRAINT)) private List recipeList; diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/MultipleRecipe.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/MultipleRecipe.java index 8664d6fd7f..b17860f755 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/MultipleRecipe.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/MultipleRecipe.java @@ -1,9 +1,9 @@ package com.baeldung.jpa.unrelated.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.Objects; @Entity diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Recipe.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Recipe.java index 4b3d200b60..2cb4839b33 100644 --- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Recipe.java +++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/unrelated/entities/Recipe.java @@ -1,9 +1,9 @@ package com.baeldung.jpa.unrelated.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.Objects; @Entity diff --git a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml index 1e3d3470ed..15d5799c0a 100644 --- a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml +++ b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml @@ -1,9 +1,8 @@ - + @@ -11,20 +10,15 @@ com.baeldung.jpa.queryparams.Employee true - - - - - + + + + + - - + + @@ -34,18 +28,14 @@ com.baeldung.jpa.text.Exam true - - - - - + + + + + - + @@ -54,18 +44,14 @@ com.baeldung.jpa.defaultvalues.User true - - - - - + + + + + - + @@ -74,20 +60,15 @@ com.baeldung.jpa.querytypes.UserEntity true - - - - - + + + + + - - + + @@ -96,20 +77,15 @@ com.baeldung.jpa.projections.Product true - - - - - + + + + + - - + + @@ -118,20 +94,15 @@ com.baeldung.jpa.criteria.Item true - - - - - + + + + + - - + + @@ -147,19 +118,15 @@ true - - - - - + + + + + - + @@ -170,18 +137,14 @@ com.baeldung.jpa.unrelated.entities.MultipleRecipe true - - - - - + + + + + - + @@ -194,14 +157,11 @@ com.baeldung.jpa.generateidvalue.User true - - - - - + + + + + diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/defaultvalues/UserDefaultValuesUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/defaultvalues/UserDefaultValuesUnitTest.java index dc41ff51f2..b9c3dffecd 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/defaultvalues/UserDefaultValuesUnitTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/defaultvalues/UserDefaultValuesUnitTest.java @@ -1,8 +1,5 @@ package com.baeldung.jpa.defaultvalues; -import com.baeldung.jpa.defaultvalues.User; -import com.baeldung.jpa.defaultvalues.UserRepository; - import org.junit.Test; import org.junit.Ignore; import org.junit.AfterClass; diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/generateidvalue/PrimaryKeyUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/generateidvalue/PrimaryKeyUnitTest.java index eead56dbff..8691cbca4a 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/generateidvalue/PrimaryKeyUnitTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/generateidvalue/PrimaryKeyUnitTest.java @@ -1,8 +1,8 @@ package com.baeldung.jpa.generateidvalue; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.junit.Assert; import org.junit.BeforeClass; @@ -27,12 +27,10 @@ public class PrimaryKeyUnitTest { User user = new User(); user.setName("TestName"); - entityManager.getTransaction() - .begin(); + entityManager.getTransaction().begin(); entityManager.persist(user); Assert.assertNull(user.getId()); - entityManager.getTransaction() - .commit(); + entityManager.getTransaction().commit(); Long expectPrimaryKey = 1L; Assert.assertEquals(expectPrimaryKey, user.getId()); diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/multipletables/MultipleTablesIntegrationTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/multipletables/MultipleTablesIntegrationTest.java index 99b2cd69ee..a2aedbc5bf 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/multipletables/MultipleTablesIntegrationTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/multipletables/MultipleTablesIntegrationTest.java @@ -2,9 +2,9 @@ package com.baeldung.jpa.multipletables; import static org.assertj.core.api.Assertions.*; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/projections/HibernateProjectionsIntegrationTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/projections/HibernateProjectionsIntegrationTest.java index 47cc7cbaec..b78802bb42 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/projections/HibernateProjectionsIntegrationTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/projections/HibernateProjectionsIntegrationTest.java @@ -5,19 +5,22 @@ import static org.junit.Assert.assertNotNull; import java.util.List; -import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projections; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.SingularAttribute; + public class HibernateProjectionsIntegrationTest { private static Session session; private static SessionFactory sessionFactory; @@ -56,16 +59,20 @@ public class HibernateProjectionsIntegrationTest { cfg.setProperty(AvailableSettings.CURRENT_SESSION_CONTEXT_CLASS, "thread"); return cfg; } - - + + @SuppressWarnings("deprecation") @Test public void givenProductData_whenIdAndNameProjectionUsingCriteria_thenListOfObjectArrayReturned() { - Criteria criteria = session.createCriteria(Product.class); - criteria = criteria.setProjection(Projections.projectionList() - .add(Projections.id()) - .add(Projections.property("name"))); - List resultList = criteria.list(); + final CriteriaBuilder criteria = session.getCriteriaBuilder(); + final CriteriaQuery criteriaQuery = criteria.createQuery(Object[].class); + final Root root = criteriaQuery.from(Product.class); + final SingularAttribute name = Product_.name; + final SingularAttribute id = Product_.id; + final Path nameProjection = root.get(name); + final Path idProjection = root.get(id); + criteriaQuery.multiselect(idProjection, nameProjection); + final List resultList = session.createQuery(criteriaQuery).getResultList(); assertNotNull(resultList); assertEquals(4, resultList.size()); @@ -82,9 +89,13 @@ public class HibernateProjectionsIntegrationTest { @Test public void givenProductData_whenNameProjectionUsingCriteria_thenListOfStringReturned() { - Criteria criteria = session.createCriteria(Product.class); - criteria = criteria.setProjection(Projections.property("name")); - List resultList = criteria.list(); + final CriteriaBuilder criteria = session.getCriteriaBuilder(); + final CriteriaQuery criteriaQuery = criteria.createQuery(String.class); + final Root root = criteriaQuery.from(Product.class); + final SingularAttribute name = Product_.name; + final Path nameProjection = root.get(name); + criteriaQuery.select(nameProjection); + final List resultList = session.createQuery(criteriaQuery).getResultList(); assertNotNull(resultList); assertEquals(4, resultList.size()); @@ -96,11 +107,12 @@ public class HibernateProjectionsIntegrationTest { @Test public void givenProductData_whenCountByCategoryUsingCriteria_thenOK() { - Criteria criteria = session.createCriteria(Product.class); - criteria = criteria.setProjection(Projections.projectionList() - .add(Projections.groupProperty("category")) - .add(Projections.rowCount())); - List resultList = criteria.list(); + final CriteriaBuilder criteria = session.getCriteriaBuilder(); + final CriteriaQuery criteriaQuery = criteria.createQuery(Object[].class); + final Root root = criteriaQuery.from(Product.class); + criteriaQuery.groupBy(root.get("category")); + criteriaQuery.multiselect(root.get("category"), criteria.count(root)); + final List resultList = session.createQuery(criteriaQuery).getResultList(); assertNotNull(resultList); assertEquals(3, resultList.size()); @@ -114,12 +126,13 @@ public class HibernateProjectionsIntegrationTest { @Test public void givenProductData_whenCountByCategoryWithAliasUsingCriteria_thenOK() { - Criteria criteria = session.createCriteria(Product.class); - criteria = criteria.setProjection(Projections.projectionList() - .add(Projections.groupProperty("category")) - .add(Projections.alias(Projections.rowCount(), "count"))); - criteria.addOrder(Order.asc("count")); - List resultList = criteria.list(); + final CriteriaBuilder criteria = session.getCriteriaBuilder(); + final CriteriaQuery criteriaQuery = criteria.createQuery(Object[].class); + final Root root = criteriaQuery.from(Product.class); + criteriaQuery.groupBy(root.get("category")); + criteriaQuery.multiselect(root.get("category"), criteria.count(root)); + criteriaQuery.orderBy(criteria.asc(criteria.count(root))); + List resultList = session.createQuery(criteriaQuery).getResultList(); assertNotNull(resultList); assertEquals(3, resultList.size()); diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java index 55ee0e6e59..ed047cb45e 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java @@ -3,14 +3,14 @@ package com.baeldung.jpa.queryparams; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/text/JPATextUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/text/JPATextUnitTest.java index f9f355c464..f7fcd9117d 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/text/JPATextUnitTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/text/JPATextUnitTest.java @@ -2,7 +2,7 @@ package com.baeldung.jpa.text; import static org.junit.Assert.assertEquals; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.junit.BeforeClass; import org.junit.Test; diff --git a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/unrelated/entities/UnrelatedEntitiesUnitTest.java b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/unrelated/entities/UnrelatedEntitiesUnitTest.java index 044e59b16e..0fae147b13 100644 --- a/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/unrelated/entities/UnrelatedEntitiesUnitTest.java +++ b/persistence-modules/java-jpa-2/src/test/java/com/baeldung/jpa/unrelated/entities/UnrelatedEntitiesUnitTest.java @@ -1,14 +1,15 @@ package com.baeldung.jpa.unrelated.entities; -import javax.persistence.*; +import jakarta.persistence.*; -import com.querydsl.jpa.impl.JPAQuery; import org.junit.jupiter.api.*; +import static org.junit.jupiter.api.Assertions.*; + import java.util.List; import java.util.function.Consumer; -import static org.junit.jupiter.api.Assertions.*; +import com.querydsl.jpa.impl.JPAQuery; public class UnrelatedEntitiesUnitTest { private static EntityManagerFactory entityManagerFactory; diff --git a/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml index 18f3f4f99a..46ee62b1ca 100644 --- a/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml +++ b/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml @@ -1,9 +1,8 @@ - + @@ -11,20 +10,15 @@ com.baeldung.jpa.queryparams.Employee true - - - - - + + + + + - - + + @@ -34,18 +28,14 @@ com.baeldung.jpa.text.Exam true - - - - - + + + + + - + @@ -54,18 +44,14 @@ com.baeldung.jpa.defaultvalues.User true - - - - - + + + + + - + @@ -74,20 +60,15 @@ com.baeldung.jpa.querytypes.UserEntity true - - - - - + + + + + - - + + @@ -96,20 +77,15 @@ com.baeldung.jpa.projections.Product true - - - - - + + + + + - - + + @@ -118,20 +94,15 @@ com.baeldung.jpa.criteria.Item true - - - - - + + + + + - - + + @@ -147,19 +118,15 @@ true - - - - - + + + + + - + @@ -170,18 +137,14 @@ com.baeldung.jpa.unrelated.entities.MultipleRecipe true - - - - - + + + + + - + @@ -194,14 +157,11 @@ com.baeldung.jpa.generateidvalue.User true - - - - - + + + + + diff --git a/persistence-modules/java-jpa/pom.xml b/persistence-modules/java-jpa/pom.xml index 0c8cec2116..b70fd0daec 100644 --- a/persistence-modules/java-jpa/pom.xml +++ b/persistence-modules/java-jpa/pom.xml @@ -14,32 +14,44 @@ - org.hibernate + org.hibernate.orm hibernate-core ${hibernate.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + + - org.hibernate + org.hibernate.orm hibernate-jpamodelgen ${hibernate.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + + com.h2database h2 ${h2.version} - - - javax.persistence - javax.persistence-api - ${javax.persistence-api.version} - org.eclipse.persistence eclipselink ${eclipselink.version} runtime + + + jakarta.xml.bind + jakarta.xml.bind-api + + org.postgresql @@ -47,6 +59,16 @@ ${postgresql.version} runtime + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.version} + + + javax.annotation + javax.annotation-api + ${javax.annotation.version} + @@ -102,12 +124,12 @@ - 5.4.0.Final - 2.7.4 - 2.2 + 4.0.1 3.3.3 3.0.0 2.1.214 + 4.0.0 + 1.3.2 \ No newline at end of file diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java index cc5a83420c..559076a2ad 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/basicannotation/Course.java @@ -1,9 +1,9 @@ package com.baeldung.jpa.basicannotation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; @Entity public class Course { diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/convertdates/LocalDateConverter.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/convertdates/LocalDateConverter.java index de6ada2361..f74aad71e6 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/convertdates/LocalDateConverter.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/convertdates/LocalDateConverter.java @@ -1,7 +1,7 @@ package com.baeldung.jpa.convertdates; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import java.sql.Date; import java.time.LocalDate; import java.util.Optional; diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/DateTimeEntityRepository.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/DateTimeEntityRepository.java index 0bd04da221..2aa6fa60b6 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/DateTimeEntityRepository.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/DateTimeEntityRepository.java @@ -1,8 +1,8 @@ package com.baeldung.jpa.datetime; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/JPA22DateTimeEntity.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/JPA22DateTimeEntity.java index 065385bd86..0a4aade789 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/JPA22DateTimeEntity.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/datetime/JPA22DateTimeEntity.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.datetime; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java index 64e7ab586c..27293147eb 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Student.java @@ -2,17 +2,17 @@ package com.baeldung.jpa.entity; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; @Entity @Table(name="STUDENT") diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Comment.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Comment.java index 40ecd3262b..b7c3a62546 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Comment.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Comment.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.entitygraph.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Comment { diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Post.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Post.java index 59f17ae0c5..9d340f4b31 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Post.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/Post.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.entitygraph.model; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/User.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/User.java index b712100d4e..37fab8d4da 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/User.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/model/User.java @@ -1,9 +1,9 @@ package com.baeldung.jpa.entitygraph.model; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class User { diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/repo/PostRepository.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/repo/PostRepository.java index 28f1e1b93c..16e7badc64 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/repo/PostRepository.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entitygraph/repo/PostRepository.java @@ -2,10 +2,10 @@ package com.baeldung.jpa.entitygraph.repo; import com.baeldung.jpa.entitygraph.model.Post; -import javax.persistence.*; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.*; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.util.HashMap; import java.util.Map; @@ -34,7 +34,7 @@ public class PostRepository { EntityGraph entityGraph = entityManager.getEntityGraph("post-entity-graph"); Map properties = new HashMap<>(); - properties.put("javax.persistence.fetchgraph", entityGraph); + properties.put("jakarta.persistence.fetchgraph", entityGraph); Post post = entityManager.find(Post.class, id, properties); entityManager.close(); @@ -51,7 +51,7 @@ public class PostRepository { .addAttributeNodes("user"); Map properties = new HashMap<>(); - properties.put("javax.persistence.fetchgraph", entityGraph); + properties.put("jakarta.persistence.fetchgraph", entityGraph); Post post = entityManager.find(Post.class, id, properties); entityManager.close(); @@ -64,7 +64,7 @@ public class PostRepository { EntityGraph entityGraph = entityManager.getEntityGraph("post-entity-graph-with-comment-users"); Post post = entityManager.createQuery("Select p from Post p where p.id=:id", Post.class) .setParameter("id", id) - .setHint("javax.persistence.fetchgraph", entityGraph) + .setHint("jakarta.persistence.fetchgraph", entityGraph) .getSingleResult(); entityManager.close(); @@ -80,7 +80,7 @@ public class PostRepository { Root root = criteriaQuery.from(Post.class); criteriaQuery.where(criteriaBuilder.equal(root.get("id"), id)); TypedQuery typedQuery = entityManager.createQuery(criteriaQuery); - typedQuery.setHint("javax.persistence.loadgraph", entityGraph); + typedQuery.setHint("jakarta.persistence.loadgraph", entityGraph); Post post = typedQuery.getSingleResult(); entityManager.close(); diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java index d534f44e14..a516ae16ff 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/Article.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.enums; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Article { diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java index 98960f1569..b69fc51afd 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/enums/CategoryConverter.java @@ -1,7 +1,7 @@ package com.baeldung.jpa.enums; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import java.util.stream.Stream; @Converter(autoApply = true) diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/Car.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/Car.java index 676d76307e..86ad487e11 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/Car.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/model/Car.java @@ -1,15 +1,15 @@ package com.baeldung.jpa.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.Table; @Entity @Table(name = "CAR") diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Account.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Account.java index 915c605e65..d4825a56fc 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Account.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Account.java @@ -1,8 +1,8 @@ package com.baeldung.jpa.primarykeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity @IdClass(AccountId.class) diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Book.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Book.java index a84eb3ef01..6a2b86d977 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Book.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/Book.java @@ -1,7 +1,7 @@ package com.baeldung.jpa.primarykeys; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class Book { diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/BookId.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/BookId.java index d8c925c148..e4c60bd5ba 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/BookId.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/primarykeys/BookId.java @@ -2,7 +2,7 @@ package com.baeldung.jpa.primarykeys; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class BookId implements Serializable { diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/Employee.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/Employee.java index b62a21d481..f6fed9913c 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/Employee.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/Employee.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.sqlresultsetmapping; -import javax.persistence.*; +import jakarta.persistence.*; @SqlResultSetMapping( diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/ScheduledDay.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/ScheduledDay.java index a7ca59ab3f..55a77d6d50 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/ScheduledDay.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/sqlresultsetmapping/ScheduledDay.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.sqlresultsetmapping; -import javax.persistence.*; +import jakarta.persistence.*; @SqlResultSetMappings(value = { @SqlResultSetMapping(name = "ScheduleResult", diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/Message.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/Message.java index fb521cfea6..2888266203 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/Message.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/Message.java @@ -1,6 +1,6 @@ package com.baeldung.jpa.stringcast; -import javax.persistence.*; +import jakarta.persistence.*; @SqlResultSetMapping(name = "textQueryMapping", classes = { @ConstructorResult(targetClass = Message.class, columns = { diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/QueryExecutor.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/QueryExecutor.java index 2cb5679d4d..948ac52bce 100644 --- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/QueryExecutor.java +++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/stringcast/QueryExecutor.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; public class QueryExecutor { diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml index 50188391af..5d0c79c2a7 100644 --- a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml +++ b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml @@ -1,9 +1,8 @@ - + org.hibernate.jpa.HibernatePersistenceProvider @@ -12,18 +11,14 @@ com.baeldung.jpa.basicannotation.Course true - - - - - + + + + + - + @@ -34,18 +29,14 @@ com.baeldung.jpa.enums.CategoryConverter true - - - - - + + + + + - + @@ -54,39 +45,26 @@ com.baeldung.jpa.model.Car true - - - - - + + + + + - + com.baeldung.jpa.entitygraph.model.Post com.baeldung.jpa.entitygraph.model.User com.baeldung.jpa.entitygraph.model.Comment true - - - - - - + + + + @@ -96,17 +74,11 @@ com.baeldung.jpa.datetime.JPA22DateTimeEntity true - - - - - + + + + + @@ -124,18 +96,14 @@ com.baeldung.jpa.primarykeys.AccountId true - - - - - + + + + + - + diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java index d3f75804de..96e15af16f 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/basicannotation/BasicAnnotationIntegrationTest.java @@ -1,9 +1,9 @@ package com.baeldung.jpa.basicannotation; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceException; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java index 3c7a82edc3..caeeb62a98 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/StudentEntityIntegrationTest.java @@ -7,10 +7,10 @@ import java.time.ZoneId; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.TypedQuery; import org.junit.After; import org.junit.Before; diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java index 36a7cb1002..78d3588cc8 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/enums/ArticleUnitTest.java @@ -3,11 +3,11 @@ package com.baeldung.jpa.enums; import org.junit.BeforeClass; import org.junit.Test; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Persistence; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.Persistence; +import jakarta.persistence.TypedQuery; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/primarykeys/CompositeKeysIntegrationTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/primarykeys/CompositeKeysIntegrationTest.java index be529ab81c..45037387d6 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/primarykeys/CompositeKeysIntegrationTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/primarykeys/CompositeKeysIntegrationTest.java @@ -3,9 +3,9 @@ package com.baeldung.jpa.primarykeys; import static org.junit.Assert.assertNotNull; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import com.baeldung.jpa.primarykeys.Account; import com.baeldung.jpa.primarykeys.AccountId; diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/sqlresultsetmapping/SqlResultSetMappingUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/sqlresultsetmapping/SqlResultSetMappingUnitTest.java index f318df3747..f61ed16177 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/sqlresultsetmapping/SqlResultSetMappingUnitTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/sqlresultsetmapping/SqlResultSetMappingUnitTest.java @@ -4,10 +4,10 @@ import static org.junit.Assert.*; import org.junit.jupiter.api.*; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.Query; import java.util.Collections; import java.util.List; @@ -44,7 +44,7 @@ public class SqlResultSetMappingUnitTest { @Test public void whenNamedQuery_thenMultipleEntityResult() { - final Query query = em.createNativeQuery("SELECT e.id, e.name, d.id, d.employeeId, d.dayOfWeek " + final Query query = em.createNativeQuery("SELECT e.id as idEmployee, e.name, d.id as daysId, d.employeeId, d.dayOfWeek " + " FROM employee e, schedule_days d " + " WHERE e.id = d.employeeId", "EmployeeScheduleResults"); List results = query.getResultList(); diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java index 8bc8c854da..f1c61ee408 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/storedprocedure/StoredProcedureLiveTest.java @@ -1,11 +1,11 @@ package com.baeldung.jpa.storedprocedure; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.ParameterMode; -import javax.persistence.Persistence; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.Persistence; +import jakarta.persistence.StoredProcedureQuery; import org.junit.AfterClass; import org.junit.Assert; diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/stringcast/SpringCastUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/stringcast/SpringCastUnitTest.java index 0a11725fc3..52789c7783 100644 --- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/stringcast/SpringCastUnitTest.java +++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/stringcast/SpringCastUnitTest.java @@ -3,7 +3,7 @@ package com.baeldung.jpa.stringcast; import org.junit.BeforeClass; import org.junit.Test; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/persistence-modules/java-jpa/src/test/resources/persistence.xml b/persistence-modules/java-jpa/src/test/resources/persistence.xml index e9b5ebbbcf..c9bec9557f 100644 --- a/persistence-modules/java-jpa/src/test/resources/persistence.xml +++ b/persistence-modules/java-jpa/src/test/resources/persistence.xml @@ -1,18 +1,17 @@ - + org.hibernate.jpa.HibernatePersistenceProvider com.baeldung.jpa.model.Car - - - - + + + + @@ -22,10 +21,10 @@ org.hibernate.jpa.HibernatePersistenceProvider com.baeldung.jpa.stringcast.Message - - - - + + + + diff --git a/persistence-modules/jnosql/jnosql-artemis/pom.xml b/persistence-modules/jnosql/jnosql-artemis/pom.xml index 0c1a6967d3..da100388ab 100644 --- a/persistence-modules/jnosql/jnosql-artemis/pom.xml +++ b/persistence-modules/jnosql/jnosql-artemis/pom.xml @@ -40,6 +40,16 @@ ${project.artifactId} + + org.apache.maven.plugins + maven-war-plugin + ${maven.war-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler-plugin.version} + net.wasdev.wlp.maven.plugins liberty-maven-plugin @@ -80,7 +90,9 @@ 2.4.2 false - 8.0 + 8.0.1 + 3.3.1 + 3.8.1 \ No newline at end of file diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index ba9ef9eef2..426f49fdfd 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -35,27 +35,26 @@ hibernate-queries hibernate-enterprise influxdb - java-cockroachdb java-jdbi - - + java-jpa + java-jpa-2 java-jpa-3 java-mongodb-2 java-mongodb-3 java-mongodb-queries - + jnosql jooq jpa-hibernate-cascade-type liquibase orientdb persistence-libraries - - + querydsl + r2dbc read-only-transactions - + redis solr spring-boot-persistence-2 diff --git a/persistence-modules/querydsl/pom.xml b/persistence-modules/querydsl/pom.xml index c97dcdd93d..921d45815a 100644 --- a/persistence-modules/querydsl/pom.xml +++ b/persistence-modules/querydsl/pom.xml @@ -19,11 +19,13 @@ com.querydsl querydsl-jpa + jakarta ${querydsl.version} com.querydsl querydsl-apt + jakarta ${querydsl.version} provided @@ -34,12 +36,6 @@ ${hibernate.version} compile - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate-jpa.version} - compile - commons-dbcp commons-dbcp @@ -106,8 +102,6 @@ maven-compiler-plugin ${maven-compiler-plugin.version} - ${java.version} - ${java.version} -proc:none @@ -132,10 +126,8 @@ - 4.3.4.RELEASE - 5.2.5.Final - 1.0.0.Final - 4.1.4 + 6.0.6 + 5.0.0 1.6 1.4 1.1.3 diff --git a/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java index 20ebe0e3fe..8d91ec0f59 100644 --- a/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/dao/PersonDaoImpl.java @@ -3,14 +3,18 @@ package com.baeldung.dao; import com.baeldung.entity.Person; import com.baeldung.entity.QPerson; import com.querydsl.core.group.GroupBy; +import com.querydsl.jpa.JPQLTemplates; import com.querydsl.jpa.impl.JPAQuery; +import com.querydsl.jpa.impl.JPAQueryFactory; + import org.springframework.stereotype.Repository; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; import java.util.List; import java.util.Map; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + @Repository public class PersonDaoImpl implements PersonDao { @@ -57,7 +61,7 @@ public class PersonDaoImpl implements PersonDao { @Override public Map findMaxAgeByName() { - final JPAQuery query = new JPAQuery<>(em); + final JPAQueryFactory query = new JPAQueryFactory(JPQLTemplates.DEFAULT, em); final QPerson person = QPerson.person; return query.from(person).transform(GroupBy.groupBy(person.firstname).as(GroupBy.max(person.age))); diff --git a/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java b/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java index 310f21ab2a..8985215fcd 100644 --- a/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/entity/Person.java @@ -1,10 +1,10 @@ package com.baeldung.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class Person { diff --git a/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java index 6712ad08d5..43ba594bdd 100644 --- a/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/BlogPost.java @@ -3,10 +3,10 @@ */ package com.baeldung.querydsl.intro.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class BlogPost { diff --git a/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java index 4111284d5a..1d572eb389 100644 --- a/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java +++ b/persistence-modules/querydsl/src/main/java/com/baeldung/querydsl/intro/entities/User.java @@ -5,7 +5,7 @@ package com.baeldung.querydsl.intro.entities; import java.util.HashSet; import java.util.Set; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class User { diff --git a/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml b/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml index 4b51cb444b..078fa8ce23 100644 --- a/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml +++ b/persistence-modules/querydsl/src/main/resources/META-INF/persistence.xml @@ -1,9 +1,8 @@ - + version="3.0" + xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"> 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 cf4e9ab872..e9cf679c43 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 @@ -6,9 +6,9 @@ import com.baeldung.entity.Person; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.transaction.TransactionConfiguration; import org.springframework.transaction.annotation.Transactional; import junit.framework.Assert; @@ -16,7 +16,7 @@ import junit.framework.Assert; @ContextConfiguration("/test-context.xml") @RunWith(SpringJUnit4ClassRunner.class) @Transactional -@TransactionConfiguration(defaultRollback = true) +@Rollback public class PersonDaoIntegrationTest { @Autowired 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 7ae97c2880..29d49d114d 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 @@ -14,9 +14,9 @@ import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import org.junit.*; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import java.util.List; import static org.junit.Assert.*; diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml index cfe344eba9..5260bb9860 100644 --- a/persistence-modules/r2dbc/pom.xml +++ b/persistence-modules/r2dbc/pom.xml @@ -89,9 +89,9 @@ - 9.14.1 - 42.5.2 - 1.0.0.RELEASE + 9.16.0 + 42.5.4 + 1.0.1.RELEASE diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/DatasourceConfig.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/DatasourceConfig.java index 21cc0bc6d3..29e7df4c29 100644 --- a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/DatasourceConfig.java +++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/DatasourceConfig.java @@ -29,9 +29,8 @@ public class DatasourceConfig { if ( !StringUtil.isNullOrEmpty(properties.getPassword())) { ob = ob.option(PASSWORD, properties.getPassword()); } - - ConnectionFactory cf = ConnectionFactories.get(ob.build()); - return cf; + + return ConnectionFactories.get(ob.build()); } diff --git a/persistence-modules/r2dbc/src/main/resources/application.yml b/persistence-modules/r2dbc/src/main/resources/application.yml index 919a088209..d89fffaa31 100644 --- a/persistence-modules/r2dbc/src/main/resources/application.yml +++ b/persistence-modules/r2dbc/src/main/resources/application.yml @@ -9,6 +9,8 @@ spring: flyway: url: jdbc:postgresql://localhost:8082/flyway-test-db locations: classpath:db/postgres/migration + main: + allow-bean-definition-overriding: true # R2DBC URL r2dbc: url: r2dbc:h2:mem://./testdb diff --git a/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/R2dbcExampleApplicationIntegrationTest.java b/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/R2dbcExampleApplicationIntegrationTest.java index 7c3badc976..80c319cc65 100644 --- a/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/R2dbcExampleApplicationIntegrationTest.java +++ b/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/R2dbcExampleApplicationIntegrationTest.java @@ -55,9 +55,7 @@ public class R2dbcExampleApplicationIntegrationTest { .expectStatus() .isOk() .expectBody(Account.class) - .value((acc) -> { - assertThat(acc.getId(),is(1l)); - }); + .value((acc) -> assertThat(acc.getId(),is(1L))); } @Test @@ -71,9 +69,7 @@ public class R2dbcExampleApplicationIntegrationTest { .expectStatus() .isOk() .expectBody(List.class) - .value((accounts) -> { - assertThat(accounts.size(),not(is(0))); - }); + .value((accounts) -> assertThat(accounts.size(),not(is(0)))); } @@ -89,9 +85,7 @@ public class R2dbcExampleApplicationIntegrationTest { .expectStatus() .is2xxSuccessful() .expectBody(Account.class) - .value((acc) -> { - assertThat(acc.getId(),is(notNullValue())); - }); + .value((acc) -> assertThat(acc.getId(),is(notNullValue()))); } diff --git a/persistence-modules/redis/pom.xml b/persistence-modules/redis/pom.xml index d1cb927c20..571487af3d 100644 --- a/persistence-modules/redis/pom.xml +++ b/persistence-modules/redis/pom.xml @@ -56,9 +56,9 @@ 0.6 - 3.13.1 - 3.3.0 - 4.1.50.Final + 3.20.0 + 4.3.2 + 4.1.90.Final \ No newline at end of file diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java index 72ff42ff74..abc095bcdf 100644 --- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java +++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/client/RedisClient.java @@ -102,18 +102,18 @@ public class RedisClient { return 0L; } - public Set zrange(final String key, final long start, final long stop) { + public List zrange(final String key, final long start, final long stop) { try (Jedis jedis = jedisPool.getResource()) { return jedis.zrange(key, start, stop); } catch (Exception ex) { log.error("Exception caught in zrange", ex); } - return new HashSet(); + return new ArrayList<>(); } public String mset(final HashMap keysValues) { try (Jedis jedis = jedisPool.getResource()) { - ArrayList keysValuesArrayList = new ArrayList(); + ArrayList keysValuesArrayList = new ArrayList<>(); keysValues.forEach((key, value) -> { keysValuesArrayList.add(key); keysValuesArrayList.add(value); diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/iterator/RedisIterator.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/iterator/RedisIterator.java index 5fbd798ac2..fd57e75f6f 100644 --- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/iterator/RedisIterator.java +++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/iterator/RedisIterator.java @@ -5,8 +5,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.ScanResult; +import redis.clients.jedis.params.ScanParams; +import redis.clients.jedis.resps.ScanResult; import java.util.Iterator; import java.util.LinkedList; diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/ScanStrategy.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/ScanStrategy.java index 39d9e44a63..5ebfd7c135 100644 --- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/ScanStrategy.java +++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/ScanStrategy.java @@ -1,8 +1,8 @@ package com.baeldung.redis_scan.strategy; import redis.clients.jedis.Jedis; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.ScanResult; +import redis.clients.jedis.params.ScanParams; +import redis.clients.jedis.resps.ScanResult; public interface ScanStrategy { ScanResult scan(Jedis jedis, String cursor, ScanParams scanParams); diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Hscan.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Hscan.java index fd5ecd14ec..2873229302 100644 --- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Hscan.java +++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Hscan.java @@ -2,8 +2,8 @@ package com.baeldung.redis_scan.strategy.impl; import com.baeldung.redis_scan.strategy.ScanStrategy; import redis.clients.jedis.Jedis; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.ScanResult; +import redis.clients.jedis.params.ScanParams; +import redis.clients.jedis.resps.ScanResult; import java.util.Map; import java.util.Map.Entry; diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Scan.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Scan.java index f28b56e34c..c3cf94ff12 100644 --- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Scan.java +++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Scan.java @@ -2,8 +2,8 @@ package com.baeldung.redis_scan.strategy.impl; import com.baeldung.redis_scan.strategy.ScanStrategy; import redis.clients.jedis.Jedis; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.ScanResult; +import redis.clients.jedis.params.ScanParams; +import redis.clients.jedis.resps.ScanResult; public class Scan implements ScanStrategy { diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Sscan.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Sscan.java index ed47f7087e..aa5e58bf67 100644 --- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Sscan.java +++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Sscan.java @@ -2,8 +2,8 @@ package com.baeldung.redis_scan.strategy.impl; import com.baeldung.redis_scan.strategy.ScanStrategy; import redis.clients.jedis.Jedis; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.ScanResult; +import redis.clients.jedis.params.ScanParams; +import redis.clients.jedis.resps.ScanResult; public class Sscan implements ScanStrategy { diff --git a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Zscan.java b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Zscan.java index bdffc15883..a540e69f17 100644 --- a/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Zscan.java +++ b/persistence-modules/redis/src/main/java/com/baeldung/redis_scan/strategy/impl/Zscan.java @@ -2,9 +2,9 @@ package com.baeldung.redis_scan.strategy.impl; import com.baeldung.redis_scan.strategy.ScanStrategy; import redis.clients.jedis.Jedis; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.ScanResult; -import redis.clients.jedis.Tuple; +import redis.clients.jedis.params.ScanParams; +import redis.clients.jedis.resps.ScanResult; +import redis.clients.jedis.resps.Tuple; public class Zscan implements ScanStrategy { diff --git a/persistence-modules/redis/src/test/java/com/baeldung/JedisIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/JedisIntegrationTest.java index 50d28af3d1..664ed1d0c3 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/JedisIntegrationTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/JedisIntegrationTest.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.net.ServerSocket; import java.time.Duration; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; @@ -35,7 +36,10 @@ public class JedisIntegrationTest { port = s.getLocalPort(); s.close(); - redisServer = new RedisServer(port); + redisServer = RedisServer.builder() + .port(port) + .setting("maxheap 128M") + .build(); redisServer.start(); // Configure JEDIS @@ -148,7 +152,7 @@ public class JedisIntegrationTest { jedis.zadd(key, playerScore.getValue(), playerScore.getKey()); }); - Set players = jedis.zrevrange(key, 0, 1); + List players = jedis.zrevrange(key, 0, 1); Assert.assertEquals("PlayerThree", players.iterator().next()); long rank = jedis.zrevrank(key, "PlayerOne"); @@ -184,7 +188,7 @@ public class JedisIntegrationTest { p.zadd("ranking", 126, userOneId); p.zadd("ranking", 325, userTwoId); Response pipeExists = p.sismember("searched#" + userOneId, "paris"); - Response> pipeRanking = p.zrange("ranking", 0, -1); + Response> pipeRanking = p.zrange("ranking", 0, -1); p.sync(); Assert.assertTrue(pipeExists.get()); diff --git a/persistence-modules/redis/src/test/java/com/baeldung/RedissonConfigurationIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/RedissonConfigurationIntegrationTest.java index c2e771d7b8..b80cae98d8 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/RedissonConfigurationIntegrationTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/RedissonConfigurationIntegrationTest.java @@ -32,7 +32,10 @@ public class RedissonConfigurationIntegrationTest { port = s.getLocalPort(); s.close(); - redisServer = new RedisServer(port); + redisServer = RedisServer.builder() + .port(port) + .setting("maxheap 128M") + .build(); redisServer.start(); } diff --git a/persistence-modules/redis/src/test/java/com/baeldung/RedissonIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/RedissonIntegrationTest.java index 8c8e6a02dd..79581df989 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/RedissonIntegrationTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/RedissonIntegrationTest.java @@ -29,8 +29,11 @@ public class RedissonIntegrationTest { private static RedissonClient client; @BeforeClass - public static void setUp() throws IOException { - redisServer = new RedisServer(6379); + public static void setUp() { + redisServer = RedisServer.builder() + .port(6379) + .setting("maxheap 128M") + .build(); redisServer.start(); client = Redisson.create(); } diff --git a/persistence-modules/redis/src/test/java/com/baeldung/redis/deleteeverything/DeleteEverythingInRedisIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/redis/deleteeverything/DeleteEverythingInRedisIntegrationTest.java index e0376fc6a5..54123afdea 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/redis/deleteeverything/DeleteEverythingInRedisIntegrationTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/redis/deleteeverything/DeleteEverythingInRedisIntegrationTest.java @@ -23,7 +23,10 @@ public class DeleteEverythingInRedisIntegrationTest { port = s.getLocalPort(); s.close(); - redisServer = new RedisServer(port); + redisServer = RedisServer.builder() + .port(port) + .setting("maxheap 128M") + .build(); redisServer.start(); // Configure JEDIS diff --git a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java index 9bf0b2b086..5c325e8ea0 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/NaiveApproachIntegrationTest.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.net.ServerSocket; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -24,7 +25,10 @@ public class NaiveApproachIntegrationTest { port = s.getLocalPort(); s.close(); - redisServer = new RedisServer(port); + redisServer = RedisServer.builder() + .port(port) + .setting("maxheap 128M") + .build(); } @AfterClass @@ -50,7 +54,7 @@ public class NaiveApproachIntegrationTest { @Test public void testKeys() { - HashMap keyValues = new HashMap(); + HashMap keyValues = new HashMap<>(); keyValues.put("balls:cricket", "160"); keyValues.put("balls:football", "450"); keyValues.put("balls:volleyball", "270"); @@ -62,7 +66,7 @@ public class NaiveApproachIntegrationTest { @Test public void testSmembers() { - HashSet setMembers = new HashSet(); + HashSet setMembers = new HashSet<>(); setMembers.add("cricket_160"); setMembers.add("football_450"); setMembers.add("volleyball_270"); @@ -73,7 +77,7 @@ public class NaiveApproachIntegrationTest { @Test public void testHgetAll() { - HashMap keyValues = new HashMap(); + HashMap keyValues = new HashMap<>(); keyValues.put("balls:cricket", "160"); keyValues.put("balls:football", "450"); keyValues.put("balls:volleyball", "270"); @@ -84,12 +88,12 @@ public class NaiveApproachIntegrationTest { @Test public void testZRange() { - HashMap scoreMembers = new HashMap(); + HashMap scoreMembers = new HashMap<>(); scoreMembers.put("cricket", (double) 160); scoreMembers.put("football", (double) 450); scoreMembers.put("volleyball", (double) 270); redisClient.zadd("balls", scoreMembers); - Set readSetMembers = redisClient.zrange("balls", 0, -1); + List readSetMembers = redisClient.zrange("balls", 0, -1); Assert.assertEquals(readSetMembers.size(), scoreMembers.size()); } diff --git a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java index 9bde969b58..838d0144dc 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/redis_scan/ScanStrategyIntegrationTest.java @@ -8,7 +8,7 @@ import com.baeldung.redis_scan.strategy.impl.Scan; import com.baeldung.redis_scan.strategy.impl.Sscan; import com.baeldung.redis_scan.strategy.impl.Zscan; import org.junit.*; -import redis.clients.jedis.Tuple; +import redis.clients.jedis.resps.Tuple; import redis.embedded.RedisServer; import java.io.IOException; @@ -31,7 +31,10 @@ public class ScanStrategyIntegrationTest { port = s.getLocalPort(); s.close(); - redisServer = new RedisServer(port); + redisServer = RedisServer.builder() + .port(port) + .setting("maxheap 128M") + .build(); } @AfterClass @@ -57,7 +60,7 @@ public class ScanStrategyIntegrationTest { @Test public void testScanStrategy() { - HashMap keyValues = new HashMap(); + HashMap keyValues = new HashMap<>(); keyValues.put("balls:cricket", "160"); keyValues.put("balls:football", "450"); keyValues.put("balls:volleyball", "270"); @@ -66,7 +69,7 @@ public class ScanStrategyIntegrationTest { ScanStrategy scanStrategy = new Scan(); int iterationCount = 2; RedisIterator iterator = redisClient.iterator(iterationCount, "ball*", scanStrategy); - List results = new LinkedList(); + List results = new LinkedList<>(); while (iterator.hasNext()) { results.addAll(iterator.next()); } @@ -84,7 +87,7 @@ public class ScanStrategyIntegrationTest { Sscan scanStrategy = new Sscan("balls"); int iterationCount = 2; RedisIterator iterator = redisClient.iterator(iterationCount, "*", scanStrategy); - List results = new LinkedList(); + List results = new LinkedList<>(); while (iterator.hasNext()) { results.addAll(iterator.next()); } @@ -93,7 +96,7 @@ public class ScanStrategyIntegrationTest { @Test public void testHscanStrategy() { - HashMap hash = new HashMap(); + HashMap hash = new HashMap<>(); hash.put("cricket", "160"); hash.put("football", "450"); hash.put("volleyball", "270"); @@ -102,7 +105,7 @@ public class ScanStrategyIntegrationTest { Hscan scanStrategy = new Hscan("balls"); int iterationCount = 2; RedisIterator iterator = redisClient.iterator(iterationCount, "*", scanStrategy); - List> results = new LinkedList>(); + List> results = new LinkedList<>(); while (iterator.hasNext()) { results.addAll(iterator.next()); } @@ -111,7 +114,7 @@ public class ScanStrategyIntegrationTest { @Test public void testZscanStrategy() { - HashMap memberScores = new HashMap(); + HashMap memberScores = new HashMap<>(); memberScores.put("cricket", (double) 160); memberScores.put("football", (double) 450); memberScores.put("volleyball", (double) 270); @@ -120,7 +123,7 @@ public class ScanStrategyIntegrationTest { Zscan scanStrategy = new Zscan("balls"); int iterationCount = 2; RedisIterator iterator = redisClient.iterator(iterationCount, "*", scanStrategy); - List results = new LinkedList(); + List results = new LinkedList<>(); while (iterator.hasNext()) { results.addAll(iterator.next()); } diff --git a/pom.xml b/pom.xml index fb40055677..6f049d5ad0 100644 --- a/pom.xml +++ b/pom.xml @@ -365,8 +365,9 @@ muleesb - persistence-modules/deltaspike - persistence-modules/hibernate-ogm + persistence-modules/deltaspike + persistence-modules/hibernate-ogm + persistence-modules/java-cassandra @@ -541,8 +542,9 @@ lombok-modules/lombok-custom muleesb - persistence-modules/deltaspike - persistence-modules/hibernate-ogm + persistence-modules/deltaspike + persistence-modules/hibernate-ogm + persistence-modules/java-cassandra