diff --git a/pom.xml b/pom.xml index e64190f39..4ff3ce005 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ DATAJPA - 2.7.9 + 3.0.2 5.6.0.Final 8.0.23 42.2.19 @@ -293,30 +293,37 @@ ${hibernate.groupId} - hibernate-core + hibernate-core-jakarta ${hibernate} true ${hibernate.groupId} - hibernate-jpamodelgen + hibernate-jpamodelgen-jakarta ${hibernate} provided + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-api} + + com.querydsl querydsl-apt ${querydsl} - jpa + jakarta provided com.querydsl querydsl-jpa + jakarta ${querydsl} true @@ -339,31 +346,58 @@ - javax.interceptor - javax.interceptor-api - 1.2.1 + jakarta.interceptor + jakarta.interceptor-api + 2.0.0 test - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api ${cdi} provided true - - javax.annotation - javax.annotation-api - ${javax-annotation-api} - test - + org.apache.openwebbeans openwebbeans-se ${webbeans} + jakarta + test + + + org.apache.openwebbeans + openwebbeans-impl + + + org.apache.openwebbeans + openwebbeans-spi + + + + + org.apache.openwebbeans + openwebbeans-impl + ${webbeans} + jakarta + test + + + org.apache.openwebbeans + openwebbeans-spi + ${webbeans} + jakarta test diff --git a/src/main/asciidoc/jpa.adoc b/src/main/asciidoc/jpa.adoc index f57182a3f..7fd3d8bfa 100644 --- a/src/main/asciidoc/jpa.adoc +++ b/src/main/asciidoc/jpa.adoc @@ -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. diff --git a/src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java b/src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java index be9b899d8..c896e87ee 100644 --- a/src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java +++ b/src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConverters.java b/src/main/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConverters.java index f7cd8734e..3ab2374ea 100644 --- a/src/main/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConverters.java +++ b/src/main/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConverters.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java b/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java index b40f7ff20..a4fa68917 100644 --- a/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java +++ b/src/main/java/org/springframework/data/jpa/domain/AbstractAuditable.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java b/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java index 31bd12e93..ff4f86f44 100644 --- a/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java +++ b/src/main/java/org/springframework/data/jpa/domain/AbstractPersistable.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/domain/JpaSort.java b/src/main/java/org/springframework/data/jpa/domain/JpaSort.java index 13a10d3be..4e131e46f 100644 --- a/src/main/java/org/springframework/data/jpa/domain/JpaSort.java +++ b/src/main/java/org/springframework/data/jpa/domain/JpaSort.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/domain/Specification.java b/src/main/java/org/springframework/data/jpa/domain/Specification.java index e7a2aa8f9..15fcd9173 100644 --- a/src/main/java/org/springframework/data/jpa/domain/Specification.java +++ b/src/main/java/org/springframework/data/jpa/domain/Specification.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/domain/SpecificationComposition.java b/src/main/java/org/springframework/data/jpa/domain/SpecificationComposition.java index e2db0ae6d..0dc3a976a 100644 --- a/src/main/java/org/springframework/data/jpa/domain/SpecificationComposition.java +++ b/src/main/java/org/springframework/data/jpa/domain/SpecificationComposition.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessor.java index 678db5b3b..d35cfc6d5 100644 --- a/src/main/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessor.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; /** * {@link BeanFactoryPostProcessor} that ensures that the {@link AnnotationBeanConfigurerAspect} aspect is up and - * running before the {@link javax.persistence.EntityManagerFactory} gets created as this already instantiates + * running before 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. * diff --git a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java index 8a57115b5..8d453ca09 100644 --- a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java +++ b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java b/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java index 7fa79ceb8..feb917699 100644 --- a/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java +++ b/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java index f9d2d3033..0d389d851 100644 --- a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java +++ b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java @@ -41,7 +41,7 @@ class JpaPersistentEntityImpl extends BasicPersistentEntity 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 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"; diff --git a/src/main/java/org/springframework/data/jpa/provider/QueryExtractor.java b/src/main/java/org/springframework/data/jpa/provider/QueryExtractor.java index 169b053b5..9f6779c5c 100644 --- a/src/main/java/org/springframework/data/jpa/provider/QueryExtractor.java +++ b/src/main/java/org/springframework/data/jpa/provider/QueryExtractor.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.provider; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/jpa/repository/EntityGraph.java b/src/main/java/org/springframework/data/jpa/repository/EntityGraph.java index cbc726318..2c319b87a 100644 --- a/src/main/java/org/springframework/data/jpa/repository/EntityGraph.java +++ b/src/main/java/org/springframework/data/jpa/repository/EntityGraph.java @@ -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 JPA 2.1 * Specification: 3.7.4.2 Load Graph Semantics */ - 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 JPA 2.1 * Specification: 3.7.4.1 Fetch Graph Semantics */ - FETCH("javax.persistence.fetchgraph"); + FETCH("jakarta.persistence.fetchgraph"); private final String key; diff --git a/src/main/java/org/springframework/data/jpa/repository/JpaContext.java b/src/main/java/org/springframework/data/jpa/repository/JpaContext.java index 30baf2df4..f40d4cab1 100644 --- a/src/main/java/org/springframework/data/jpa/repository/JpaContext.java +++ b/src/main/java/org/springframework/data/jpa/repository/JpaContext.java @@ -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 diff --git a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java index fb5a437f8..f8f8c0d5f 100644 --- a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java @@ -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 extends PagingAndSortingRepository, /** * 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 extends PagingAndSortingRepository, /** * 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}. diff --git a/src/main/java/org/springframework/data/jpa/repository/Lock.java b/src/main/java/org/springframework/data/jpa/repository/Lock.java index dcb6bd892..0a9035d59 100644 --- a/src/main/java/org/springframework/data/jpa/repository/Lock.java +++ b/src/main/java/org/springframework/data/jpa/repository/Lock.java @@ -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 diff --git a/src/main/java/org/springframework/data/jpa/repository/Query.java b/src/main/java/org/springframework/data/jpa/repository/Query.java index a3eddd2c5..9193ceafd 100644 --- a/src/main/java/org/springframework/data/jpa/repository/Query.java +++ b/src/main/java/org/springframework/data/jpa/repository/Query.java @@ -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() diff --git a/src/main/java/org/springframework/data/jpa/repository/QueryHints.java b/src/main/java/org/springframework/data/jpa/repository/QueryHints.java index 0204a0f7b..38447f2ae 100644 --- a/src/main/java/org/springframework/data/jpa/repository/QueryHints.java +++ b/src/main/java/org/springframework/data/jpa/repository/QueryHints.java @@ -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 diff --git a/src/main/java/org/springframework/data/jpa/repository/Temporal.java b/src/main/java/org/springframework/data/jpa/repository/Temporal.java index c2bbd3d99..7e8b6b22f 100644 --- a/src/main/java/org/springframework/data/jpa/repository/Temporal.java +++ b/src/main/java/org/springframework/data/jpa/repository/Temporal.java @@ -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 diff --git a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java index 93882db2a..9645fe2f1 100644 --- a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java +++ b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java @@ -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 extends CdiRepositoryBean { /* * (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 creationalContext, Class repositoryType) { diff --git a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java index 23fab9896..01b1ed4b5 100644 --- a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java +++ b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java b/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java index 735315252..80347540b 100644 --- a/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java +++ b/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java index d7f69b861..8afdf1fc9 100644 --- a/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java +++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java index 2de91cdde..b92348c05 100644 --- a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java +++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java @@ -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 diff --git a/src/main/java/org/springframework/data/jpa/repository/query/AbstractJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/AbstractJpaQuery.java index f072a8b93..52af0614a 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/AbstractJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/AbstractJpaQuery.java @@ -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}. diff --git a/src/main/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQuery.java index d8b19a925..5aaa71c0f 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQuery.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/query/DefaultJpaEntityMetadata.java b/src/main/java/org/springframework/data/jpa/repository/query/DefaultJpaEntityMetadata.java index 2778d8960..f469b17ee 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/DefaultJpaEntityMetadata.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/DefaultJpaEntityMetadata.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java b/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java index 046d6a5be..a86a362e6 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/Jpa21Utils.java @@ -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 { diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java index d02c1ff1f..7105d349b 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java @@ -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 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") diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaParameters.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaParameters.java index b3578121d..cdb59d883 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/JpaParameters.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaParameters.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java index 3eb0762ee..dcf06f9d9 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java @@ -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> 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) { diff --git a/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java b/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java index c9ec38b21..0f9e7ff68 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java @@ -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}. */ diff --git a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java index ac85320c7..6c000a7ae 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java b/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java index 77577fc43..ac06cd2d9 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/ProcedureParameter.java @@ -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 diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java index 6e8464710..322214abb 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java @@ -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 diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java index fb002f850..06464f156 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java @@ -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 implements javax.persistence.Parameter { + private static class ParameterImpl implements jakarta.persistence.Parameter { private final Class 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 getParameterType() { diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java index e24a871ce..c9010d9d7 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java @@ -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 toOrders(Sort sort, From from, CriteriaBuilder cb) { + public static List 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 orders = new ArrayList<>(); + List 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); diff --git a/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java index 9fcff1866..4acacfad4 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSource.java b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSource.java index 010ceb38f..e560209df 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSource.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSource.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributes.java b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributes.java index fc89d2dc5..077a7f850 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributes.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributes.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java index d8f276c0d..7927b1e8c 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureJpaQuery.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadata.java b/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadata.java index 8466195ff..3933c5181 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadata.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadata.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java b/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java index 28f7c9a9d..d9bc85ca5 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPostProcessor.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java b/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java index 5133d962e..53331763f 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/DefaultJpaContext.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/DefaultQueryHints.java b/src/main/java/org/springframework/data/jpa/repository/support/DefaultQueryHints.java index 754561197..2589bcb32 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/DefaultQueryHints.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/DefaultQueryHints.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java b/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java index f86ac330b..35e9c75b8 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByExample.java b/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByExample.java index cb2645bfc..a70f846c4 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByExample.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByExample.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java index 46504b3de..75bdb5fa8 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java index ecad19519..d7532f1c2 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupport.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java index fe344c8fd..6717ad32d 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformation.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformation.java index 1fcae0707..562961c77 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformation.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformation.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java index 3cd9ec88d..7fe9b0115 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java index 9bb247f25..b33ace36a 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/MutableQueryHints.java b/src/main/java/org/springframework/data/jpa/repository/support/MutableQueryHints.java index d55929b22..0bf32a19d 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/MutableQueryHints.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/MutableQueryHints.java @@ -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) { diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QueryHints.java b/src/main/java/org/springframework/data/jpa/repository/support/QueryHints.java index b18098c8e..223c8a0f5 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/QueryHints.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/QueryHints.java @@ -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() { diff --git a/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java b/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java index 484827c58..cb19fd8e8 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java index f6e63d1bc..0ccefd508 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java index 843a287f6..757067534 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupport.java b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupport.java index a326470ee..a4b45ff2c 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupport.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupport.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java index 0fbc14f20..fd412f8eb 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java @@ -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 implements JpaRepositoryImplementation root, CriteriaQuery query, CriteriaBuilder cb) { @@ -974,7 +974,7 @@ public class SimpleJpaRepository implements JpaRepositoryImplementation root, CriteriaQuery query, CriteriaBuilder cb) { diff --git a/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java b/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java index 8d471f692..85e8aff1e 100644 --- a/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java +++ b/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java @@ -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 scanForMappingFileLocations() { diff --git a/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java b/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java index f6877b8a1..c51f38567 100644 --- a/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java +++ b/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java b/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java index 448cb889f..63c1f03e0 100644 --- a/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java +++ b/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java @@ -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; diff --git a/src/main/java/org/springframework/data/jpa/util/JpaMetamodel.java b/src/main/java/org/springframework/data/jpa/util/JpaMetamodel.java index e3e025fc2..8331db055 100644 --- a/src/main/java/org/springframework/data/jpa/util/JpaMetamodel.java +++ b/src/main/java/org/springframework/data/jpa/util/JpaMetamodel.java @@ -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; diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java b/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java index 47c27a516..bb906d07c 100644 --- a/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java @@ -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 type; SingularAttributeStub(String name, - javax.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class javaType) { + jakarta.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class javaType) { this(name, attributeType, javaType, null); } SingularAttributeStub(String name, - javax.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class javaType, Type type) { + jakarta.persistence.metamodel.Attribute.PersistentAttributeType attributeType, Class javaType, Type 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; } diff --git a/src/test/java/org/springframework/data/jpa/convert/threeten/DateTimeSample.java b/src/test/java/org/springframework/data/jpa/convert/threeten/DateTimeSample.java index bd6517fd1..c72d859eb 100644 --- a/src/test/java/org/springframework/data/jpa/convert/threeten/DateTimeSample.java +++ b/src/test/java/org/springframework/data/jpa/convert/threeten/DateTimeSample.java @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java b/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java index c68bb2dec..494284c80 100644 --- a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersIntegrationTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java b/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java index d236a54ca..0d22dc2db 100644 --- a/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java b/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java index bd63a1990..54d3015d8 100644 --- a/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java +++ b/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java index dd82eed6e..2c903de6e 100644 --- a/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/AbstractAnnotatedAuditable.java b/src/test/java/org/springframework/data/jpa/domain/sample/AbstractAnnotatedAuditable.java index 3492a90c0..c6727e55b 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/AbstractAnnotatedAuditable.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/AbstractAnnotatedAuditable.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/AbstractMappedType.java b/src/test/java/org/springframework/data/jpa/domain/sample/AbstractMappedType.java index 28f53eb2c..97f219b42 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/AbstractMappedType.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/AbstractMappedType.java @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Account.java b/src/test/java/org/springframework/data/jpa/domain/sample/Account.java index be45b4ccf..260d1f299 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Account.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Account.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Address.java b/src/test/java/org/springframework/data/jpa/domain/sample/Address.java index 6ca54e0fd..218bc4da9 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Address.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Address.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Thomas Darimont diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/AnnotatedAuditableUser.java b/src/test/java/org/springframework/data/jpa/domain/sample/AnnotatedAuditableUser.java index 699695589..aabebee03 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/AnnotatedAuditableUser.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/AnnotatedAuditableUser.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/AuditableRole.java b/src/test/java/org/springframework/data/jpa/domain/sample/AuditableRole.java index a60f31f16..278f7ebd6 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/AuditableRole.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/AuditableRole.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/AuditableUser.java b/src/test/java/org/springframework/data/jpa/domain/sample/AuditableUser.java index b048ba142..1f387058d 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/AuditableUser.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/AuditableUser.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Category.java b/src/test/java/org/springframework/data/jpa/domain/sample/Category.java index 96230ebbe..ea7e7fcc2 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Category.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Category.java @@ -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 { diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Child.java b/src/test/java/org/springframework/data/jpa/domain/sample/Child.java index ace64482f..b241f4c62 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Child.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Child.java @@ -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 { diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType1.java b/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType1.java index 7d13f508b..0cc846b0e 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType1.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType1.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Thomas Darimont diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType2.java b/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType2.java index f5f219d13..4ad450e50 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType2.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/ConcreteType2.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Thomas Darimont diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/CustomAbstractPersistable.java b/src/test/java/org/springframework/data/jpa/domain/sample/CustomAbstractPersistable.java index bd2eb7cd3..bb1991cac 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/CustomAbstractPersistable.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/CustomAbstractPersistable.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Customer.java b/src/test/java/org/springframework/data/jpa/domain/sample/Customer.java index 4db1982f4..d1cca062e 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Customer.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Customer.java @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Dummy.java b/src/test/java/org/springframework/data/jpa/domain/sample/Dummy.java index 3b7cd734d..58171bb36 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Dummy.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Dummy.java @@ -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; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleDepartment.java b/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleDepartment.java index cbe11fe32..817e87c96 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleDepartment.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleDepartment.java @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployee.java b/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployee.java index 36dd054a6..fd661477a 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployee.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployee.java @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployeePK.java b/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployeePK.java index 3cea9941a..4aa52ae03 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployeePK.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/EmbeddedIdExampleEmployeePK.java @@ -17,8 +17,8 @@ package org.springframework.data.jpa.domain.sample; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Thomas Darimont diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/EntityWithAssignedId.java b/src/test/java/org/springframework/data/jpa/domain/sample/EntityWithAssignedId.java index acd1f5843..181f4fc63 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/EntityWithAssignedId.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/EntityWithAssignedId.java @@ -17,11 +17,11 @@ package org.springframework.data.jpa.domain.sample; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PrePersist; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Transient; import org.springframework.data.domain.Persistable; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleDepartment.java b/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleDepartment.java index ddc4f339f..e9e34b940 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleDepartment.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleDepartment.java @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleEmployee.java b/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleEmployee.java index 18a25486c..a20587a4a 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleEmployee.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/IdClassExampleEmployee.java @@ -15,11 +15,11 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; /** * @author Thomas Darimont diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Invoice.java b/src/test/java/org/springframework/data/jpa/domain/sample/Invoice.java index eceed11d9..8015e09f2 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Invoice.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Invoice.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Patrice Blanchardie diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/InvoiceItem.java b/src/test/java/org/springframework/data/jpa/domain/sample/InvoiceItem.java index 21b6cd10e..7c3c93f38 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/InvoiceItem.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/InvoiceItem.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Patrice Blanchardie diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Item.java b/src/test/java/org/springframework/data/jpa/domain/sample/Item.java index d6dcf067b..dc50b4396 100755 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Item.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Item.java @@ -15,12 +15,12 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; /** * @author Mark Paluch diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/ItemSite.java b/src/test/java/org/springframework/data/jpa/domain/sample/ItemSite.java index 932c96bf1..79436f221 100755 --- a/src/test/java/org/springframework/data/jpa/domain/sample/ItemSite.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/ItemSite.java @@ -15,11 +15,11 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Mark Paluch diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/MailMessage.java b/src/test/java/org/springframework/data/jpa/domain/sample/MailMessage.java index 1f033fd2c..25688a7a2 100755 --- a/src/test/java/org/springframework/data/jpa/domain/sample/MailMessage.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/MailMessage.java @@ -15,11 +15,11 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Thomas Darimont diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/MailSender.java b/src/test/java/org/springframework/data/jpa/domain/sample/MailSender.java index 8f7ad77a7..fecf304ec 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/MailSender.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/MailSender.java @@ -15,11 +15,11 @@ */ 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; /** * @author Thomas Darimont diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/MailUser.java b/src/test/java/org/springframework/data/jpa/domain/sample/MailUser.java index 76aba8f4d..00f68fd7f 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/MailUser.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/MailUser.java @@ -15,9 +15,9 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Represents a user in a Mail-System. diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Order.java b/src/test/java/org/springframework/data/jpa/domain/sample/Order.java index 9e87d1d58..18bc41b14 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Order.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Order.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java b/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java index bac8c106c..ebe99ad1c 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Parent.java @@ -18,11 +18,11 @@ 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.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class Parent { diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java b/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java index c10e88b26..9c3292a50 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithIdClass.java @@ -15,9 +15,9 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.springframework.data.domain.Persistable; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithSingleIdClass.java b/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithSingleIdClass.java index c1531ce0b..48f3e569f 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithSingleIdClass.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/PersistableWithSingleIdClass.java @@ -15,9 +15,9 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * Sample entity using {@link IdClass} annotation to demarcate ids. diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/PrimitiveVersionProperty.java b/src/test/java/org/springframework/data/jpa/domain/sample/PrimitiveVersionProperty.java index 6eac680b3..96f4936b5 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/PrimitiveVersionProperty.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/PrimitiveVersionProperty.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Product.java b/src/test/java/org/springframework/data/jpa/domain/sample/Product.java index d63e78dfb..304d4d52f 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Product.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Product.java @@ -1,8 +1,8 @@ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Product { diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Role.java b/src/test/java/org/springframework/data/jpa/domain/sample/Role.java index 4a60840dc..4e8834434 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Role.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Role.java @@ -15,9 +15,9 @@ */ package org.springframework.data.jpa.domain.sample; -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 domain class representing roles. Mapped with XML. diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntity.java b/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntity.java index 43ce41a8e..a64dc68c7 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntity.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntity.java @@ -15,8 +15,8 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntityPK.java b/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntityPK.java index 62423ab89..14ac29e77 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntityPK.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/SampleEntityPK.java @@ -17,8 +17,8 @@ package org.springframework.data.jpa.domain.sample; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.springframework.util.Assert; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java index a1af2fdfc..b8678b8f3 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClass.java @@ -2,11 +2,11 @@ package org.springframework.data.jpa.domain.sample; import java.io.Serializable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity @IdClass(SampleWithIdClass.SampleWithIdClassPK.class) diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClassIncludingEntity.java b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClassIncludingEntity.java index c50f4b24d..4dc08b50c 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClassIncludingEntity.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithIdClassIncludingEntity.java @@ -4,10 +4,10 @@ import lombok.Data; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; /** * Sample class for integration testing diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithPrimitiveId.java b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithPrimitiveId.java index c8dd18431..de6877e77 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithPrimitiveId.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithPrimitiveId.java @@ -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 diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithTimestampVersion.java b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithTimestampVersion.java index 76041312a..31af57b64 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithTimestampVersion.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/SampleWithTimestampVersion.java @@ -17,9 +17,9 @@ package org.springframework.data.jpa.domain.sample; import java.sql.Timestamp; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class SampleWithTimestampVersion { diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/Site.java b/src/test/java/org/springframework/data/jpa/domain/sample/Site.java index 0cc2bac29..17cd65d31 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/Site.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/Site.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Mark Paluch diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/SpecialUser.java b/src/test/java/org/springframework/data/jpa/domain/sample/SpecialUser.java index 1cf1c8292..08829f573 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/SpecialUser.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/SpecialUser.java @@ -1,6 +1,6 @@ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/User.java b/src/test/java/org/springframework/data/jpa/domain/sample/User.java index 3031dfc30..0ae5b0ee9 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/User.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/User.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.*; +import jakarta.persistence.*; /** * Domain class representing a person emphasizing the use of {@code AbstractEntity}. No declaration of an id is diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java b/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java index 1c45fc597..eabe86dfc 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/UserSpecifications.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.domain.sample; -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.data.jpa.domain.Specification; diff --git a/src/test/java/org/springframework/data/jpa/domain/sample/VersionedUser.java b/src/test/java/org/springframework/data/jpa/domain/sample/VersionedUser.java index a242a0980..558723b71 100644 --- a/src/test/java/org/springframework/data/jpa/domain/sample/VersionedUser.java +++ b/src/test/java/org/springframework/data/jpa/domain/sample/VersionedUser.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.domain.sample; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java index 3bd264605..d20b4f084 100644 --- a/src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/domain/support/AbstractAttributeConverterIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.domain.support; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import javax.sql.DataSource; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AnnotationAuditingBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AnnotationAuditingBeanFactoryPostProcessorUnitTests.java index cc63a7f04..38dd803a3 100644 --- a/src/test/java/org/springframework/data/jpa/domain/support/AnnotationAuditingBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/domain/support/AnnotationAuditingBeanFactoryPostProcessorUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.domain.support; import static org.mockito.Mockito.*; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java index 493292581..8923c240a 100644 --- a/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.domain.support; import static org.assertj.core.api.Assertions.*; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/infrastructure/HibernateTestUtils.java b/src/test/java/org/springframework/data/jpa/infrastructure/HibernateTestUtils.java index f803794a8..4a7b9651b 100644 --- a/src/test/java/org/springframework/data/jpa/infrastructure/HibernateTestUtils.java +++ b/src/test/java/org/springframework/data/jpa/infrastructure/HibernateTestUtils.java @@ -18,7 +18,7 @@ package org.springframework.data.jpa.infrastructure; import java.util.Arrays; import java.util.List; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProvider; import org.springframework.util.ClassUtils; diff --git a/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java b/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java index 1739c2e1a..116df91ba 100644 --- a/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java @@ -19,20 +19,20 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Bindable.BindableType; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Bindable.BindableType; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java index e09b9044c..37426368f 100644 --- a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java index 573dd2e70..cd8d706cc 100644 --- a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextUnitTests.java @@ -19,7 +19,7 @@ import static org.mockito.Mockito.*; import java.util.Collections; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Version; diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java index 2c98720dc..376132cc2 100644 --- a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java @@ -20,16 +20,16 @@ import static org.mockito.Mockito.*; import java.util.Collections; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Transient; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Transient; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.Metamodel; import org.jmolecules.ddd.types.AggregateRoot; import org.jmolecules.ddd.types.Association; @@ -293,7 +293,7 @@ public class JpaPersistentPropertyImplUnitTests { private static class JpaVersioned { - @javax.persistence.Version long version; + @jakarta.persistence.Version long version; } private static class SpecializedAssociation { diff --git a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java b/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java index ed9c261f0..c2564b730 100644 --- a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.provider; import static org.assertj.core.api.Assertions.*; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java b/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java index 872de8b87..ee7cee3ee 100644 --- a/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java @@ -22,7 +22,7 @@ import static org.springframework.data.jpa.provider.PersistenceProvider.Constant import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.assertj.core.api.Assumptions; import org.hibernate.Version; diff --git a/src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java index ebb2daf5e..f54f2d25c 100644 --- a/src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/AbstractPersistableIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository; import static org.assertj.core.api.Assertions.*; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java index 47417b79e..24ac368f1 100644 --- a/src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/CrudMethodMetadataUnitTests.java @@ -21,13 +21,13 @@ import static org.mockito.Mockito.*; import java.util.Collections; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.LockModeType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -59,7 +59,7 @@ class CrudMethodMetadataUnitTests { @Mock CriteriaQuery criteriaQuery; @Mock JpaEntityInformation information; @Mock TypedQuery typedQuery; - @Mock javax.persistence.Query query; + @Mock jakarta.persistence.Query query; @Mock Metamodel metamodel; private RoleRepository repository; diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java index 7378afeea..98dd3b6c5 100644 --- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository; import static org.assertj.core.api.Assertions.*; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java index 21fe72d9f..4373fc016 100644 --- a/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java @@ -20,13 +20,13 @@ import static org.springframework.data.jpa.support.EntityManagerTestUtils.*; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Persistence; -import javax.persistence.PersistenceUtil; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceUtil; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.assertj.core.api.SoftAssertions; import org.junit.Assume; diff --git a/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java index 4e75eb7b4..a29658513 100644 --- a/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/JavaConfigUserRepositoryTests.java @@ -18,8 +18,8 @@ package org.springframework.data.jpa.repository; import java.io.IOException; import java.util.Collections; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java index fd70af135..ac111c308 100644 --- a/src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/MappedTypeRepositoryIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java index 059ee90b7..f0e862ada 100644 --- a/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/OpenJpaNamespaceUserRepositoryTests.java @@ -21,13 +21,13 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java index bf89a1c43..56884c453 100644 --- a/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/ParentRepositoryIntegrationTests.java @@ -20,11 +20,11 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; import java.util.Set; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java b/src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java index 324507cc4..f6b56ce67 100644 --- a/src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/RepositoryWithIdClassKeyTests.java @@ -40,7 +40,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** - * Integration tests for Repositories using {@link javax.persistence.IdClass} identifiers. + * Integration tests for Repositories using {@link jakarta.persistence.IdClass} identifiers. * * @author Mark Paluch * @author Jens Schauder diff --git a/src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java b/src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java index d77ba468e..61911d7cf 100644 --- a/src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/SimpleJpaParameterBindingTests.java @@ -21,13 +21,13 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java index 11bf21f1e..d11352f5b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/StoredProcedureIntegrationTests.java @@ -21,8 +21,8 @@ import static org.springframework.data.jpa.support.EntityManagerTestUtils.*; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java index ace4f14ff..2b62926c8 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryStoredProcedureIntegrationTests.java @@ -19,10 +19,10 @@ import static org.assertj.core.api.Assertions.*; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.ParameterMode; -import javax.persistence.PersistenceContext; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.StoredProcedureQuery; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java index 841f7b466..e481be31f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java @@ -36,13 +36,13 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.assertj.core.api.SoftAssertions; import org.hibernate.LazyInitializationException; diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java index 5502778df..0301fd5ab 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java @@ -19,10 +19,10 @@ import static org.assertj.core.api.Assertions.*; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.spi.Bean; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/EntityManagerFactoryProducer.java b/src/test/java/org/springframework/data/jpa/repository/cdi/EntityManagerFactoryProducer.java index 432853b98..ede95017f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/EntityManagerFactoryProducer.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/EntityManagerFactoryProducer.java @@ -15,11 +15,11 @@ */ package org.springframework.data.jpa.repository.cdi; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; /** * Produces and {@link EntityManagerFactory}. diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java index c23c618c0..75b014c69 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtensionUnitTests.java @@ -24,9 +24,9 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.ProcessBean; -import javax.persistence.EntityManager; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.ProcessBean; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/Person.java b/src/test/java/org/springframework/data/jpa/repository/cdi/Person.java index 815d9723d..b6139d748 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/Person.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/Person.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.repository.cdi; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity class Person { diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/PersonDB.java b/src/test/java/org/springframework/data/jpa/repository/cdi/PersonDB.java index 614fce42c..9a6e6433b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/PersonDB.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/PersonDB.java @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/QualifiedEntityManagerProducer.java b/src/test/java/org/springframework/data/jpa/repository/cdi/QualifiedEntityManagerProducer.java index 50585796e..74301ef10 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/QualifiedEntityManagerProducer.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/QualifiedEntityManagerProducer.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.repository.cdi; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/RepositoryConsumer.java b/src/test/java/org/springframework/data/jpa/repository/cdi/RepositoryConsumer.java index ab9d1b6bc..e17a5dc04 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/RepositoryConsumer.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/RepositoryConsumer.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.repository.cdi; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/Transactional.java b/src/test/java/org/springframework/data/jpa/repository/cdi/Transactional.java index c9a2f7d7a..d8b31cbd6 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/Transactional.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/Transactional.java @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target({ ElementType.METHOD, ElementType.TYPE }) diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/TransactionalInterceptor.java b/src/test/java/org/springframework/data/jpa/repository/cdi/TransactionalInterceptor.java index c111345a8..a0697c3d0 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/TransactionalInterceptor.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/TransactionalInterceptor.java @@ -15,13 +15,13 @@ */ package org.springframework.data.jpa.repository.cdi; -import javax.enterprise.inject.Any; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.enterprise.inject.Any; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; @Transactional @Interceptor diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/UnqualifiedEntityManagerProducer.java b/src/test/java/org/springframework/data/jpa/repository/cdi/UnqualifiedEntityManagerProducer.java index 994c30ca6..88dd3b669 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/UnqualifiedEntityManagerProducer.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/UnqualifiedEntityManagerProducer.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jpa.repository.cdi; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; class UnqualifiedEntityManagerProducer { diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/UserDB.java b/src/test/java/org/springframework/data/jpa/repository/cdi/UserDB.java index 9731a95d5..7b38a02cf 100644 --- a/src/test/java/org/springframework/data/jpa/repository/cdi/UserDB.java +++ b/src/test/java/org/springframework/data/jpa/repository/cdi/UserDB.java @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * @author Mark Paluch diff --git a/src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java b/src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java index 5bc8e274e..b569d2a31 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/AbstractAuditingViaJavaConfigRepositoriesTests.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/InfrastructureConfig.java b/src/test/java/org/springframework/data/jpa/repository/config/InfrastructureConfig.java index eab801318..a308e2488 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/InfrastructureConfig.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/InfrastructureConfig.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.repository.config; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java index df4c11d50..774718fb2 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoriesRegistrarIntegrationTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java index 00c0e69f4..11d65209b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java @@ -21,8 +21,8 @@ import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java index bf9736598..f7e35a183 100644 --- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java +++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepository.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.custom; import java.io.Serializable; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.data.jpa.repository.support.JpaEntityInformation; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java index ba55243bb..2a45fd345 100644 --- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java +++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java @@ -19,7 +19,7 @@ import static org.mockito.Mockito.*; import java.io.Serializable; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.data.jpa.repository.support.JpaEntityInformation; import org.springframework.data.jpa.repository.support.JpaRepositoryFactory; @@ -44,7 +44,7 @@ public class CustomGenericJpaRepositoryFactory extends JpaRepositoryFactory { /* * (non-Javadoc) - * @see org.springframework.data.jpa.repository.support.JpaRepositoryFactory#getTargetRepository(org.springframework.data.repository.core.RepositoryMetadata, javax.persistence.EntityManager) + * @see org.springframework.data.jpa.repository.support.JpaRepositoryFactory#getTargetRepository(org.springframework.data.repository.core.RepositoryMetadata, jakarta.persistence.EntityManager) */ @Override @SuppressWarnings("unchecked") diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactoryBean.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactoryBean.java index 79a46fc0f..9d7c19bbc 100644 --- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactoryBean.java +++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactoryBean.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.custom; import java.io.Serializable; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; diff --git a/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java index 2b93979b5..82dc54067 100644 --- a/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java @@ -25,13 +25,13 @@ import lombok.NoArgsConstructor; import java.util.List; import java.util.Properties; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQuery; import javax.sql.DataSource; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.hibernate.dialect.MySQL8Dialect; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java index 8598d8406..b5f6a5c60 100644 --- a/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java @@ -26,15 +26,15 @@ import java.math.BigDecimal; import java.util.List; import java.util.Properties; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; import javax.sql.DataSource; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.hibernate.dialect.PostgreSQL91Dialect; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java index 7de723d9e..b985357e8 100644 --- a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionJoinIntegrationTests.java @@ -19,15 +19,15 @@ import static org.assertj.core.api.Assertions.*; import lombok.Data; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java index 5c701acfc..f41d69d0e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/projections/ProjectionsIntegrationTests.java @@ -23,14 +23,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import javax.sql.DataSource; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java b/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java index 40365ecee..bd175ef1f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/AbstractJpaQueryTests.java @@ -22,12 +22,12 @@ import static org.springframework.data.jpa.support.EntityManagerTestUtils.*; import java.lang.reflect.Method; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.QueryHint; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.QueryHint; +import jakarta.persistence.TypedQuery; import org.junit.Assume; import org.junit.jupiter.api.BeforeEach; @@ -122,12 +122,12 @@ public class AbstractJpaQueryTests { JpaQueryMethod queryMethod = getMethod("findAll"); - javax.persistence.EntityGraph entityGraph = em.getEntityGraph("User.overview"); + jakarta.persistence.EntityGraph entityGraph = em.getEntityGraph("User.overview"); AbstractJpaQuery jpaQuery = new DummyJpaQuery(queryMethod, em); Query result = jpaQuery.createQuery(new JpaParametersParameterAccessor(queryMethod.getParameters(), new Object[0])); - verify(result).setHint("javax.persistence.fetchgraph", entityGraph); + verify(result).setHint("jakarta.persistence.fetchgraph", entityGraph); } @Test // DATAJPA-466 @@ -138,13 +138,13 @@ public class AbstractJpaQueryTests { JpaQueryMethod queryMethod = getMethod("getById", Integer.class); - javax.persistence.EntityGraph entityGraph = em.getEntityGraph("User.detail"); + jakarta.persistence.EntityGraph entityGraph = em.getEntityGraph("User.detail"); AbstractJpaQuery jpaQuery = new DummyJpaQuery(queryMethod, em); Query result = jpaQuery .createQuery(new JpaParametersParameterAccessor(queryMethod.getParameters(), new Object[] { 1 })); - verify(result).setHint("javax.persistence.loadgraph", entityGraph); + verify(result).setHint("jakarta.persistence.loadgraph", entityGraph); } private JpaQueryMethod getMethod(String name, Class... parameterTypes) throws Exception { diff --git a/src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java index 55feb1470..059bc5824 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQueryIntegrationTests.java @@ -21,9 +21,9 @@ import static org.mockito.Mockito.*; import java.lang.reflect.Method; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Tuple; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Tuple; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java b/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java index f5cc0fe6a..42436c314 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsTests.java @@ -25,10 +25,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import javax.persistence.AttributeNode; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Subgraph; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Subgraph; import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.Assertions; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java index 2e18da355..03783c563 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/Jpa21UtilsUnitTests.java @@ -18,8 +18,8 @@ package org.springframework.data.jpa.repository.query; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import javax.persistence.EntityGraph; -import javax.persistence.Subgraph; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.Subgraph; import org.junit.jupiter.api.Test; import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java index b8b762fef..15b551e40 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreatorIntegrationTests.java @@ -20,9 +20,9 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java index ffdf396ce..229702392 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaParametersUnitTests.java @@ -15,13 +15,13 @@ */ package org.springframework.data.jpa.repository.query; -import static javax.persistence.TemporalType.*; +import static jakarta.persistence.TemporalType.*; import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.Date; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.junit.jupiter.api.Test; import org.springframework.data.jpa.repository.Temporal; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java index ebb562af6..4f0b8ab3a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java @@ -26,9 +26,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.Optional; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java index 79699c420..4f85e5698 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryLookupStrategyUnitTests.java @@ -22,9 +22,9 @@ import static org.mockito.Mockito.*; import java.lang.reflect.Method; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java index 7b817f5cf..7fc18fb56 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java @@ -25,8 +25,8 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Optional; -import javax.persistence.LockModeType; -import javax.persistence.QueryHint; +import jakarta.persistence.LockModeType; +import jakarta.persistence.QueryHint; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java index 33038c963..4d60b3486 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/NamedOrIndexedQueryParameterSetterUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.jpa.repository.query; import static java.util.Arrays.*; -import static javax.persistence.TemporalType.*; +import static jakarta.persistence.TemporalType.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import static org.springframework.data.jpa.repository.query.QueryParameterSetter.ErrorHandling.*; @@ -29,10 +29,10 @@ import java.util.Date; import java.util.List; 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.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java index 64945f658..913cc64c9 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java @@ -21,10 +21,10 @@ import static org.mockito.Mockito.*; import java.lang.reflect.Method; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.TypedQuery; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java index a4d33fc5f..2c522cf8d 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/ParameterBinderUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.jpa.repository.query; import static java.util.Collections.*; -import static javax.persistence.TemporalType.*; +import static jakarta.persistence.TemporalType.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -27,10 +27,10 @@ import java.util.Date; import java.util.List; import java.util.Optional; -import javax.persistence.Embeddable; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.TemporalType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java index 013c6b87c..7d501cf8c 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/ParameterExpressionProviderTests.java @@ -19,10 +19,10 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.ParameterExpression; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.ParameterExpression; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java index 8fb19d74d..2407d0ba5 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderIntegrationTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java index ffd4fd34f..19d626ec9 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/ParameterMetadataProviderUnitTests.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.*; import java.util.Collections; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder; import org.junit.jupiter.api.Test; import org.springframework.data.repository.query.Parameters; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java index 69afb6a59..58025e45e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java @@ -27,10 +27,10 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.TemporalType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; import org.hibernate.Version; import org.hibernate.query.internal.QueryImpl; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java index f8ccf02b1..a00f1763a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java @@ -25,23 +25,23 @@ import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Persistence; -import javax.persistence.PersistenceContext; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceProviderResolver; -import javax.persistence.spi.PersistenceProviderResolverHolder; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProviderResolverHolder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -307,7 +307,7 @@ public class QueryUtilsIntegrationTests { Sort sort = Sort.by(Direction.ASC, "age"); - List orders = QueryUtils.toOrders(sort, join, builder); + List orders = QueryUtils.toOrders(sort, join, builder); assertThat(orders).hasSize(1); } diff --git a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java index 71339337e..2b3888ac0 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java @@ -23,11 +23,11 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -76,7 +76,7 @@ class SimpleJpaQueryUnitTests { @Mock EntityManager em; @Mock EntityManagerFactory emf; @Mock QueryExtractor extractor; - @Mock javax.persistence.Query query; + @Mock jakarta.persistence.Query query; @Mock TypedQuery typedQuery; @Mock RepositoryMetadata metadata; @Mock ParameterBinder binder; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java index d4388f025..ab9c804c7 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java @@ -24,8 +24,8 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.ParameterMode; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ParameterMode; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java index 73a35ba0a..10f09fbe1 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributesUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.jpa.repository.query; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.jpa.repository.query.StoredProcedureAttributes.*; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java index 63f48a4ce..131fa07d4 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/TupleConverterUnitTests.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java index 93f331956..2889f95c3 100644 --- a/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java +++ b/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java @@ -15,8 +15,8 @@ */ package org.springframework.data.jpa.repository.sample; -import javax.persistence.LockModeType; -import javax.persistence.QueryHint; +import jakarta.persistence.LockModeType; +import jakarta.persistence.QueryHint; import java.util.Optional; diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java index 721123ca1..32b0b3676 100644 --- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java +++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java @@ -23,8 +23,8 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.QueryHint; +import jakarta.persistence.EntityManager; +import jakarta.persistence.QueryHint; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java index cd35daf10..80b136561 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/CrudMethodMetadataPopulatingMethodInterceptorUnitTests.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.*; import java.lang.reflect.Method; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java index e11879247..fe8215e22 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextIntegrationTests.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.HashSet; import javax.naming.NamingException; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java index 9b76f68bf..4be4afddb 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaContextUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java index 6a93386d1..89ad5f481 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/DefaultJpaEntityMetadataUnitTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.junit.jupiter.api.Test; import org.springframework.core.annotation.AliasFor; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java index 96f2e28f6..069791f7a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/DefaultTransactionDisablingIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.TransactionRequiredException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java index 7526a8afe..48762e1fb 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import javax.sql.DataSource; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java index b63026f68..9b92bc52d 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessorUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java index 3b0ed39a8..bcdfdee43 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.repository.support; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java index cfcfdc259..38ca24a88 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java index f8dea9ffa..37ae21a4e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java @@ -21,10 +21,10 @@ import static org.mockito.Mockito.*; import java.io.Serializable; import java.util.Collections; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.SingularAttribute; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java index 88dd673e3..5b9048855 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationIntegrationTests.java @@ -24,8 +24,8 @@ import java.io.Serializable; import java.sql.Timestamp; import java.util.Date; -import javax.persistence.*; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.*; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java index ff612d575..ce1207c30 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformationUnitTests.java @@ -23,10 +23,10 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java index 04caefc75..c379a031a 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaPersistableEntityInformationUnitTests.java @@ -18,9 +18,9 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.Type; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java index ddbd759b6..a06707e0f 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBeanUnitTests.java @@ -23,8 +23,8 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java index 5205f74c8..11f466f56 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.io.Serializable; import java.util.Optional; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java index cdebc4cb0..159c1fdc4 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; import java.util.Arrays; import java.util.Optional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java index ae523276b..688ae55eb 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/MailMessageRepositoryIntegrationTests.java @@ -20,8 +20,8 @@ import static org.springframework.data.jpa.domain.JpaSort.*; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java index 97260542e..ba4d78bc0 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslIntegrationTests.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java index 1df41b945..52d3608a4 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Set; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.hibernate.LazyInitializationException; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java index 7d0df5193..e438d4e2b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java @@ -25,8 +25,8 @@ import java.sql.Date; import java.time.LocalDate; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java index 242e09f7c..e5675fff3 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java @@ -17,8 +17,8 @@ package org.springframework.data.jpa.repository.support; import static org.assertj.core.api.Assertions.*; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java index f8d194de0..78ce57897 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportTests.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.*; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java index 1c2d3827e..9fabb41df 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java @@ -22,11 +22,11 @@ import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.Optional; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java index 0345ab389..d06a73c34 100644 --- a/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessorUnitTests.java @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Set; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/support/EntityManagerTestUtils.java b/src/test/java/org/springframework/data/jpa/support/EntityManagerTestUtils.java index 369028daa..67dd3e4ea 100644 --- a/src/test/java/org/springframework/data/jpa/support/EntityManagerTestUtils.java +++ b/src/test/java/org/springframework/data/jpa/support/EntityManagerTestUtils.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jpa.support; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.util.ReflectionUtils; diff --git a/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java b/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java index f0f076d18..db0d5e579 100644 --- a/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/support/MergingPersistenceUnitManagerUnitTests.java @@ -22,7 +22,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java index 277a92064..035f5d371 100644 --- a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanupIntegrationTests.java @@ -18,7 +18,7 @@ package org.springframework.data.jpa.util; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java index 2ccc0ef49..37fc84555 100644 --- a/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/util/JpaMetamodelUnitTests.java @@ -20,8 +20,8 @@ import static org.mockito.Mockito.*; import java.util.Collections; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/resources/META-INF/persistence.xml b/src/test/resources/META-INF/persistence.xml index d5fbd08bc..2a35e280d 100644 --- a/src/test/resources/META-INF/persistence.xml +++ b/src/test/resources/META-INF/persistence.xml @@ -123,10 +123,10 @@ org.springframework.data.jpa.domain.sample.Dummy true - - - - + + + + diff --git a/src/test/resources/config/jpa-context-with-jndi.xml b/src/test/resources/config/jpa-context-with-jndi.xml index 3688b88a6..3d41c9f94 100644 --- a/src/test/resources/config/jpa-context-with-jndi.xml +++ b/src/test/resources/config/jpa-context-with-jndi.xml @@ -13,7 +13,7 @@ + expected-type="jakarta.persistence.EntityManagerFactory" /> diff --git a/src/test/resources/eclipselink.xml b/src/test/resources/eclipselink.xml index 5871d54cb..069583385 100644 --- a/src/test/resources/eclipselink.xml +++ b/src/test/resources/eclipselink.xml @@ -9,11 +9,11 @@ - org.hsqldb.jdbcDriver - jdbc:hsqldb:mem:hades - sa - - create-tables + org.hsqldb.jdbcDriver + jdbc:hsqldb:mem:hades + sa + + create-tables false SEVERE diff --git a/src/test/resources/multiple-entity-manager-context.xml b/src/test/resources/multiple-entity-manager-context.xml index 53f76712d..e9931932f 100644 --- a/src/test/resources/multiple-entity-manager-context.xml +++ b/src/test/resources/multiple-entity-manager-context.xml @@ -10,11 +10,11 @@ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"> - + - + diff --git a/template.mf b/template.mf index 9705afec6..c3e75cc82 100644 --- a/template.mf +++ b/template.mf @@ -8,9 +8,9 @@ Export-Template: org.springframework.data.jpa.*;version="${project.version}" Import-Template: com.querydsl.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional, - javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}", - javax.annotation.*;version="0.0.0", - javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, + jakarta.persistence.*;version="${jpa:[=.=.=,+1.0.0)}", + jakarta.annotation.*;version="0.0.0", + jakarta.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, org.aopalliance.*;version="[1.0.0,2.0.0)", org.apache.openjpa.*;version="${openjpa:[=.=.=,+1.0.0)}";resolution:=optional, org.aspectj.*;version="${aspectj:[=.=.=,+1.0.0)}";resolution:=optional,