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 <noreplay@yahoo.com>
Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
This commit is contained in:
timis1
2023-05-19 11:37:45 +03:00
committed by GitHub
parent 09e421c3cd
commit e624a6c893
93 changed files with 637 additions and 677 deletions
+4 -12
View File
@@ -19,11 +19,13 @@
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<classifier>jakarta</classifier>
<version>${querydsl.version}</version>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<classifier>jakarta</classifier>
<version>${querydsl.version}</version>
<scope>provided</scope>
</dependency>
@@ -34,12 +36,6 @@
<version>${hibernate.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
<version>${hibernate-jpa.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -106,8 +102,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
@@ -132,10 +126,8 @@
</build>
<properties>
<spring.version>4.3.4.RELEASE</spring.version>
<hibernate.version>5.2.5.Final</hibernate.version>
<hibernate-jpa.version>1.0.0.Final</hibernate-jpa.version>
<querydsl.version>4.1.4</querydsl.version>
<spring.version>6.0.6</spring.version>
<querydsl.version>5.0.0</querydsl.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
@@ -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<String, Integer> findMaxAgeByName() {
final JPAQuery<Person> 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)));
@@ -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 {
@@ -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 {
@@ -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 {
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
version="2.0">
version="3.0"
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
<!-- PersistenceUnit for datastore -->
<persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
@@ -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
@@ -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.*;