Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate to Jakarta EE 9.

Browse Source 
Closes #2305
This commit is contained in:
Jens Schauder
2021-09-28 11:48:08 +02:00
parent 4e3464fa5f
commit ece2cc5d0a
230 changed files with 822 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
pom.xml
View File

@@ -23,7 +23,7 @@
<dist.key>DATAJPA</dist.key>
<eclipselink>2.7.9</eclipselink>
<eclipselink>3.0.2</eclipselink>
<hibernate>5.6.0.Final</hibernate>
<mysql-connector-java>8.0.23</mysql-connector-java>
<postgresql>42.2.19</postgresql>
@@ -293,30 +293,37 @@
<dependency>
<groupId>${hibernate.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<artifactId>hibernate-core-jakarta</artifactId>
<version>${hibernate}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${hibernate.groupId}</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<artifactId>hibernate-jpamodelgen-jakarta</artifactId>
<version>${hibernate}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-api}</version>
</dependency>
<!-- QueryDsl -->
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${querydsl}</version>
<classifier>jpa</classifier>
<classifier>jakarta</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<classifier>jakarta</classifier>
<version>${querydsl}</version>
<optional>true</optional>
</dependency>
@@ -339,31 +346,58 @@
</dependency>
<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2.1</version>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${cdi}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation-api}</version>
<scope>test</scope>
</dependency>
<!--
Apache Open Web beans offers a jakarta based version using maven classifiers.
Unfortunately the dependencies are broken, so one has to exclude the broken ones and add the proper ones
explicitly.
This can be simpliefied once https://issues.apache.org/jira/browse/OWB-1368 is fixed.
See: https://stackoverflow.com/questions/66610586/openwebbeans-gives-error-java-lang-noclassdeffounderror-when-using-with-tomcat-1
-->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-se</artifactId>
<version>${webbeans}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>${webbeans}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<version>${webbeans}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>

2
src/main/asciidoc/jpa.adoc
View File

@@ -573,7 +573,7 @@ int setFixedFirstnameFor(String firstname, String lastname);
----
====
Doing so triggers the query annotated to the method as an updating query instead of a selecting one. As the `EntityManager` might contain outdated entities after the execution of the modifying query, we do not automatically clear it (see the https://docs.oracle.com/javaee/7/api/javax/persistence/EntityManager.html[JavaDoc] of `EntityManager.clear()` for details), since this effectively drops all non-flushed changes still pending in the `EntityManager`.
Doing so triggers the query annotated to the method as an updating query instead of a selecting one. As the `EntityManager` might contain outdated entities after the execution of the modifying query, we do not automatically clear it (see the https://jakarta.ee/specifications/persistence/2.2/apidocs/javax/persistence/entitymanager[JavaDoc] of `EntityManager.clear()` for details), since this effectively drops all non-flushed changes still pending in the `EntityManager`.
If you wish the `EntityManager` to be cleared automatically, you can set the `@Modifying` annotation's `clearAutomatically` attribute to `true`.
The `@Modifying` annotation is only relevant in combination with the `@Query` annotation.

20
src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java
View File

@@ -21,16 +21,16 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.Attribute.PersistentAttributeType;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.SingularAttribute;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.From;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.SingularAttribute;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.domain.Example;

4
src/main/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConverters.java
View File

@@ -22,8 +22,8 @@ import java.time.LocalTime;
import java.time.ZoneId;
import java.util.Date;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
import jakarta.persistence.AttributeConverter;
import jakarta.persistence.Converter;
import org.springframework.data.convert.Jsr310Converters.DateToInstantConverter;
import org.springframework.data.convert.Jsr310Converters.DateToLocalDateConverter;

8
src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java
View File

@@ -21,10 +21,10 @@ import java.time.ZoneId;
import java.util.Date;
import java.util.Optional;
import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import org.springframework.data.domain.Auditable;
import org.springframework.lang.Nullable;

8
src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java
View File

@@ -17,10 +17,10 @@ package org.springframework.data.jpa.domain;
import java.io.Serializable;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.Transient;
import org.springframework.data.domain.Persistable;
import org.springframework.data.util.ProxyUtils;

4
src/main/java/org/springframework/data/jpa/domain/JpaSort.java
View File

@@ -21,8 +21,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.PluralAttribute;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.PluralAttribute;
import org.springframework.data.domain.Sort;
import org.springframework.lang.Nullable;

8
src/main/java/org/springframework/data/jpa/domain/Specification.java
View File

@@ -17,10 +17,10 @@ package org.springframework.data.jpa.domain;
import java.io.Serializable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import org.springframework.lang.Nullable;

8
src/main/java/org/springframework/data/jpa/domain/SpecificationComposition.java
View File

@@ -17,10 +17,10 @@ package org.springframework.data.jpa.domain;
import java.io.Serializable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import org.springframework.lang.Nullable;

2
src/main/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessor.java
View File

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
/**
* {@link BeanFactoryPostProcessor} that ensures that the {@link AnnotationBeanConfigurerAspect} aspect is up and
* running <em>before</em> the {@link javax.persistence.EntityManagerFactory} gets created as this already instantiates
* running <em>before</em> the {@link jakarta.persistence.EntityManagerFactory} gets created as this already instantiates
* entity listeners and we need to get injection into {@link org.springframework.beans.factory.annotation.Configurable}
* to work in them.
*

4
src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.domain.support;
import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
import jakarta.persistence.PrePersist;
import jakarta.persistence.PreUpdate;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.annotation.Configurable;

4
src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java
View File

@@ -18,8 +18,8 @@ package org.springframework.data.jpa.mapping;
import java.util.Set;
import java.util.function.Predicate;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
import org.springframework.data.jpa.provider.PersistenceProvider;
import org.springframework.data.jpa.util.JpaMetamodel;

2
src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java
View File

@@ -41,7 +41,7 @@ class JpaPersistentEntityImpl<T> extends BasicPersistentEntity<T, JpaPersistentP
private static final String INVALID_VERSION_ANNOTATION = "%s is annotated with "
+ org.springframework.data.annotation.Version.class.getName() + " but needs to use "
+ javax.persistence.Version.class.getName() + " to trigger optimistic locking correctly!";
+ jakarta.persistence.Version.class.getName() + " to trigger optimistic locking correctly!";
private final ProxyIdAccessor proxyIdAccessor;
private final JpaMetamodel metamodel;

4
src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
View File

@@ -21,8 +21,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.*;
import javax.persistence.metamodel.Metamodel;
import jakarta.persistence.*;
import jakarta.persistence.metamodel.Metamodel;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.data.annotation.AccessType.Type;

4
src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.provider;
import javax.persistence.EntityManager;
import javax.persistence.metamodel.Metamodel;
import jakarta.persistence.EntityManager;
import jakarta.persistence.metamodel.Metamodel;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;

18
src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java
View File

@@ -22,11 +22,11 @@ import java.util.Collections;
import java.util.NoSuchElementException;
import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.metamodel.IdentifiableType;
import javax.persistence.metamodel.Metamodel;
import javax.persistence.metamodel.SingularAttribute;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import jakarta.persistence.metamodel.IdentifiableType;
import jakarta.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.SingularAttribute;
import org.eclipse.persistence.jpa.JpaQuery;
import org.eclipse.persistence.queries.ScrollableCursor;
@@ -108,7 +108,7 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.provider.PersistenceProvider#executeQueryWithResultStream(javax.persistence.Query)
* @see org.springframework.data.jpa.provider.PersistenceProvider#executeQueryWithResultStream(jakarta.persistence.Query)
*/
@Override
public CloseableIterator<Object> executeQueryWithResultStream(Query jpaQuery) {
@@ -148,7 +148,7 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.provider.PersistenceProvider#executeQueryWithResultStream(javax.persistence.Query)
* @see org.springframework.data.jpa.provider.PersistenceProvider#executeQueryWithResultStream(jakarta.persistence.Query)
*/
@Override
public CloseableIterator<Object> executeQueryWithResultStream(Query jpaQuery) {
@@ -163,7 +163,7 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.query.QueryExtractor#extractQueryString(javax.persistence.Query)
* @see org.springframework.data.jpa.repository.query.QueryExtractor#extractQueryString(jakarta.persistence.Query)
*/
@Nullable
@Override
@@ -326,7 +326,7 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor {
*/
interface Constants {
String GENERIC_JPA_ENTITY_MANAGER_INTERFACE = "javax.persistence.EntityManager";
String GENERIC_JPA_ENTITY_MANAGER_INTERFACE = "jakarta.persistence.EntityManager";
String ECLIPSELINK_ENTITY_MANAGER_INTERFACE = "org.eclipse.persistence.jpa.JpaEntityManager";
// needed as Spring only exposes that interface via the EM proxy
String HIBERNATE_ENTITY_MANAGER_INTERFACE = "org.hibernate.jpa.HibernateEntityManager";

2
src/main/java/org/springframework/data/jpa/provider/QueryExtractor.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.provider;
import javax.persistence.Query;
import jakarta.persistence.Query;
import org.springframework.lang.Nullable;

12
src/main/java/org/springframework/data/jpa/repository/EntityGraph.java
View File

@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
import org.springframework.data.jpa.repository.query.JpaQueryMethod;
/**
* Annotation to configure the JPA 2.1 {@link javax.persistence.EntityGraph}s that should be used on repository methods.
* Annotation to configure the JPA 2.1 {@link jakarta.persistence.EntityGraph}s that should be used on repository methods.
* Since 1.9 we support the definition of dynamic {@link EntityGraph}s by allowing to customize the fetch-graph via
* {@link #attributePaths()} ad-hoc fetch-graph configuration.
*
@@ -66,7 +66,7 @@ public @interface EntityGraph {
String[] attributePaths() default {};
/**
* Enum for JPA 2.1 {@link javax.persistence.EntityGraph} types.
* Enum for JPA 2.1 {@link jakarta.persistence.EntityGraph} types.
*
* @author Thomas Darimont
* @since 1.6
@@ -74,24 +74,24 @@ public @interface EntityGraph {
public enum EntityGraphType {
/**
* When the javax.persistence.loadgraph property is used to specify an entity graph, attributes that are specified
* When the jakarta.persistence.loadgraph property is used to specify an entity graph, attributes that are specified
* by attribute nodes of the entity graph are treated as FetchType.EAGER and attributes that are not specified are
* treated according to their specified or default FetchType.
*
* @see <a href="https://download.oracle.com/otn-pub/jcp/persistence-2_1-fr-eval-spec/JavaPersistence.pdf">JPA 2.1
* Specification: 3.7.4.2 Load Graph Semantics</a>
*/
LOAD("javax.persistence.loadgraph"),
LOAD("jakarta.persistence.loadgraph"),
/**
* When the javax.persistence.fetchgraph property is used to specify an entity graph, attributes that are specified
* When the jakarta.persistence.fetchgraph property is used to specify an entity graph, attributes that are specified
* by attribute nodes of the entity graph are treated as FetchType.EAGER and attributes that are not specified are
* treated as FetchType.LAZY
*
* @see <a href="https://download.oracle.com/otn-pub/jcp/persistence-2_1-fr-eval-spec/JavaPersistence.pdf">JPA 2.1
* Specification: 3.7.4.1 Fetch Graph Semantics</a>
*/
FETCH("javax.persistence.fetchgraph");
FETCH("jakarta.persistence.fetchgraph");
private final String key;

2
src/main/java/org/springframework/data/jpa/repository/JpaContext.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.repository;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
/**
* Interface for components to provide useful information about the current JPA setup within the current

6
src/main/java/org/springframework/data/jpa/repository/JpaRepository.java
View File

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository;
import java.util.List;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.Sort;
@@ -128,7 +128,7 @@ public interface JpaRepository<T, ID> extends PagingAndSortingRepository<T, ID>,
/**
* Returns a reference to the entity with the given identifier. Depending on how the JPA persistence provider is
* implemented this is very likely to always return an instance and throw an
* {@link javax.persistence.EntityNotFoundException} on first access. Some of them will reject invalid identifiers
* {@link jakarta.persistence.EntityNotFoundException} on first access. Some of them will reject invalid identifiers
* immediately.
*
* @param id must not be {@literal null}.
@@ -142,7 +142,7 @@ public interface JpaRepository<T, ID> extends PagingAndSortingRepository<T, ID>,
/**
* Returns a reference to the entity with the given identifier. Depending on how the JPA persistence provider is
* implemented this is very likely to always return an instance and throw an
* {@link javax.persistence.EntityNotFoundException} on first access. Some of them will reject invalid identifiers
* {@link jakarta.persistence.EntityNotFoundException} on first access. Some of them will reject invalid identifiers
* immediately.
*
* @param id must not be {@literal null}.

2
src/main/java/org/springframework/data/jpa/repository/Lock.java
View File

@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.persistence.LockModeType;
import jakarta.persistence.LockModeType;
/**
* Annotation used to specify the {@link LockModeType} to be used when executing the query. It will be evaluated when

4
src/main/java/org/springframework/data/jpa/repository/Query.java
View File

@@ -64,13 +64,13 @@ public @interface Query {
boolean nativeQuery() default false;
/**
* The named query to be used. If not defined, a {@link javax.persistence.NamedQuery} with name of
* The named query to be used. If not defined, a {@link jakarta.persistence.NamedQuery} with name of
* {@code $ domainClass}.${queryMethodName}} will be used.
*/
String name() default "";
/**
* Returns the name of the {@link javax.persistence.NamedQuery} to be used to execute count queries when pagination is
* Returns the name of the {@link jakarta.persistence.NamedQuery} to be used to execute count queries when pagination is
* used. Will default to the named query name configured suffixed by {@code .count}.
*
* @see #name()

2
src/main/java/org/springframework/data/jpa/repository/QueryHints.java
View File

@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.persistence.QueryHint;
import jakarta.persistence.QueryHint;
/**
* Wrapper annotation to allow {@link QueryHint} annotations to be bound to methods. It will be evaluated when using

2
src/main/java/org/springframework/data/jpa/repository/Temporal.java
View File

@@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.Date;
import javax.persistence.TemporalType;
import jakarta.persistence.TemporalType;
/**
* Annotation to declare an appropriate {@code TemporalType} on query method parameters. Note that this annotation can

10
src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java
View File

@@ -19,10 +19,10 @@ import java.lang.annotation.Annotation;
import java.util.Optional;
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.EntityManager;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.persistence.EntityManager;
import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
import org.springframework.data.repository.cdi.CdiRepositoryBean;
@@ -62,7 +62,7 @@ class JpaRepositoryBean<T> extends CdiRepositoryBean<T> {
/*
* (non-Javadoc)
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
*/
@Override
protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {

14
src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
View File

@@ -24,13 +24,13 @@ import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.ProcessBean;
import javax.persistence.EntityManager;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.ProcessBean;
import jakarta.persistence.EntityManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

2
src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java
View File

@@ -22,7 +22,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.persistence.EntityManagerFactory;
import jakarta.persistence.EntityManagerFactory;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.context.annotation.ComponentScan.Filter;

4
src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java
View File

@@ -18,8 +18,8 @@ package org.springframework.data.jpa.repository.config;
import java.util.Collection;
import java.util.Set;
import javax.persistence.EntityManagerFactory;
import javax.persistence.metamodel.Metamodel;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.metamodel.Metamodel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

12
src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java
View File

@@ -26,10 +26,10 @@ import java.util.Locale;
import java.util.Optional;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.MappedSuperclass;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceUnit;
import jakarta.persistence.Entity;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.PersistenceUnit;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -242,8 +242,8 @@ public class JpaRepositoryConfigExtension extends RepositoryConfigurationExtensi
}
/**
* Creates an anonymous factory to extract the actual {@link javax.persistence.EntityManager} from the
* {@link javax.persistence.EntityManagerFactory} bean name reference.
* Creates an anonymous factory to extract the actual {@link jakarta.persistence.EntityManager} from the
* {@link jakarta.persistence.EntityManagerFactory} bean name reference.
*
* @param config
* @param source

16
src/main/java/org/springframework/data/jpa/repository/query/AbstractJpaQuery.java
View File

@@ -23,13 +23,13 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
import javax.persistence.Query;
import javax.persistence.QueryHint;
import javax.persistence.Tuple;
import javax.persistence.TupleElement;
import javax.persistence.TypedQuery;
import jakarta.persistence.EntityManager;
import jakarta.persistence.LockModeType;
import jakarta.persistence.Query;
import jakarta.persistence.QueryHint;
import jakarta.persistence.Tuple;
import jakarta.persistence.TupleElement;
import jakarta.persistence.TypedQuery;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.jpa.provider.PersistenceProvider;
@@ -228,7 +228,7 @@ public abstract class AbstractJpaQuery implements RepositoryQuery {
}
/**
* Configures the {@link javax.persistence.EntityGraph} to use for the given {@link JpaQueryMethod} if the
* Configures the {@link jakarta.persistence.EntityGraph} to use for the given {@link JpaQueryMethod} if the
* {@link EntityGraph} annotation is present.
*
* @param query must not be {@literal null}.

4
src/main/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQuery.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
import org.springframework.data.repository.query.ResultProcessor;

2
src/main/java/org/springframework/data/jpa/repository/query/DefaultJpaEntityMetadata.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.Entity;
import jakarta.persistence.Entity;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.util.Assert;

12
src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java
View File

@@ -20,11 +20,11 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.persistence.AttributeNode;
import javax.persistence.EntityGraph;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.Subgraph;
import jakarta.persistence.AttributeNode;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import jakarta.persistence.Subgraph;
import org.springframework.data.jpa.repository.support.MutableQueryHints;
import org.springframework.data.jpa.repository.support.QueryHints;
@@ -48,7 +48,7 @@ import org.springframework.util.StringUtils;
public class Jpa21Utils {
private static final @Nullable Method GET_ENTITY_GRAPH_METHOD;
private static final boolean JPA21_AVAILABLE = ClassUtils.isPresent("javax.persistence.NamedEntityGraph",
private static final boolean JPA21_AVAILABLE = ClassUtils.isPresent("jakarta.persistence.NamedEntityGraph",
Jpa21Utils.class.getClassLoader());
static {

14
src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import org.springframework.data.domain.Sort;
import org.springframework.data.repository.query.ReturnedType;
@@ -50,7 +50,7 @@ public class JpaCountQueryCreator extends JpaQueryCreator {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.query.JpaQueryCreator#createCriteriaQuery(javax.persistence.criteria.CriteriaBuilder, org.springframework.data.repository.query.ReturnedType)
* @see org.springframework.data.jpa.repository.query.JpaQueryCreator#createCriteriaQuery(jakarta.persistence.criteria.CriteriaBuilder, org.springframework.data.repository.query.ReturnedType)
*/
@Override
protected CriteriaQuery<? extends Object> createCriteriaQuery(CriteriaBuilder builder, ReturnedType type) {
@@ -59,7 +59,7 @@ public class JpaCountQueryCreator extends JpaQueryCreator {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.query.JpaQueryCreator#complete(javax.persistence.criteria.Predicate, org.springframework.data.domain.Sort, javax.persistence.criteria.CriteriaQuery, javax.persistence.criteria.CriteriaBuilder, javax.persistence.criteria.Root)
* @see org.springframework.data.jpa.repository.query.JpaQueryCreator#complete(jakarta.persistence.criteria.Predicate, org.springframework.data.domain.Sort, jakarta.persistence.criteria.CriteriaQuery, jakarta.persistence.criteria.CriteriaBuilder, jakarta.persistence.criteria.Root)
*/
@Override
@SuppressWarnings("unchecked")

2
src/main/java/org/springframework/data/jpa/repository/query/JpaParameters.java
View File

@@ -19,7 +19,7 @@ import java.lang.reflect.Method;
import java.util.Date;
import java.util.List;
import javax.persistence.TemporalType;
import jakarta.persistence.TemporalType;
import org.springframework.core.MethodParameter;
import org.springframework.data.jpa.repository.Temporal;

20
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
View File

@@ -24,15 +24,15 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.ParameterExpression;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Selection;
import javax.persistence.metamodel.SingularAttribute;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.ParameterExpression;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.criteria.Selection;
import jakarta.persistence.metamodel.SingularAttribute;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.query.ParameterMetadataProvider.ParameterMetadata;
@@ -106,7 +106,7 @@ public class JpaQueryCreator extends AbstractQueryCreator<CriteriaQuery<? extend
}
/**
* Returns all {@link javax.persistence.criteria.ParameterExpression} created when creating the query.
* Returns all {@link jakarta.persistence.criteria.ParameterExpression} created when creating the query.
*
* @return the parameterExpressions
*/

8
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
View File

@@ -20,10 +20,10 @@ import java.util.Collection;
import java.util.List;
import java.util.Optional;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.Query;
import javax.persistence.StoredProcedureQuery;
import jakarta.persistence.EntityManager;
import jakarta.persistence.NoResultException;
import jakarta.persistence.Query;
import jakarta.persistence.StoredProcedureQuery;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.ConfigurableConversionService;

2
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryFactory.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
import org.springframework.data.repository.query.RepositoryQuery;

6
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategy.java
View File

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.query;
import java.lang.reflect.Method;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -143,7 +143,7 @@ public final class JpaQueryLookupStrategy {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy.AbstractQueryLookupStrategy#resolveQuery(org.springframework.data.jpa.repository.query.JpaQueryMethod, javax.persistence.EntityManager, org.springframework.data.repository.core.NamedQueries)
* @see org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy.AbstractQueryLookupStrategy#resolveQuery(org.springframework.data.jpa.repository.query.JpaQueryMethod, jakarta.persistence.EntityManager, org.springframework.data.repository.core.NamedQueries)
*/
@Override
protected RepositoryQuery resolveQuery(JpaQueryMethod method, EntityManager em, NamedQueries namedQueries) {
@@ -242,7 +242,7 @@ public final class JpaQueryLookupStrategy {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy.AbstractQueryLookupStrategy#resolveQuery(org.springframework.data.jpa.repository.query.JpaQueryMethod, javax.persistence.EntityManager, org.springframework.data.repository.core.NamedQueries)
* @see org.springframework.data.jpa.repository.query.JpaQueryLookupStrategy.AbstractQueryLookupStrategy#resolveQuery(org.springframework.data.jpa.repository.query.JpaQueryMethod, jakarta.persistence.EntityManager, org.springframework.data.repository.core.NamedQueries)
*/
@Override
protected RepositoryQuery resolveQuery(JpaQueryMethod method, EntityManager em, NamedQueries namedQueries) {

4
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java
View File

@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import javax.persistence.LockModeType;
import javax.persistence.QueryHint;
import jakarta.persistence.LockModeType;
import jakarta.persistence.QueryHint;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.core.annotation.AnnotationUtils;

10
src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java
View File

@@ -15,10 +15,10 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.TypedQuery;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import jakarta.persistence.Tuple;
import jakarta.persistence.TypedQuery;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,7 +31,7 @@ import org.springframework.data.repository.query.ReturnedType;
import org.springframework.lang.Nullable;
/**
* Implementation of {@link RepositoryQuery} based on {@link javax.persistence.NamedQuery}s.
* Implementation of {@link RepositoryQuery} based on {@link jakarta.persistence.NamedQuery}s.
*
* @author Oliver Gierke
* @author Thomas Darimont

6
src/main/java/org/springframework/data/jpa/repository/query/NativeJpaQuery.java
View File

@@ -15,9 +15,9 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.Tuple;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import jakarta.persistence.Tuple;
import org.springframework.data.repository.query.Parameters;
import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;

2
src/main/java/org/springframework/data/jpa/repository/query/ParameterBinder.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.Query;
import jakarta.persistence.Query;
import org.springframework.data.jpa.repository.query.QueryParameterSetter.ErrorHandling;
import org.springframework.util.Assert;

8
src/main/java/org/springframework/data/jpa/repository/query/ParameterBinderFactory.java
View File

@@ -40,7 +40,7 @@ class ParameterBinderFactory {
*
* @param parameters method parameters that are available for binding, must not be {@literal null}.
* @return a {@link ParameterBinder} that can assign values for the method parameters to query parameters of a
* {@link javax.persistence.Query}
* {@link jakarta.persistence.Query}
*/
static ParameterBinder createBinder(JpaParameters parameters) {
@@ -54,12 +54,12 @@ class ParameterBinderFactory {
/**
* Creates a {@link ParameterBinder} that just matches method parameter to parameters of a
* {@link javax.persistence.criteria.CriteriaQuery}.
* {@link jakarta.persistence.criteria.CriteriaQuery}.
*
* @param parameters method parameters that are available for binding, must not be {@literal null}.
* @param metadata must not be {@literal null}.
* @return a {@link ParameterBinder} that can assign values for the method parameters to query parameters of a
* {@link javax.persistence.criteria.CriteriaQuery}
* {@link jakarta.persistence.criteria.CriteriaQuery}
*/
static ParameterBinder createCriteriaBinder(JpaParameters parameters, List<ParameterMetadata<?>> metadata) {
@@ -82,7 +82,7 @@ class ParameterBinderFactory {
* @param parser must not be {@literal null}.
* @param evaluationContextProvider must not be {@literal null}.
* @return a {@link ParameterBinder} that can assign values for the method parameters to query parameters of a
* {@link javax.persistence.Query} while processing SpEL expressions where applicable.
* {@link jakarta.persistence.Query} while processing SpEL expressions where applicable.
*/
static ParameterBinder createQueryAwareBinder(JpaParameters parameters, DeclaredQuery query,
SpelExpressionParser parser, QueryMethodEvaluationContextProvider evaluationContextProvider) {

6
src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java
View File

@@ -24,8 +24,8 @@ import java.util.List;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.ParameterExpression;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.ParameterExpression;
import org.springframework.data.jpa.provider.PersistenceProvider;
import org.springframework.data.repository.query.Parameter;
@@ -226,7 +226,7 @@ class ParameterMetadataProvider {
}
/**
* Prepares the object before it's actually bound to the {@link javax.persistence.Query;}.
* Prepares the object before it's actually bound to the {@link jakarta.persistence.Query;}.
*
* @param value must not be {@literal null}.
*/

10
src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java
View File

@@ -17,11 +17,11 @@ package org.springframework.data.jpa.repository.query;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;

4
src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java
View File

@@ -18,13 +18,13 @@ package org.springframework.data.jpa.repository.query;
import java.util.Objects;
import javax.persistence.ParameterMode;
import jakarta.persistence.ParameterMode;
import org.springframework.lang.Nullable;
/**
* This class represents a Stored Procedure Parameter and an instance of the annotation
* {@link javax.persistence.StoredProcedureParameter}.
* {@link jakarta.persistence.StoredProcedureParameter}.
*
* @author Gabriel Basilio
* @author Greg Turnquist

10
src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java
View File

@@ -25,10 +25,10 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import javax.persistence.Parameter;
import javax.persistence.Query;
import javax.persistence.TemporalType;
import javax.persistence.criteria.ParameterExpression;
import jakarta.persistence.Parameter;
import jakarta.persistence.Query;
import jakarta.persistence.TemporalType;
import jakarta.persistence.criteria.ParameterExpression;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -77,7 +77,7 @@ interface QueryParameterSetter {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.query.QueryParameterSetter#setParameter(javax.persistence.Query, java.lang.Object[])
* @see org.springframework.data.jpa.repository.query.QueryParameterSetter#setParameter(jakarta.persistence.Query, java.lang.Object[])
*/
@SuppressWarnings("unchecked")
@Override

16
src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java
View File

@@ -18,8 +18,8 @@ package org.springframework.data.jpa.repository.query;
import java.util.List;
import java.util.function.Function;
import javax.persistence.Query;
import javax.persistence.TemporalType;
import jakarta.persistence.Query;
import jakarta.persistence.TemporalType;
import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
import org.springframework.data.jpa.repository.query.ParameterMetadataProvider.ParameterMetadata;
@@ -325,7 +325,7 @@ abstract class QueryParameterSetterFactory {
}
}
private static class ParameterImpl<T> implements javax.persistence.Parameter<T> {
private static class ParameterImpl<T> implements jakarta.persistence.Parameter<T> {
private final Class<T> parameterType;
private final @Nullable String name;
@@ -336,9 +336,9 @@ abstract class QueryParameterSetterFactory {
*
* @param parameter can be {@literal null}.
* @param binding must not be {@literal null}.
* @return a {@link javax.persistence.Parameter} object based on the information from the arguments.
* @return a {@link jakarta.persistence.Parameter} object based on the information from the arguments.
*/
static javax.persistence.Parameter<?> of(@Nullable JpaParameter parameter, ParameterBinding binding) {
static jakarta.persistence.Parameter<?> of(@Nullable JpaParameter parameter, ParameterBinding binding) {
Class<?> type = parameter == null ? Object.class : parameter.getType();
@@ -361,7 +361,7 @@ abstract class QueryParameterSetterFactory {
/*
* (non-Javadoc)
* @see javax.persistence.Parameter#getName()
* @see jakarta.persistence.Parameter#getName()
*/
@Nullable
@Override
@@ -371,7 +371,7 @@ abstract class QueryParameterSetterFactory {
/*
* (non-Javadoc)
* @see javax.persistence.Parameter#getPosition()
* @see jakarta.persistence.Parameter#getPosition()
*/
@Nullable
@Override
@@ -381,7 +381,7 @@ abstract class QueryParameterSetterFactory {
/*
* (non-Javadoc)
* @see javax.persistence.Parameter#getParameterType()
* @see jakarta.persistence.Parameter#getParameterType()
*/
@Override
public Class<T> getParameterType() {

56
src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
View File

@@ -15,8 +15,26 @@
*/
package org.springframework.data.jpa.repository.query;
import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.*;
import static java.util.regex.Pattern.*;
import static javax.persistence.metamodel.Attribute.PersistentAttributeType.*;
import jakarta.persistence.EntityManager;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Parameter;
import jakarta.persistence.Query;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.Fetch;
import jakarta.persistence.criteria.From;
import jakarta.persistence.criteria.Join;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
import jakarta.persistence.metamodel.Bindable;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.PluralAttribute;
import jakarta.persistence.metamodel.SingularAttribute;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
@@ -26,24 +44,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.persistence.EntityManager;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Parameter;
import javax.persistence.Query;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Fetch;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.Attribute.PersistentAttributeType;
import javax.persistence.metamodel.Bindable;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.PluralAttribute;
import javax.persistence.metamodel.SingularAttribute;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.domain.Sort;
@@ -540,14 +540,14 @@ public abstract class QueryUtils {
}
/**
* Turns the given {@link Sort} into {@link javax.persistence.criteria.Order}s.
* Turns the given {@link Sort} into {@link jakarta.persistence.criteria.Order}s.
*
* @param sort the {@link Sort} instance to be transformed into JPA {@link javax.persistence.criteria.Order}s.
* @param sort the {@link Sort} instance to be transformed into JPA {@link jakarta.persistence.criteria.Order}s.
* @param from must not be {@literal null}.
* @param cb must not be {@literal null}.
* @return a {@link List} of {@link javax.persistence.criteria.Order}s.
* @return a {@link List} of {@link jakarta.persistence.criteria.Order}s.
*/
public static List<javax.persistence.criteria.Order> toOrders(Sort sort, From<?, ?> from, CriteriaBuilder cb) {
public static List<jakarta.persistence.criteria.Order> toOrders(Sort sort, From<?, ?> from, CriteriaBuilder cb) {
if (sort.isUnsorted()) {
return Collections.emptyList();
@@ -556,7 +556,7 @@ public abstract class QueryUtils {
Assert.notNull(from, "From must not be null!");
Assert.notNull(cb, "CriteriaBuilder must not be null!");
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
List<jakarta.persistence.criteria.Order> orders = new ArrayList<>();
for (org.springframework.data.domain.Sort.Order order : sort) {
orders.add(toJpaOrder(order, from, cb));
@@ -596,15 +596,15 @@ public abstract class QueryUtils {
}
/**
* Creates a criteria API {@link javax.persistence.criteria.Order} from the given {@link Order}.
* Creates a criteria API {@link jakarta.persistence.criteria.Order} from the given {@link Order}.
*
* @param order the order to transform into a JPA {@link javax.persistence.criteria.Order}
* @param order the order to transform into a JPA {@link jakarta.persistence.criteria.Order}
* @param from the {@link From} the {@link Order} expression is based on
* @param cb the {@link CriteriaBuilder} to build the {@link javax.persistence.criteria.Order} with
* @param cb the {@link CriteriaBuilder} to build the {@link jakarta.persistence.criteria.Order} with
* @return Guaranteed to be not {@literal null}.
*/
@SuppressWarnings("unchecked")
private static javax.persistence.criteria.Order toJpaOrder(Order order, From<?, ?> from, CriteriaBuilder cb) {
private static jakarta.persistence.criteria.Order toJpaOrder(Order order, From<?, ?> from, CriteriaBuilder cb) {
PropertyPath property = PropertyPath.from(order.getProperty(), from.getJavaType());
Expression<?> expression = toExpressionRecursively(from, property);

4
src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.repository.query;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
import org.springframework.data.repository.query.RepositoryQuery;

8
src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSource.java
View File

@@ -22,10 +22,10 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import javax.persistence.NamedStoredProcedureQueries;
import javax.persistence.NamedStoredProcedureQuery;
import javax.persistence.ParameterMode;
import javax.persistence.StoredProcedureParameter;
import jakarta.persistence.NamedStoredProcedureQueries;
import jakarta.persistence.NamedStoredProcedureQuery;
import jakarta.persistence.ParameterMode;
import jakarta.persistence.StoredProcedureParameter;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.lang.Nullable;

2
src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributes.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.persistence.StoredProcedureQuery;
import jakarta.persistence.StoredProcedureQuery;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

10
src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java
View File

@@ -19,11 +19,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.NamedStoredProcedureQuery;
import javax.persistence.ParameterMode;
import javax.persistence.StoredProcedureQuery;
import javax.persistence.TypedQuery;
import jakarta.persistence.EntityManager;
import jakarta.persistence.NamedStoredProcedureQuery;
import jakarta.persistence.ParameterMode;
import jakarta.persistence.StoredProcedureQuery;
import jakarta.persistence.TypedQuery;
import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
import org.springframework.data.repository.query.Parameter;

2
src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadata.java
View File

@@ -18,7 +18,7 @@ package org.springframework.data.jpa.repository.support;
import java.lang.reflect.Method;
import java.util.Optional;
import javax.persistence.LockModeType;
import jakarta.persistence.LockModeType;
import org.springframework.data.jpa.repository.EntityGraph;
import org.springframework.lang.Nullable;

4
src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java
View File

@@ -23,8 +23,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Predicate;
import javax.persistence.LockModeType;
import javax.persistence.QueryHint;
import jakarta.persistence.LockModeType;
import jakarta.persistence.QueryHint;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;

4
src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java
View File

@@ -18,8 +18,8 @@ package org.springframework.data.jpa.repository.support;
import java.util.List;
import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.metamodel.ManagedType;
import jakarta.persistence.EntityManager;
import jakarta.persistence.metamodel.ManagedType;
import org.springframework.data.jpa.repository.JpaContext;
import org.springframework.util.Assert;

2
src/main/java/org/springframework/data/jpa/repository/support/DefaultQueryHints.java
View File

@@ -18,7 +18,7 @@ package org.springframework.data.jpa.repository.support;
import java.util.Optional;
import java.util.function.BiConsumer;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.data.jpa.repository.EntityGraph;
import org.springframework.data.jpa.repository.query.Jpa21Utils;

4
src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java
View File

@@ -17,8 +17,8 @@ package org.springframework.data.jpa.repository.support;
import static org.springframework.data.jpa.util.BeanDefinitionUtils.*;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;

4
src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByExample.java
View File

@@ -22,8 +22,8 @@ import java.util.List;
import java.util.function.Function;
import java.util.stream.Stream;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.data.domain.Example;

2
src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.repository.support;
import javax.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.SingularAttribute;
import org.springframework.data.jpa.repository.query.JpaEntityMetadata;
import org.springframework.data.repository.core.EntityInformation;

4
src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.repository.support;
import javax.persistence.EntityManager;
import javax.persistence.metamodel.Metamodel;
import jakarta.persistence.EntityManager;
import jakarta.persistence.metamodel.Metamodel;
import org.springframework.data.domain.Persistable;
import org.springframework.data.jpa.repository.query.DefaultJpaEntityMetadata;

18
src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
View File

@@ -22,15 +22,15 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import javax.persistence.IdClass;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.IdentifiableType;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.Metamodel;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.Type;
import javax.persistence.metamodel.Type.PersistenceType;
import jakarta.persistence.IdClass;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.IdentifiableType;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.Type;
import jakarta.persistence.metamodel.Type.PersistenceType;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;

2
src/main/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformation.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.repository.support;
import javax.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.Metamodel;
import org.springframework.data.domain.Persistable;
import org.springframework.lang.Nullable;

4
src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
View File

@@ -22,8 +22,8 @@ import java.lang.reflect.Method;
import java.util.Optional;
import java.util.stream.Stream;
import javax.persistence.EntityManager;
import javax.persistence.Tuple;
import jakarta.persistence.EntityManager;
import jakarta.persistence.Tuple;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

4
src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.repository.support;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;

4
src/main/java/org/springframework/data/jpa/repository/support/MutableQueryHints.java
View File

@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@@ -39,7 +39,7 @@ public class MutableQueryHints implements QueryHints {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.support.QueryHints#withFetchGraphs(javax.persistence.EntityManager)
* @see org.springframework.data.jpa.repository.support.QueryHints#withFetchGraphs(jakarta.persistence.EntityManager)
*/
@Override
public QueryHints withFetchGraphs(EntityManager em) {

10
src/main/java/org/springframework/data/jpa/repository/support/QueryHints.java
View File

@@ -17,13 +17,13 @@ package org.springframework.data.jpa.repository.support;
import java.util.function.BiConsumer;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.util.Assert;
/**
* QueryHints provides access to query hints defined via {@link CrudMethodMetadata#getQueryHints()} QueryHintList()} by
* default excluding JPA {@link javax.persistence.EntityGraph}. The object allows to switch between query hints for
* default excluding JPA {@link jakarta.persistence.EntityGraph}. The object allows to switch between query hints for
* count queries with or without fetch graph hints.
*
* @author Christoph Strobl
@@ -54,7 +54,7 @@ public interface QueryHints {
}
/**
* Creates and returns a new {@link QueryHints} instance including {@link javax.persistence.EntityGraph}.
* Creates and returns a new {@link QueryHints} instance including {@link jakarta.persistence.EntityGraph}.
*
* @param em must not be {@literal null}.
* @return new instance of {@link QueryHints}.
@@ -94,7 +94,7 @@ public interface QueryHints {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.support.QueryHints#withFetchGraphs(javax.persistence.EntityManager)
* @see org.springframework.data.jpa.repository.support.QueryHints#withFetchGraphs(jakarta.persistence.EntityManager)
*/
@Override
public QueryHints withFetchGraphs(EntityManager em) {
@@ -103,7 +103,7 @@ public interface QueryHints {
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.repository.support.QueryHints#forCounts(javax.persistence.EntityManager)
* @see org.springframework.data.jpa.repository.support.QueryHints#forCounts(jakarta.persistence.EntityManager)
*/
@Override
public QueryHints forCounts() {

2
src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java
View File

@@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.support;
import java.util.List;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;

4
src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
View File

@@ -20,8 +20,8 @@ import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.Function;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
import jakarta.persistence.EntityManager;
import jakarta.persistence.LockModeType;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.data.domain.Page;

4
src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java
View File

@@ -20,8 +20,8 @@ import java.util.List;
import java.util.Optional;
import java.util.function.Function;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
import jakarta.persistence.EntityManager;
import jakarta.persistence.LockModeType;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.data.domain.Page;

5
src/main/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupport.java
View File

@@ -15,8 +15,9 @@
*/
package org.springframework.data.jpa.repository.support;
import javax.annotation.PostConstruct;
import javax.persistence.EntityManager;
import com.querydsl.jpa.impl.JPAQueryFactory;
import jakarta.annotation.PostConstruct;
import jakarta.persistence.EntityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;

30
src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
View File

@@ -26,19 +26,19 @@ import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
import javax.persistence.NoResultException;
import javax.persistence.Parameter;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.ParameterExpression;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import jakarta.persistence.EntityManager;
import jakarta.persistence.LockModeType;
import jakarta.persistence.NoResultException;
import jakarta.persistence.Parameter;
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Order;
import jakarta.persistence.criteria.ParameterExpression;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.data.domain.Example;
@@ -931,7 +931,7 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.domain.Specification#toPredicate(javax.persistence.criteria.Root, javax.persistence.criteria.CriteriaQuery, javax.persistence.criteria.CriteriaBuilder)
* @see org.springframework.data.jpa.domain.Specification#toPredicate(jakarta.persistence.criteria.Root, jakarta.persistence.criteria.CriteriaQuery, jakarta.persistence.criteria.CriteriaBuilder)
*/
@Override
public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -974,7 +974,7 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
/*
* (non-Javadoc)
* @see org.springframework.data.jpa.domain.Specification#toPredicate(javax.persistence.criteria.Root, javax.persistence.criteria.CriteriaQuery, javax.persistence.criteria.CriteriaBuilder)
* @see org.springframework.data.jpa.domain.Specification#toPredicate(jakarta.persistence.criteria.Root, jakarta.persistence.criteria.CriteriaQuery, jakarta.persistence.criteria.CriteriaBuilder)
*/
@Override
public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuilder cb) {

8
src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java
View File

@@ -21,8 +21,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.MappedSuperclass;
import jakarta.persistence.Entity;
import jakarta.persistence.MappedSuperclass;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
/**
* {@link PersistenceUnitPostProcessor} that will scan for classes annotated with {@link Entity} or
* {@link MappedSuperclass} and add them to the {@link javax.persistence.PersistenceUnit} post processed. Beyond that
* {@link MappedSuperclass} and add them to the {@link jakarta.persistence.PersistenceUnit} post processed. Beyond that
* JPA XML mapping files can be scanned as well by configuring a file name pattern.
*
* @author Oliver Gierke
@@ -153,7 +153,7 @@ public class ClasspathScanningPersistenceUnitPostProcessor
* an empty {@link Set} in case no {@link ResourceLoader} or mapping file name pattern was configured. Resulting paths
* are resource-loadable from the application classpath according to the JPA spec.
*
* @see javax.persistence.spi.PersistenceUnitInfo#getMappingFileNames()
* @see jakarta.persistence.spi.PersistenceUnitInfo#getMappingFileNames()
* @return
*/
private Set<String> scanForMappingFileLocations() {

2
src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java
View File

@@ -18,7 +18,7 @@ package org.springframework.data.jpa.support;
import java.net.URISyntaxException;
import java.net.URL;
import javax.persistence.spi.PersistenceUnitInfo;
import jakarta.persistence.spi.PersistenceUnitInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

2
src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
View File

@@ -25,7 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.EntityManagerFactory;
import jakarta.persistence.EntityManagerFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ListableBeanFactory;

8
src/main/java/org/springframework/data/jpa/util/JpaMetamodel.java
View File

@@ -20,10 +20,10 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.Metamodel;
import javax.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.SingularAttribute;
import org.springframework.data.util.Lazy;
import org.springframework.data.util.StreamUtils;

0
src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension → src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
View File

32
src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java
View File

@@ -24,18 +24,18 @@ import java.lang.reflect.Member;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.persistence.Id;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.Attribute.PersistentAttributeType;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.Type;
import jakarta.persistence.Id;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.Join;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.ManagedType;
import jakarta.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.Type;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -307,12 +307,12 @@ class QueryByExamplePredicateBuilderUnitTests {
private Type<T> type;
SingularAttributeStub(String name,
javax.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class<T> javaType) {
jakarta.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class<T> javaType) {
this(name, attributeType, javaType, null);
}
SingularAttributeStub(String name,
javax.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class<T> javaType, Type<T> type) {
jakarta.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class<T> javaType, Type<T> type) {
this.name = name;
this.attributeType = attributeType;
this.javaType = javaType;
@@ -325,7 +325,7 @@ class QueryByExamplePredicateBuilderUnitTests {
}
@Override
public javax.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
public jakarta.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
return attributeType;
}
@@ -356,7 +356,7 @@ class QueryByExamplePredicateBuilderUnitTests {
}
@Override
public javax.persistence.metamodel.Bindable.BindableType getBindableType() {
public jakarta.persistence.metamodel.Bindable.BindableType getBindableType() {
return BindableType.SINGULAR_ATTRIBUTE;
}

6
src/test/java/org/springframework/data/jpa/convert/threeten/DateTimeSample.java
View File

@@ -21,9 +21,9 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
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

4
src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java
View File

@@ -26,8 +26,8 @@ import java.time.LocalTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Configuration;

2
src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java
View File

@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*;
import java.util.Arrays;
import javax.persistence.AttributeConverter;
import jakarta.persistence.AttributeConverter;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

6
src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java
View File

@@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.domain.Sort.Direction.*;
import static org.springframework.data.jpa.domain.JpaSort.*;
import javax.persistence.EntityManagerFactory;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.PluralAttribute;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.PluralAttribute;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

8
src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java
View File

@@ -23,10 +23,10 @@ import static org.springframework.util.SerializationUtils.*;
import java.io.Serializable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

12
src/test/java/org/springframework/data/jpa/domain/sample/AbstractAnnotatedAuditable.java
View File

@@ -17,12 +17,12 @@ package org.springframework.data.jpa.domain.sample;
import java.util.Date;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;

8
src/test/java/org/springframework/data/jpa/domain/sample/AbstractMappedType.java
View File

@@ -17,10 +17,10 @@ package org.springframework.data.jpa.domain.sample;
import lombok.Getter;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.Version;
/**
* @author Thomas Darimont

2
src/test/java/org/springframework/data/jpa/domain/sample/Account.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import jakarta.persistence.Entity;
import org.springframework.data.jpa.domain.AbstractPersistable;

2
src/test/java/org/springframework/data/jpa/domain/sample/Address.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Embeddable;
import jakarta.persistence.Embeddable;
/**
* @author Thomas Darimont

2
src/test/java/org/springframework/data/jpa/domain/sample/AnnotatedAuditableUser.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import jakarta.persistence.Entity;
/**
* @author Oliver Gierke

2
src/test/java/org/springframework/data/jpa/domain/sample/AuditableRole.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import jakarta.persistence.Entity;
import org.springframework.data.jpa.domain.AbstractAuditable;

8
src/test/java/org/springframework/data/jpa/domain/sample/AuditableUser.java
View File

@@ -18,10 +18,10 @@ package org.springframework.data.jpa.domain.sample;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import javax.persistence.NamedQuery;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.NamedQuery;
import org.springframework.data.jpa.domain.AbstractAuditable;
import org.springframework.lang.Nullable;

10
src/test/java/org/springframework/data/jpa/domain/sample/Category.java
View File

@@ -1,10 +1,10 @@
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
@Entity
public class Category {

8
src/test/java/org/springframework/data/jpa/domain/sample/Child.java
View File

@@ -18,10 +18,10 @@ package org.springframework.data.jpa.domain.sample;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
@Entity
public class Child {

2
src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType1.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import jakarta.persistence.Entity;
/**
* @author Thomas Darimont

2
src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType2.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import jakarta.persistence.Entity;
/**
* @author Thomas Darimont

4
src/test/java/org/springframework/data/jpa/domain/sample/CustomAbstractPersistable.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import org.springframework.data.jpa.domain.AbstractPersistable;

4
src/test/java/org/springframework/data/jpa/domain/sample/Customer.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
/**
* @author Oliver Gierke

14
src/test/java/org/springframework/data/jpa/domain/sample/Dummy.java
View File

@@ -15,13 +15,13 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.NamedStoredProcedureQueries;
import javax.persistence.NamedStoredProcedureQuery;
import javax.persistence.ParameterMode;
import javax.persistence.StoredProcedureParameter;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.NamedStoredProcedureQueries;
import jakarta.persistence.NamedStoredProcedureQuery;
import jakarta.persistence.ParameterMode;
import jakarta.persistence.StoredProcedureParameter;
import org.springframework.util.ObjectUtils;

4
src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleDepartment.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
/**
* @author Thomas Darimont

10
src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployee.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.data.jpa.domain.sample;
import javax.persistence.CascadeType;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.MapsId;
import jakarta.persistence.CascadeType;
import jakarta.persistence.EmbeddedId;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MapsId;
/**
* @author Thomas Darimont

Some files were not shown because too many files have changed in this diff Show More