Upgrade to Spring 6 and Spring Boot 3.

See #654
This commit is contained in:
Christoph Strobl
2022-06-01 11:20:04 +02:00
committed by Mark Paluch
parent e59e147d6f
commit d52d73f34c
2115 changed files with 8303 additions and 9562 deletions

View File

@@ -19,11 +19,11 @@ import lombok.Data;
import java.time.LocalDateTime;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;

View File

@@ -15,9 +15,9 @@
*/
package example.springdata.jpa.caching;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.NamedQuery;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.NamedQuery;
import org.springframework.data.jpa.domain.AbstractPersistable;

View File

@@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor;
import java.util.List;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
/**
* {@link ContactRepository} fragment implementation.

View File

@@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor;
import java.util.List;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
/**
* {@link EmployeeRepository} fragment implementation.

View File

@@ -15,10 +15,11 @@
*/
package example.springdata.jpa.compositions;
import jakarta.persistence.PersistenceUnitUtil;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.data.jpa.domain.AbstractPersistable;
import org.springframework.data.jpa.repository.support.JpaMetamodelEntityInformation;
@@ -87,9 +88,9 @@ public class FlushOnSaveRepositoryImpl<T> implements FlushOnSaveRepository<T> {
var userClass = ClassUtils.getUserClass(entity.getClass());
if (entity instanceof AbstractPersistable<?>) {
return new JpaPersistableEntityInformation(userClass, entityManager.getMetamodel());
return new JpaPersistableEntityInformation(userClass, entityManager.getMetamodel(),entityManager.getEntityManagerFactory().getPersistenceUnitUtil() );
}
return new JpaMetamodelEntityInformation(userClass, entityManager.getMetamodel());
return new JpaMetamodelEntityInformation(userClass, entityManager.getMetamodel(), entityManager.getEntityManagerFactory().getPersistenceUnitUtil());
}
}

View File

@@ -18,9 +18,9 @@ package example.springdata.jpa.compositions;
import lombok.Getter;
import lombok.Setter;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToOne;
import org.springframework.data.jpa.domain.AbstractPersistable;

View File

@@ -15,9 +15,9 @@
*/
package example.springdata.jpa.custom;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.NamedQuery;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.NamedQuery;
import org.springframework.data.jpa.domain.AbstractPersistable;

View File

@@ -32,7 +32,7 @@ public interface UserRepository extends CrudRepository<User, Long>, UserReposito
/**
* Find the user with the given username. This method will be translated into a query using the
* {@link javax.persistence.NamedQuery} annotation at the {@link User} class.
* {@link jakarta.persistence.NamedQuery} annotation at the {@link User} class.
*
* @param username
* @return

View File

@@ -17,8 +17,8 @@ package example.springdata.jpa.custom;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
/**
* Implementation fo the custom repository functionality declared in {@link UserRepositoryCustom} based on JPA. To use

View File

@@ -15,7 +15,7 @@
*/
package example.springdata.jpa.customall;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.data.jpa.repository.support.JpaEntityInformation;
import org.springframework.data.jpa.repository.support.SimpleJpaRepository;

View File

@@ -15,9 +15,9 @@
*/
package example.springdata.jpa.customall;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
/**
* Sample user class.

View File

@@ -18,9 +18,9 @@ package example.springdata.jpa.projections;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
/**
* @author Oliver Gierke

View File

@@ -39,7 +39,7 @@ public interface SimpleUserRepository extends CrudRepository<User, Long> {
/**
* Find the user with the given username. This method will be translated into a query using the
* {@link javax.persistence.NamedQuery} annotation at the {@link User} class.
* {@link jakarta.persistence.NamedQuery} annotation at the {@link User} class.
*
* @param username
* @return

View File

@@ -15,9 +15,9 @@
*/
package example.springdata.jpa.simple;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.NamedQuery;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.NamedQuery;
import org.springframework.data.jpa.domain.AbstractPersistable;

View File

@@ -20,9 +20,9 @@ import static org.assertj.core.api.Assertions.*;
import example.springdata.jpa.simple.SimpleUserRepository;
import example.springdata.jpa.simple.User;
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.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;

View File

@@ -3,9 +3,9 @@
*
* Licenseimport static org.junit.Assert.*;
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.After;
import org.junit.Before;
@@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.*;
import example.springdata.jpa.simple.User;
import javax.persistence.EntityManager;
import javax.persistence.Persistence;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Persistence;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;