diff --git a/build.gradle b/build.gradle index 119b0a19b8..17235aad12 100644 --- a/build.gradle +++ b/build.gradle @@ -22,16 +22,17 @@ buildscript { plugins { + id 'org.hibernate.build.xjc-jakarta' version '1.0.2' apply false + id 'org.hibernate.matrix-test' version '3.1.1' apply false + id 'org.hibernate.orm.database-service' version '1.0.0-SNAPSHOT' apply false + id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' id 'nu.studer.credentials' version '2.1' - id 'org.hibernate.orm.database-service' version '1.0.0-SNAPSHOT' apply false id 'idea' id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0' id 'eclipse' - id 'org.hibernate.build.xjc' version '2.2.0' apply false - id 'org.hibernate.matrix-test' version '3.1.1' apply false id 'biz.aQute.bnd' version '5.1.1' apply false } diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 0055e0ff3e..ad62868ab1 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -19,9 +19,10 @@ def projectsToIncludeInAggregatedJavadoc = [ ':hibernate-c3p0', ':hibernate-graalvm', ':hibernate-hikaricp', - ':hibernate-jcache', +// ':hibernate-jcache', ':hibernate-micrometer', ':hibernate-proxool', + ':hibernate-spatial', ':hibernate-vibur', ':hibernate-gradle-plugin', ':hibernate-enhance-maven-plugin', @@ -48,10 +49,8 @@ dependencies { testImplementation project(':hibernate-testing') testImplementation project(':hibernate-envers') - // todo (6.0) - add back hibernate-spatial dependency - //testImplementation project(':hibernate-spatial') - testImplementation project( ':hibernate-jcache' ) - testImplementation libraries.jcache + testImplementation project(':hibernate-spatial') +// testImplementation project( ':hibernate-jcache' ) testImplementation project( path: ':hibernate-core', configuration: 'tests' ) testImplementation 'org.apache.commons:commons-lang3:3.4' diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc index 6c4a588e81..f92f90e256 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc @@ -36,9 +36,9 @@ public class Event { ---- ==== -The `@javax.persistence.Entity` annotation is used to mark a class as an entity. It functions the same as the +The `@jakarta.persistence.Entity` annotation is used to mark a class as an entity. It functions the same as the `` mapping element discussed in <>. Additionally the -`@javax.persistence.Table` annotation explicitly specifies the table name. Without this specification, the default +`@jakarta.persistence.Table` annotation explicitly specifies the table name. Without this specification, the default table name would be _EVENT_. @@ -56,9 +56,9 @@ public Long getId() { ---- ==== -`@javax.persistence.Id` marks the property which defines the entity's identifier. +`@jakarta.persistence.Id` marks the property which defines the entity's identifier. -`@javax.persistence.GeneratedValue` and `@org.hibernate.annotations.GenericGenerator` work in tandem +`@jakarta.persistence.GeneratedValue` and `@org.hibernate.annotations.GenericGenerator` work in tandem to indicate that Hibernate should use Hibernate's `increment` generation strategy for this entity's identifier values. diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc index 9a9f58ee31..ae2920ddf7 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc @@ -47,7 +47,7 @@ public void testBasicUsage() { ==== We see that an `org.hibernate.envers.AuditReader` is obtained from the `org.hibernate.envers.AuditReaderFactory` -which wraps the `javax.persistence.EntityManager`. +which wraps the `jakarta.persistence.EntityManager`. Next, the `find` method retrieves specific revisions of the entity. The first call says to find revision number 1 of Event with id 2. The second call says to find revision number 2 of Event with id 2. diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc index 9230becf7f..0fe62c449a 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc @@ -35,12 +35,15 @@ is required to locate all JPA configuration files by classpath lookup of the `ME ==== `persistence.xml` files should provide a unique name for each "persistence unit". Applications use this name to -reference the configuration when obtaining an `javax.persistence.EntityManagerFactory` reference. +reference the configuration when obtaining an `jakarta.persistence.EntityManagerFactory` reference. The settings defined in the `` element are discussed in <>. -Here the `javax.persistence`-prefixed varieties are used when possible. Notice that the remaining +Here the `jakarta.persistence`-prefixed varieties are used when possible. Notice that the remaining Hibernate-specific configuration setting names are now prefixed with `hibernate.`. +NOTE:: Configuration properties prefixed with the legacy Java EE "namespace" (`javax.persistence.*`) are also still +supported, although the Jakarta EE version (`jakarta.persistence.*`) should be preferred + Additionally, the `` element functions the same as we saw in <>. @@ -56,7 +59,7 @@ The entity is exactly the same as in <>. The `javax.persistence.EntityManager` interface +The code is similar to <>. The `jakarta.persistence.EntityManager` interface is used instead of the `org.hibernate.Session` interface. JPA calls this operation "persist" instead of "save". diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java index c66349f9eb..d5f3c35410 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java @@ -24,13 +24,13 @@ package org.hibernate.tutorial.annotations; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.GenericGenerator; @@ -80,4 +80,4 @@ public class Event { public void setTitle(String title) { this.title = title; } -} \ No newline at end of file +} diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java index feebd89a57..645c4baeca 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java @@ -25,9 +25,9 @@ package org.hibernate.tutorial.em; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import junit.framework.TestCase; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java index 90fe4144f3..253d44bd98 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java @@ -24,13 +24,13 @@ package org.hibernate.tutorial.em; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.GenericGenerator; @@ -80,4 +80,4 @@ public class Event { public void setTitle(String title) { this.title = title; } -} \ No newline at end of file +} diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml index 0fc9523813..02a161f6cc 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml +++ b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml @@ -17,10 +17,10 @@ org.hibernate.tutorial.em.Event - - - - + + + + diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java index 5e29faa6b9..d821a1182e 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java @@ -25,9 +25,9 @@ package org.hibernate.tutorial.envers; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import junit.framework.TestCase; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java index 64741a617a..36dcc05866 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java @@ -24,13 +24,13 @@ package org.hibernate.tutorial.envers; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.GenericGenerator; import org.hibernate.envers.Audited; @@ -89,4 +89,4 @@ public class Event { result = 31 * result + date.hashCode(); return result; } -} \ No newline at end of file +} diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml index 45a7dafe73..0e9e34af0f 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml +++ b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml @@ -17,10 +17,10 @@ org.hibernate.tutorial.envers.Event - - - - + + + + diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java index f324889603..d8f858ae87 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java @@ -22,7 +22,7 @@ package org.hibernate.osgitest; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.osgitest.entity.DataPoint; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java index 2a566d8829..62b9921048 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java @@ -20,9 +20,9 @@ */ package org.hibernate.osgitest.entity; -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 Brett Meyer diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java index dba3609e97..3e69fbe408 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java @@ -22,7 +22,7 @@ package org.hibernate.osgitest; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.osgitest.entity.DataPoint; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java index 0927f15f7d..a381075068 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java @@ -20,9 +20,9 @@ */ package org.hibernate.osgitest; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java index 2a566d8829..62b9921048 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java @@ -20,9 +20,9 @@ */ package org.hibernate.osgitest.entity; -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 Brett Meyer diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java index 2e5ef72422..227ba87474 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java @@ -22,9 +22,9 @@ package org.hibernate.osgitest.entity; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc b/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc index 7ac9b4d814..317cf8aa7b 100644 --- a/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc +++ b/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc @@ -10,9 +10,9 @@ the _Native Bootstrapping_ guide as well. == JPA-compliant bootstrapping -In JPA we are ultimately interested in bootstrapping an `javax.persistence.EntityManagerFactory` instance. The +In JPA we are ultimately interested in bootstrapping an `jakarta.persistence.EntityManagerFactory` instance. The JPA specification defines 2 primary standardized bootstrap approaches depending on how the application intends to -access the `javax.persistence.EntityManager` instances from an `EntityManagerFactory`. It uses the terms "EE" and +access the `jakarta.persistence.EntityManager` instances from an `EntityManagerFactory`. It uses the terms "EE" and "SE" for these 2 approaches, but those terms are very misleading in this context. What the JPA spec calls EE bootstrapping is cases where a container (EE, OSGi, etc) will manage and inject the persistence context on behalf of the application. What it calls SE bootstrapping is everything else. We will use the terms @@ -27,7 +27,7 @@ respectively. The container will build an `EntityManagerFactory` for each persistent-unit defined in the deployment's `META-INF/persistence.xml` and make that available to the application for injection via the -`javax.persistence.PersistenceUnit` annotation or via JNDI lookup. +`jakarta.persistence.PersistenceUnit` annotation or via JNDI lookup. [[container-bootstrap-injection-example]] .Injecting a EntityManagerFactory @@ -43,7 +43,7 @@ EntityManagerFactory emf; === Application-bootstrapping Rather than something a container building the `EntityManagerFactory` for the application, the application -can build the `EntityManagerFactory` using the `javax.persistence.Persistence` bootstrap class. The application +can build the `EntityManagerFactory` using the `jakarta.persistence.Persistence` bootstrap class. The application creates an entity manager factory by calling the createEntityManagerFactory method: [[application-bootstrap-example]] diff --git a/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc b/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc index 9aba27c3dc..48f0006916 100644 --- a/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc +++ b/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc @@ -126,7 +126,7 @@ package p is created. managed class by appending "_" to the name of the managed class. * The metamodel class X_ must be annotated with the -`javax.persistence.StaticMetamodel` annotation. +`jakarta.persistence.StaticMetamodel` annotation. * If class X extends another class S, where S is the most derived managed class (i.e., entity or mapped superclass) extended by X, then @@ -160,7 +160,7 @@ a declaration as follows: + where K is the type of the key of the map in class X -Import statements must be included for the needed `javax.persistence.metamodel` types as +Import statements must be included for the needed `jakarta.persistence.metamodel` types as appropriate and all classes X, Y, Z, and K. [[chapter-usage]] diff --git a/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc b/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc index 3c75a14c04..df1d660abd 100644 --- a/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc +++ b/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc @@ -27,7 +27,6 @@ include::chapters/query/criteria/Criteria.adoc[] include::chapters/query/native/Native.adoc[] include::chapters/query/spatial/Spatial.adoc[] include::chapters/multitenancy/MultiTenancy.adoc[] -include::chapters/osgi/OSGi.adoc[] include::chapters/envers/Envers.adoc[] include::chapters/portability/Portability.adoc[] include::chapters/statistics/Statistics.adoc[] @@ -38,7 +37,6 @@ include::appendices/BestPractices.adoc[] include::appendices/Legacy_Bootstrap.adoc[] include::appendices/Legacy_DomainModel.adoc[] include::appendices/LegacyBasicTypeResolution.adoc[] -include::appendices/Legacy_Criteria.adoc[] include::appendices/Legacy_Native_Queries.adoc[] include::Bibliography.adoc[] diff --git a/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc index d5e7825abf..a02389f719 100644 --- a/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc +++ b/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc @@ -670,7 +670,7 @@ See the <> chapter for more info. The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/Cascade.html[`@Cascade`] annotation is used to apply the Hibernate specific https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/CascadeType.html[`CascadeType`] strategies (e.g. `CascadeType.LOCK`, `CascadeType.SAVE_UPDATE`, `CascadeType.REPLICATE`) on a given association. -For JPA cascading, prefer using the {jpaJavadocUrlPrefix}CascadeType.html[`javax.persistence.CascadeType`] instead. +For JPA cascading, prefer using the {jpaJavadocUrlPrefix}CascadeType.html[`jakarta.persistence.CascadeType`] instead. When combining both JPA and Hibernate `CascadeType` strategies, Hibernate will merge both sets of cascades. diff --git a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc index a5d5390c4f..f67cdefc08 100644 --- a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc +++ b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc @@ -38,24 +38,24 @@ Note that for backward compatibility, if a `CurrentSessionContext` is not config === JPA compliance `*hibernate.jpa.compliance.transaction*` (e.g. `true` or `false` (default value)):: -This setting controls if Hibernate `Transaction` should behave as defined by the spec for JPA's `javax.persistence.EntityTransaction` +This setting controls if Hibernate `Transaction` should behave as defined by the spec for JPA's `jakarta.persistence.EntityTransaction` since it extends the JPA one. `*hibernate.jpa.compliance.query*` (e.g. `true` or `false` (default value)):: -Controls whether Hibernate's handling of `javax.persistence.Query` (JPQL, Criteria and native query) should strictly follow the JPA spec. +Controls whether Hibernate's handling of `jakarta.persistence.Query` (JPQL, Criteria and native query) should strictly follow the JPA spec. + -This includes both in terms of parsing or translating a query as well as calls to the `javax.persistence.Query` methods throwing spec +This includes both in terms of parsing or translating a query as well as calls to the `jakarta.persistence.Query` methods throwing spec defined exceptions whereas Hibernate might not. `*hibernate.jpa.compliance.list*` (e.g. `true` or `false` (default value)):: Controls whether Hibernate should recognize what it considers a "bag" (`org.hibernate.collection.internal.PersistentBag`) as a List (`org.hibernate.collection.internal.PersistentList`) or as a bag. + -If enabled, we will recognize it as a List where `javax.persistence.OrderColumn` +If enabled, we will recognize it as a List where `jakarta.persistence.OrderColumn` is just missing (and its defaults will apply). `*hibernate.jpa.compliance.closed*` (e.g. `true` or `false` (default value)):: -JPA defines specific exceptions upon calling specific methods on `javax.persistence.EntityManager` and `javax.persistence.EntityManagerFactory` +JPA defines specific exceptions upon calling specific methods on `jakarta.persistence.EntityManager` and `jakarta.persistence.EntityManagerFactory` objects which have been closed previously. + This setting controls whether the JPA spec-defined behavior or the Hibernate behavior will be used. @@ -63,7 +63,7 @@ This setting controls whether the JPA spec-defined behavior or the Hibernate beh If enabled, Hibernate will operate in the JPA specified way, throwing exceptions when the spec says it should. `*hibernate.jpa.compliance.proxy*` (e.g. `true` or `false` (default value)):: -The JPA spec says that a `javax.persistence.EntityNotFoundException` should be thrown when accessing an entity proxy +The JPA spec says that a `jakarta.persistence.EntityNotFoundException` should be thrown when accessing an entity proxy which does not have an associated table row in the database. + Traditionally, Hibernate does not initialize an entity proxy when accessing its identifier since we already know the identifier value, @@ -82,16 +82,16 @@ with the same name will cause a `java.lang.IllegalArgumentException` to be throw [[configurations-database-connection]] === Database connection properties -`*hibernate.connection.driver_class*` or `*javax.persistence.jdbc.driver*` (e.g. `org.postgresql.Driver`):: +`*hibernate.connection.driver_class*` or `*jakarta.persistence.jdbc.driver*` (e.g. `org.postgresql.Driver`):: Names the JDBC `Driver` class name. -`*hibernate.connection.url*` or `*javax.persistence.jdbc.url*` (e.g. `jdbc:postgresql:hibernate_orm_test`):: +`*hibernate.connection.url*` or `*jakarta.persistence.jdbc.url*` (e.g. `jdbc:postgresql:hibernate_orm_test`):: Names the JDBC connection URL. -`*hibernate.connection.username*` or `*javax.persistence.jdbc.user*`:: +`*hibernate.connection.username*` or `*jakarta.persistence.jdbc.user*`:: Names the JDBC connection user name. -`*hibernate.connection.password*` or `*javax.persistence.jdbc.password*`:: +`*hibernate.connection.password*` or `*jakarta.persistence.jdbc.password*`:: Names the JDBC connection password. `*hibernate.connection.isolation*` (e.g. `REPEATABLE_READ` or `Connection.TRANSACTION_REPEATABLE_READ`):: @@ -289,8 +289,8 @@ meaning that an Exception is thrown when detecting such a conflict. Should all database identifiers be quoted. `*hibernate.globally_quoted_identifiers_skip_column_definitions*` (e.g. `true` or `false` (default value)):: -Assuming `hibernate.globally_quoted_identifiers` is `true`, this allows the global quoting to skip column-definitions as defined by `javax.persistence.Column`, -`javax.persistence.JoinColumn`, etc., and while it avoids column-definitions being quoted due to global quoting, they can still be explicitly quoted in the annotation/xml mappings. +Assuming `hibernate.globally_quoted_identifiers` is `true`, this allows the global quoting to skip column-definitions as defined by `jakarta.persistence.Column`, +`jakarta.persistence.JoinColumn`, etc., and while it avoids column-definitions being quoted due to global quoting, they can still be explicitly quoted in the annotation/xml mappings. `*hibernate.auto_quote_keyword*` (e.g. `true` or `false` (default value)):: Specifies whether to automatically quote any names that are deemed keywords. @@ -393,7 +393,7 @@ Unless specified, the JDBC Driver uses the default JVM time zone. If a different This setting applies to Oracle Dialect only, and it specifies whether `byte[]` or `Byte[]` arrays should be mapped to the deprecated `LONG RAW` (when this configuration property value is `true`) or to a `BLOB` column type (when this configuration property value is `false`). ==== Bean Validation options -`*javax.persistence.validation.factory*` (e.g. `javax.validation.ValidationFactory` implementation):: +`*jakarta.persistence.validation.factory*` (e.g. `jakarta.validation.ValidationFactory` implementation):: Specify the `javax.validation.ValidationFactory` implementation to use for Bean Validation. `*hibernate.check_nullability*` (e.g. `true` or `false`):: @@ -499,7 +499,7 @@ Can reference a `*hibernate.query.validate_parameters*` (e.g. `true` (default value) or `false`):: This configuration property can be used to disable parameters validation performed by `org.hibernate.query.Query#setParameter` when the Session is bootstrapped via JPA -`javax.persistence.EntityManagerFactory`. +`jakarta.persistence.EntityManagerFactory`. `*hibernate.criteria.value_handling_mode*` (e.g. `BIND` (default value) or `INLINE`):: By default, Criteria queries uses bind parameters for any value passed through the JPA Criteria API. @@ -535,7 +535,7 @@ This way, an IN clause with 5, 6, or 7 bind parameters will use the 8 IN clause, therefore reusing its execution plan. `*hibernate.query.omit_join_of_superclass_tables*` (e.g. `false` or `true` (default value)):: -When you use `javax.persistence.InheritanceType#JOINED` strategy for inheritance mapping and query +When you use `jakarta.persistence.InheritanceType#JOINED` strategy for inheritance mapping and query a value from an entity, all superclass tables are joined in the query regardless you need them. + With this setting set to true only superclass tables which are really needed are joined. @@ -680,7 +680,7 @@ Either a shortcut name (e.g. `jcache`, `ehcache`) or the fully-qualified name of `*hibernate.cache.default_cache_concurrency_strategy*`:: Setting used to give the name of the default https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/CacheConcurrencyStrategy.html[`CacheConcurrencyStrategy`] to use -when `@javax.persistence.Cacheable`, `@org.hibernate.annotations.Cache` or `@org.hibernate.annotations.Cache` is used to override the global setting. +when `@jakarta.persistence.Cacheable`, `@org.hibernate.annotations.Cache` or `@org.hibernate.annotations.Cache` is used to override the global setting. `*hibernate.cache.use_minimal_puts*` (e.g. `true` (default value) or `false`):: Optimizes second-level cache operation to minimize writes, at the cost of more frequent reads. This is most useful for clustered caches and is enabled by default for clustered cache implementations. @@ -813,7 +813,7 @@ Valid options are defined by the `externalHbm2ddlName` value of the https://docs `validate`::: Validate the database schema. `update`::: Update the database schema. -`*javax.persistence.schema-generation.database.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: +`*jakarta.persistence.schema-generation.database.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: Setting to perform `SchemaManagementTool` actions automatically as part of the `SessionFactory` lifecycle. Valid options are defined by the `externalJpaName` value of the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/Action.html[`Action`] enum: + @@ -822,7 +822,7 @@ Valid options are defined by the `externalJpaName` value of the https://docs.jbo `drop`::: Database dropping will be generated. `drop-and-create`::: Database dropping will be generated followed by database creation. -`*javax.persistence.schema-generation.scripts.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: +`*jakarta.persistence.schema-generation.scripts.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: Setting to perform `SchemaManagementTool` actions writing the commands into a DDL script file. Valid options are defined by the `externalJpaName` value of the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/Action.html[`Action`] enum: + @@ -831,77 +831,77 @@ Valid options are defined by the `externalJpaName` value of the https://docs.jbo `drop`::: Database dropping will be generated. `drop-and-create`::: Database dropping will be generated followed by database creation. -`*javax.persistence.schema-generation-connection*`:: +`*jakarta.persistence.schema-generation-connection*`:: Allows passing a specific `java.sql.Connection` instance to be used by `SchemaManagementTool`. -`*javax.persistence.database-product-name*`:: +`*jakarta.persistence.database-product-name*`:: Specifies the name of the database provider in cases where a Connection to the underlying database is not available (aka, mainly in generating scripts). In such cases, a value for this setting _must_ be specified. + The value of this setting is expected to match the value returned by `java.sql.DatabaseMetaData#getDatabaseProductName()` for the target database. + -Additionally, specifying `javax.persistence.database-major-version` and/or `javax.persistence.database-minor-version` may be required to understand exactly how to generate the required schema commands. +Additionally, specifying `jakarta.persistence.database-major-version` and/or `jakarta.persistence.database-minor-version` may be required to understand exactly how to generate the required schema commands. -`*javax.persistence.database-major-version*`:: +`*jakarta.persistence.database-major-version*`:: Specifies the major version of the underlying database, as would be returned by `java.sql.DatabaseMetaData#getDatabaseMajorVersion` for the target database. + -This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `javax.persistence.database-product-name` does not provide enough distinction. +This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `jakarta.persistence.database-product-name` does not provide enough distinction. -`*javax.persistence.database-minor-version*`:: +`*jakarta.persistence.database-minor-version*`:: Specifies the minor version of the underlying database, as would be returned by `java.sql.DatabaseMetaData#getDatabaseMinorVersion` for the target database. + -This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `javax.persistence.database-product-name` and `javax.persistence.database-major-version` does not provide enough distinction. +This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `jakarta.persistence.database-product-name` and `jakarta.persistence.database-major-version` does not provide enough distinction. -`*javax.persistence.schema-generation.create-source*`:: +`*jakarta.persistence.schema-generation.create-source*`:: Specifies whether schema generation commands for schema creation are to be determined based on object/relational mapping metadata, DDL scripts, or a combination of the two. See https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/SourceType.html[`SourceType`] for valid set of values. + If no value is specified, a default is assumed as follows: + -* if source scripts are specified (per `javax.persistence.schema-generation.create-script-source`), then `script` is assumed +* if source scripts are specified (per `jakarta.persistence.schema-generation.create-script-source`), then `script` is assumed * otherwise, `metadata` is assumed -`*javax.persistence.schema-generation.drop-source*`:: +`*jakarta.persistence.schema-generation.drop-source*`:: Specifies whether schema generation commands for schema dropping are to be determined based on object/relational mapping metadata, DDL scripts, or a combination of the two. See https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/SourceType.html[`SourceType`] for valid set of values. + If no value is specified, a default is assumed as follows: + -* if source scripts are specified (per `javax.persistence.schema-generation.drop-script-source`), then the `script` option is assumed +* if source scripts are specified (per `jakarta.persistence.schema-generation.drop-script-source`), then the `script` option is assumed * otherwise, `metadata` is assumed -`*javax.persistence.schema-generation.create-script-source*`:: +`*jakarta.persistence.schema-generation.create-script-source*`:: Specifies the `create` script file as either a `java.io.Reader` configured for reading of the DDL script file or a string designating a file `java.net.URL` for the DDL script. + -Hibernate historically also accepted `hibernate.hbm2ddl.import_files` for a similar purpose, but `javax.persistence.schema-generation.create-script-source` should be preferred over `hibernate.hbm2ddl.import_files`. +Hibernate historically also accepted `hibernate.hbm2ddl.import_files` for a similar purpose, but `jakarta.persistence.schema-generation.create-script-source` should be preferred over `hibernate.hbm2ddl.import_files`. -`*javax.persistence.schema-generation.drop-script-source*`:: +`*jakarta.persistence.schema-generation.drop-script-source*`:: Specifies the `drop` script file as either a `java.io.Reader` configured for reading of the DDL script file or a string designating a file `java.net.URL` for the DDL script. -`*javax.persistence.schema-generation.scripts.create-target*`:: -For cases where the `javax.persistence.schema-generation.scripts.action` value indicates that schema creation commands should be written to DDL script file, `javax.persistence.schema-generation.scripts.create-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. +`*jakarta.persistence.schema-generation.scripts.create-target*`:: +For cases where the `jakarta.persistence.schema-generation.scripts.action` value indicates that schema creation commands should be written to DDL script file, `jakarta.persistence.schema-generation.scripts.create-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. -`*javax.persistence.schema-generation.scripts.drop-target*`:: -For cases where the `javax.persistence.schema-generation.scripts.action` value indicates that schema dropping commands should be written to DDL script file, `javax.persistence.schema-generation.scripts.drop-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. +`*jakarta.persistence.schema-generation.scripts.drop-target*`:: +For cases where the `jakarta.persistence.schema-generation.scripts.action` value indicates that schema dropping commands should be written to DDL script file, `jakarta.persistence.schema-generation.scripts.drop-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. `*hibernate.hbm2ddl.schema-generation.script.append*` (e.g. `true` (default value) or `false`):: -For cases where the `javax.persistence.schema-generation.scripts.action` value indicates that schema commands should be written to DDL script file, `hibernate.hbm2ddl.schema-generation.script.append` specifies if schema commands should be appended to the end of the file rather than written at the beginning of the file. +For cases where the `jakarta.persistence.schema-generation.scripts.action` value indicates that schema commands should be written to DDL script file, `hibernate.hbm2ddl.schema-generation.script.append` specifies if schema commands should be appended to the end of the file rather than written at the beginning of the file. Values are `true` for appending schema commands to the end of the file, `false` for writing achema commands at the beginning of the file. -`*javax.persistence.hibernate.hbm2ddl.import_files*` (e.g. `import.sql` (default value)):: +`*jakarta.persistence.hibernate.hbm2ddl.import_files*` (e.g. `import.sql` (default value)):: Comma-separated names of the optional files containing SQL DML statements executed during the `SessionFactory` creation. File order matters, the statements of a given file are executed before the statements of the following one. + These statements are only executed if the schema is created, meaning that `hibernate.hbm2ddl.auto` is set to `create`, `create-drop`, or `update`. -`javax.persistence.schema-generation.create-script-source` / `javax.persistence.schema-generation.drop-script-source` should be preferred. +`jakarta.persistence.schema-generation.create-script-source` / `jakarta.persistence.schema-generation.drop-script-source` should be preferred. -`*javax.persistence.sql-load-script-source*`:: +`*jakarta.persistence.sql-load-script-source*`:: JPA variant of `hibernate.hbm2ddl.import_files`. Specifies a `java.io.Reader` configured for reading of the SQL load script or a string designating the file `java.net.URL` for the SQL load script. A "SQL load script" is a script that performs some database initialization (INSERT, etc). `*hibernate.hbm2ddl.import_files_sql_extractor*`:: -Reference to the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.html[`ImportSqlCommandExtractor`] implementation class to use for parsing source/import files as defined by `javax.persistence.schema-generation.create-script-source`, -`javax.persistence.schema-generation.drop-script-source` or `hibernate.hbm2ddl.import_files`. +Reference to the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.html[`ImportSqlCommandExtractor`] implementation class to use for parsing source/import files as defined by `jakarta.persistence.schema-generation.create-script-source`, +`jakarta.persistence.schema-generation.drop-script-source` or `hibernate.hbm2ddl.import_files`. + Reference may refer to an instance, a Class implementing `ImportSqlCommandExtractor` or the fully-qualified name of the `ImportSqlCommandExtractor` implementation. If the fully-qualified name is given, the implementation must provide a no-arg constructor. @@ -911,7 +911,7 @@ The default value is https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/ja `*hibernate.hbm2ddl.create_namespaces*` (e.g. `true` or `false` (default value)):: Specifies whether to automatically create the database schema/catalog also. -`*javax.persistence.create-database-schemas*` (e.g. `true` or `false` (default value)):: +`*jakarta.persistence.create-database-schemas*` (e.g. `true` or `false` (default value)):: The JPA variant of `hibernate.hbm2ddl.create_namespaces`. Specifies whether the persistence provider is to create the database schema(s) in addition to creating database objects (tables, sequences, constraints, etc). The value of this boolean property should be set to `true` if the persistence provider is to create schemas in the database or to generate DDL that contains "CREATE SCHEMA" commands. + @@ -925,8 +925,8 @@ Used to specify the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/jav Setting to choose the strategy used to access the JDBC Metadata. Valid options are defined by the `strategy` value of the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.html[`JdbcMetadaAccessStrategy`] enum: + -`grouped`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute a single `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call to retrieve all the database table in order to determine if all the ``javax.persistence.Entity``s have a corresponding mapped database tables. This strategy may require `hibernate.default_schema` and/or `hibernate.default_catalog` to be provided. -`individually`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute one `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call for each `javax.persistence.Entity` in order to determine if a corresponding database table exists. +`grouped`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute a single `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call to retrieve all the database table in order to determine if all the ``jakarta.persistence.Entity``s have a corresponding mapped database tables. This strategy may require `hibernate.default_schema` and/or `hibernate.default_catalog` to be provided. +`individually`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute one `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call for each `jakarta.persistence.Entity` in order to determine if a corresponding database table exists. `*hibernate.hbm2ddl.delimiter*` (e.g. `;`):: Identifies the delimiter to use to separate schema management statements in script outputs. @@ -942,7 +942,7 @@ If enabled, allows schema update and validation to support synonyms. Due to the Identifies a comma-separated list of values to specify extra table types, other than the default `TABLE` value, to recognize as defining a physical table by schema update, creation and validation. `*hibernate.hbm2ddl.default_constraint_mode*` (`CONSTRAINT` (default value) or `NO_CONSTRAINT`):: -Default `javax.persistence.ConstraintMode` for foreign key mapping if `PROVIDER_DEFAULT` strategy used. +Default `jakarta.persistence.ConstraintMode` for foreign key mapping if `PROVIDER_DEFAULT` strategy used. `*hibernate.schema_update.unique_constraint_strategy*` (e.g. `DROP_RECREATE_QUIETLY`, `RECREATE_QUIETLY`, `SKIP`):: Unique columns and unique keys both use unique constraints in most dialects. @@ -1153,7 +1153,7 @@ Defines delayed access to CDI `BeanManager`. Starting in 5.1 the preferred means Identifies an explicit `org.hibernate.resource.beans.container.spi.BeanContainer` to be used. + Note that, for CDI-based containers, setting this is not necessary. -Simply pass the `BeanManager` to use via `javax.persistence.bean.manager` and optionally specify `hibernate.delay_cdi_access`. +Simply pass the `BeanManager` to use via `jakarta.persistence.bean.manager` and optionally specify `hibernate.delay_cdi_access`. + This setting is more meant to integrate non-CDI bean containers such as Spring. @@ -1169,7 +1169,7 @@ false::: does not allow Setting which indicates whether or not the new JOINs over collection tables should be rewritten to subqueries. `*hibernate.allow_refresh_detached_entity*` (e.g. `true` (default value when using Hibernate native bootstrapping) or `false` (default value when using JPA bootstrapping)):: -Setting that allows to call `javax.persistence.EntityManager#refresh(entity)` or `Session#refresh(entity)` on a detached instance even when the `org.hibernate.Session` is obtained from a JPA `javax.persistence.EntityManager`. +Setting that allows to call `jakarta.persistence.EntityManager#refresh(entity)` or `Session#refresh(entity)` on a detached instance even when the `org.hibernate.Session` is obtained from a JPA `jakarta.persistence.EntityManager`. `*hibernate.use_entity_where_clause_for_collections*` (e.g., `true` (default) or `false`):: Setting controls whether an entity's "where" clause, mapped using `@Where(clause = "...")` or `` is taken into account when loading one-to-many or many-to-many collections of that type of entity. diff --git a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc index d5f8688b28..31b20c7a1a 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc @@ -182,15 +182,15 @@ The standardized approach has some limitations in certain environments, but asid [[bootstrap-jpa-compliant]] ==== JPA-compliant bootstrapping -In JPA, we are ultimately interested in bootstrapping a `javax.persistence.EntityManagerFactory` instance. -The JPA specification defines two primary standardized bootstrap approaches depending on how the application intends to access the `javax.persistence.EntityManager` instances from an `EntityManagerFactory`. +In JPA, we are ultimately interested in bootstrapping a `jakarta.persistence.EntityManagerFactory` instance. +The JPA specification defines two primary standardized bootstrap approaches depending on how the application intends to access the `jakarta.persistence.EntityManager` instances from an `EntityManagerFactory`. It uses the terms _EE_ and _SE_ for these two approaches, but those terms are very misleading in this context. What the JPA spec calls EE bootstrapping implies the existence of a container (EE, OSGi, etc), who'll manage and inject the persistence context on behalf of the application. What it calls SE bootstrapping is everything else. We will use the terms container-bootstrapping and application-bootstrapping in this guide. For compliant container-bootstrapping, the container will build an `EntityManagerFactory` for each persistent-unit defined in the `META-INF/persistence.xml` configuration file -and make that available to the application for injection via the `javax.persistence.PersistenceUnit` annotation or via JNDI lookup. +and make that available to the application for injection via the `jakarta.persistence.PersistenceUnit` annotation or via JNDI lookup. [[bootstrap-jpa-compliant-PersistenceUnit-example]] .Injecting the default `EntityManagerFactory` @@ -224,7 +224,7 @@ include::{extrasdir}/persistence.xml[] ---- ==== -For compliant application-bootstrapping, rather than the container building the `EntityManagerFactory` for the application, the application builds the `EntityManagerFactory` itself using the `javax.persistence.Persistence` bootstrap class. +For compliant application-bootstrapping, rather than the container building the `EntityManagerFactory` for the application, the application builds the `EntityManagerFactory` itself using the `jakarta.persistence.Persistence` bootstrap class. The application creates an `EntityManagerFactory` by calling the `createEntityManagerFactory` method: [[bootstrap-jpa-compliant-EntityManagerFactory-example]] @@ -240,7 +240,7 @@ include::{sourcedir}/BootstrapTest.java[tags=bootstrap-jpa-compliant-EntityManag ==== If you don't want to provide a `persistence.xml` configuration file, JPA allows you to provide all the configuration options in a {jpaJavadocUrlPrefix}spi/PersistenceUnitInfo.html[`PersistenceUnitInfo`] implementation and call -https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/jpa/HibernatePersistenceProvider.html#createContainerEntityManagerFactory-javax.persistence.spi.PersistenceUnitInfo-java.util.Map-[`HibernatePersistenceProvider.html#createContainerEntityManagerFactory`]. +https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/jpa/HibernatePersistenceProvider.html#createContainerEntityManagerFactory-jakarta.persistence.spi.PersistenceUnitInfo-java.util.Map-[`HibernatePersistenceProvider.html#createContainerEntityManagerFactory`]. ==== To inject the default Persistence Context, you can use the {jpaJavadocUrlPrefix}PersistenceContext.html[`@PersistenceContext`] annotation. diff --git a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml index e009087fed..967f9e4c5e 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml +++ b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml @@ -14,16 +14,16 @@ file:///etc/opt/app/mappings/orm.xml - - - - org.hibernate.documentation.userguide.Document - - - - > for more on this topic. ==== @@ -69,7 +69,7 @@ This chapter covers how Hibernate determines these pieces and how to influence t [[basic-basic-annotation]] ==== @Basic -Strictly speaking, a basic type is denoted by the `javax.persistence.Basic` annotation. +Strictly speaking, a basic type is denoted by the `jakarta.persistence.Basic` annotation. Generally, the `@Basic` annotation can be ignored as it is assumed by default. Both of the following examples are ultimately the same. @@ -1381,7 +1381,7 @@ Hibernate supports the mapping of Java enums as basic value types in a number of [[basic-enums-Enumerated]] ===== `@Enumerated` -The original JPA-compliant way to map enums was via the `@Enumerated` or `@MapKeyEnumerated` annotations, working on the principle that the enum values are stored according to one of 2 strategies indicated by `javax.persistence.EnumType`: +The original JPA-compliant way to map enums was via the `@Enumerated` or `@MapKeyEnumerated` annotations, working on the principle that the enum values are stored according to one of 2 strategies indicated by `jakarta.persistence.EnumType`: `ORDINAL`:: stored according to the enum value's ordinal position within the enum class, as indicated by `java.lang.Enum#ordinal` diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc index b5e505167f..bf10b7d3d1 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc @@ -21,7 +21,7 @@ Throughout this chapter and thereafter, entity types will be simply referred to Section _2.1 The Entity Class_ of the _JPA 2.1 specification_ defines its requirements for an entity class. Applications that wish to remain portable across JPA providers should adhere to these requirements: -* The entity class must be annotated with the `javax.persistence.Entity` annotation (or be denoted as such in XML mapping). +* The entity class must be annotated with the `jakarta.persistence.Entity` annotation (or be denoted as such in XML mapping). * The entity class must have a public or protected no-argument constructor. It may define additional constructors as well. * The entity class must be a top-level class. * An enum or interface may not be designated as an entity. @@ -114,7 +114,7 @@ Hibernate offers multiple identifier generation strategies, see the <>), -or defined using the `javax.persistence.IdClass` annotation (see <>). +The primary key class may be defined using the `jakarta.persistence.EmbeddedId` annotation (see <>), +or defined using the `jakarta.persistence.IdClass` annotation (see <>). * The primary key class must be public and must have a public no-arg constructor. * The primary key class must be serializable. * The primary key class must define equals and hashCode methods, consistent with equality for the underlying database types to which the primary key is mapped. @@ -283,8 +283,8 @@ You can also auto-generate values for non-identifier attributes. For more detail Hibernate supports identifier value generation across a number of different types. Remember that JPA portably defines identifier value generation just for integer types. -Identifier value generation is indicated using the `javax.persistence.GeneratedValue` annotation. -The most important piece of information here is the specified `javax.persistence.GenerationType` which indicates how values will be generated. +Identifier value generation is indicated using the `jakarta.persistence.GeneratedValue` annotation. +The most important piece of information here is the specified `jakarta.persistence.GenerationType` which indicates how values will be generated. [NOTE] ==== @@ -348,7 +348,7 @@ It is important to note that SequenceStyleGenerator is capable of working agains This gives Hibernate a huge degree of portability across databases while still maintaining consistent id generation behavior (versus say choosing between SEQUENCE and IDENTITY). This backing storage is completely transparent to the user. -The preferred (and portable) way to configure this generator is using the JPA-defined `javax.persistence.SequenceGenerator` annotation. +The preferred (and portable) way to configure this generator is using the JPA-defined `jakarta.persistence.SequenceGenerator` annotation. The simplest form is to simply request sequence generation; Hibernate will use a single, implicitly-named sequence (`hibernate_sequence`) for all such unnamed definitions. @@ -361,7 +361,7 @@ include::{sourcedir}/SequenceGeneratorUnnamedTest.java[tag=identifiers-generator ---- ==== -Using `javax.persistence.SequenceGenerator`, you can specify a specific database sequence name. +Using `jakarta.persistence.SequenceGenerator`, you can specify a specific database sequence name. [[identifiers-generators-sequence-named]] .Named sequence @@ -372,7 +372,7 @@ include::{sourcedir}/SequenceGeneratorNamedTest.java[tag=identifiers-generators- ---- ==== -The `javax.persistence.SequenceGenerator` annotation allows you to specify additional configurations as well. +The `jakarta.persistence.SequenceGenerator` annotation allows you to specify additional configurations as well. [[identifiers-generators-sequence-configured]] .Configured sequence @@ -434,7 +434,7 @@ include::{extrasdir}/id/identifiers-generators-table-unnamed-mapping-example.sql If no table name is given Hibernate assumes an implicit name of `hibernate_sequences`. -Additionally, because no `javax.persistence.TableGenerator#pkColumnValue` is specified, +Additionally, because no `jakarta.persistence.TableGenerator#pkColumnValue` is specified, Hibernate will use the default segment (`sequence_name='default'`) from the hibernate_sequences table. However, you can configure the table identifier generator using the {jpaJavadocUrlPrefix}TableGenerator.html[`@TableGenerator`] annotation. diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc index 1d44ac2381..1d42da70ae 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc @@ -114,7 +114,7 @@ Use the `@DiscriminatorColumn` to define the discriminator column as well as the [NOTE] ==== -The enum `DiscriminatorType` used in `javax.persistence.DiscriminatorColumn` only contains the values `STRING`, `CHAR` and `INTEGER` which means that not all Hibernate supported types are available via the `@DiscriminatorColumn` annotation. +The enum `DiscriminatorType` used in `jakarta.persistence.DiscriminatorColumn` only contains the values `STRING`, `CHAR` and `INTEGER` which means that not all Hibernate supported types are available via the `@DiscriminatorColumn` annotation. You can also use `@DiscriminatorFormula` to express in SQL a virtual discriminator column. This is particularly useful when the discriminator value can be extracted from one or more columns of the table. Both `@DiscriminatorColumn` and `@DiscriminatorFormula` are to be set on the root entity (once per persisted hierarchy). diff --git a/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc b/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc index af0e847abc..af05df8efc 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc @@ -340,7 +340,7 @@ please see <> for a description of the additional `@Au If you want to audit a relation, where the target entity is not audited (that is the case for example with dictionary-like entities, which don't change and don't have to be audited), just annotate it with `@Audited( targetAuditMode = RelationTargetAuditMode.NOT_AUDITED )`. Then, while reading historic versions of your entity, the relation will always point to the "current" related entity. -By default Envers throws `javax.persistence.EntityNotFoundException` when "current" entity does not exist in the database. +By default Envers throws `jakarta.persistence.EntityNotFoundException` when "current" entity does not exist in the database. Apply `@NotFound( action = NotFoundAction.IGNORE )` annotation to silence the exception and assign null value instead. The hereby solution causes implicit eager loading of to-one relations. @@ -1431,7 +1431,7 @@ Although Hibernate allows this, Envers (or more precisely the database connector There are at least two ways out if you need bag semantics: -. use an indexed collection, with the `@javax.persistence.OrderColumn` annotation. +. use an indexed collection, with the `@jakarta.persistence.OrderColumn` annotation. . provide a unique id for your elements with the `@CollectionId` annotation. ==== What isn't and _will_ be supported diff --git a/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc b/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc index 19e7886ed3..4008039c4e 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc @@ -144,7 +144,7 @@ There are two available approaches defined for specifying callback handling: * The second is to use a separate entity listener class. An entity listener is a stateless class with a no-arg constructor. The callback annotations are placed on a method of this class instead of the entity class. -The entity listener class is then associated with the entity using the `javax.persistence.EntityListeners` annotation +The entity listener class is then associated with the entity using the `jakarta.persistence.EntityListeners` annotation [[events-jpa-callbacks-example]] .Example of specifying JPA callbacks @@ -170,10 +170,10 @@ A callback method must not invoke `EntityManager` or `Query` methods! It is possible that multiple callback methods are defined for a particular lifecycle event. When that is the case, the defined order of execution is well defined by the JPA spec (specifically section 3.5.4): -* Any default listeners associated with the entity are invoked first, in the order they were specified in the XML. See the `javax.persistence.ExcludeDefaultListeners` annotation. +* Any default listeners associated with the entity are invoked first, in the order they were specified in the XML. See the `jakarta.persistence.ExcludeDefaultListeners` annotation. * Next, entity listener class callbacks associated with the entity hierarchy are invoked, in the order they are defined in the `EntityListeners`. If multiple classes in the entity hierarchy define entity listeners, the listeners defined for a superclass are invoked before the listeners defined for its subclasses. -See the ``javax.persistence.ExcludeSuperclassListener``'s annotation. +See the ``jakarta.persistence.ExcludeSuperclassListener``'s annotation. * Lastly, callback methods defined on the entity hierarchy are invoked. If a callback type is annotated on both an entity and one or more of its superclasses without method overriding, both would be called, the most general superclass first. An entity class is also allowed to override a callback method defined in a superclass in which case the super callback would not get invoked; the overriding method would get invoked provided it is annotated. diff --git a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc index e63f1dd9e0..6dde55ab53 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc @@ -358,7 +358,7 @@ creates a single AttributeNode with 3 distinct SubGraphs. It is functionally th [source, JAVA, indent=0] ---- Class invoiceClass = ...; -javax.persistence.EntityGraph invoiceGraph = entityManager.createEntityGraph( invoiceClass ); +jakarta.persistence.EntityGraph invoiceGraph = entityManager.createEntityGraph( invoiceClass ); invoiceGraph.addAttributeNode( "responsibleParty" ); invoiceGraph.addSubgraph( "responsibleParty" ).addAttributeNode( "taxIdNumber" ); invoiceGraph.addSubgraph( "responsibleParty", Corporation.class ).addAttributeNode( "ceo" ); diff --git a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc index adf7b217ab..32f97563e6 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc @@ -32,7 +32,8 @@ For cases where a JNDI name is given, be sure to read <>. This chapter will focus on the JPA APIs for declaring type-safe criteria queries. @@ -21,12 +21,12 @@ Users of the older Hibernate `org.hibernate.Criteria` query API will recognize t Criteria queries are essentially an object graph, where each part of the graph represents an increasing (as we navigate down this graph) more atomic part of the query. The first step in performing a criteria query is building this graph. -The `javax.persistence.criteria.CriteriaBuilder` interface is the first thing with which you need to become acquainted with before using criteria queries. +The `jakarta.persistence.criteria.CriteriaBuilder` interface is the first thing with which you need to become acquainted with before using criteria queries. Its role is that of a factory for all the individual pieces of the criteria. -You obtain a `javax.persistence.criteria.CriteriaBuilder` instance by calling the `getCriteriaBuilder()` method of either `javax.persistence.EntityManagerFactory` or `javax.persistence.EntityManager`. +You obtain a `jakarta.persistence.criteria.CriteriaBuilder` instance by calling the `getCriteriaBuilder()` method of either `jakarta.persistence.EntityManagerFactory` or `jakarta.persistence.EntityManager`. -The next step is to obtain a `javax.persistence.criteria.CriteriaQuery`. -This is accomplished using one of the three methods on `javax.persistence.criteria.CriteriaBuilder` for this purpose: +The next step is to obtain a `jakarta.persistence.criteria.CriteriaQuery`. +This is accomplished using one of the three methods on `jakarta.persistence.criteria.CriteriaBuilder` for this purpose: * ` CriteriaQuery createQuery( Class resultClass )` * `CriteriaQuery createTupleQuery()` @@ -111,7 +111,7 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-typedquery-multiselect-arra Technically this is classified as a typed query, but you can see from handling the results that this is sort of misleading. Anyway, the expected result type here is an array. -The example then uses the array method of `javax.persistence.criteria.CriteriaBuilder` which explicitly combines individual selections into a `javax.persistence.criteria.CompoundSelection`. +The example then uses the array method of `jakarta.persistence.criteria.CriteriaBuilder` which explicitly combines individual selections into a `jakarta.persistence.criteria.CompoundSelection`. [[criteria-typedquery-multiselect-array-implicit-example]] .Selecting an array using `multiselect` @@ -148,14 +148,14 @@ First, we see the simple definition of the wrapper object we will be using to wr Specifically, notice the constructor and its argument types. Since we will be returning `PersonWrapper` objects, we use `PersonWrapper` as the type of our criteria query. -This example illustrates the use of the `javax.persistence.criteria.CriteriaBuilder` method construct which is used to build a wrapper expression. +This example illustrates the use of the `jakarta.persistence.criteria.CriteriaBuilder` method construct which is used to build a wrapper expression. For every row in the result, we are saying we would like a `PersonWrapper` instantiated with the remaining arguments by the matching constructor. This wrapper expression is then passed as the select. [[criteria-tuple]] === Tuple criteria queries -A better approach to <> is to use either a wrapper (which we just saw in <>) or using the `javax.persistence.Tuple` contract. +A better approach to <> is to use either a wrapper (which we just saw in <>) or using the `jakarta.persistence.Tuple` contract. [[criteria-tuple-example]] .Selecting a tuple @@ -166,18 +166,18 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-tuple-example] ---- ==== -This example illustrates accessing the query results through the `javax.persistence.Tuple` interface. -The example uses the explicit `createTupleQuery()` of `javax.persistence.criteria.CriteriaBuilder`. +This example illustrates accessing the query results through the `jakarta.persistence.Tuple` interface. +The example uses the explicit `createTupleQuery()` of `jakarta.persistence.criteria.CriteriaBuilder`. An alternate approach is to use `createQuery( Tuple.class )`. Again we see the use of the `multiselect()` method, just like in <>. -The difference here is that the type of the `javax.persistence.criteria.CriteriaQuery` was defined as `javax.persistence.Tuple` so the compound selections, in this case, are interpreted to be the tuple elements. +The difference here is that the type of the `jakarta.persistence.criteria.CriteriaQuery` was defined as `jakarta.persistence.Tuple` so the compound selections, in this case, are interpreted to be the tuple elements. -The javax.persistence.Tuple contract provides three forms of access to the underlying elements: +The jakarta.persistence.Tuple contract provides three forms of access to the underlying elements: typed:: The <> example illustrates this form of access in the `tuple.get( idPath )` and `tuple.get( nickNamePath )` calls. - This allows typed access to the underlying tuple values based on the `javax.persistence.TupleElement` expressions used to build the criteria. + This allows typed access to the underlying tuple values based on the `jakarta.persistence.TupleElement` expressions used to build the criteria. positional:: Allows access to the underlying tuple values based on the position. The simple _Object get(int position)_ form is very similar to the access illustrated in <> and <>. @@ -185,7 +185,7 @@ positional:: aliased:: Allows access to the underlying tuple values based on (optionally) assigned alias. The example query did not apply an alias. - An alias would be applied via the alias method on `javax.persistence.criteria.Selection`. + An alias would be applied via the alias method on `jakarta.persistence.criteria.Selection`. Just like `positional` access, there is both a typed (__Object get(String alias)__) and an untyped (__ X get(String alias, Class type)__) form. [[criteria-from]] @@ -200,14 +200,14 @@ The root objects of the query are entities, from which the other types are reach [NOTE] ==== -All the individual parts of the FROM clause (roots, joins, paths) implement the `javax.persistence.criteria.From` interface. +All the individual parts of the FROM clause (roots, joins, paths) implement the `jakarta.persistence.criteria.From` interface. ==== [[criteria-from-root]] === Roots Roots define the basis from which all joins, paths and attributes are available in the query. -A root is always an entity type. Roots are defined and added to the criteria by the overloaded __from__ methods on `javax.persistence.criteria.CriteriaQuery`: +A root is always an entity type. Roots are defined and added to the criteria by the overloaded __from__ methods on `jakarta.persistence.criteria.CriteriaQuery`: [[criteria-from-root-methods-example]] .Root methods @@ -244,8 +244,8 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-from-multiple-root-example] [[criteria-from-join]] === Joins -Joins allow navigation from other `javax.persistence.criteria.From` to either association or embedded attributes. -Joins are created by the numerous overloaded __join__ methods of the `javax.persistence.criteria.From` interface. +Joins allow navigation from other `jakarta.persistence.criteria.From` to either association or embedded attributes. +Joins are created by the numerous overloaded __join__ methods of the `jakarta.persistence.criteria.From` interface. [[criteria-from-join-example]] .Join example @@ -260,7 +260,7 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-from-join-example] === Fetches Just like in HQL and JPQL, criteria queries can specify that associated data be fetched along with the owner. -Fetches are created by the numerous overloaded __fetch__ methods of the `javax.persistence.criteria.From` interface. +Fetches are created by the numerous overloaded __fetch__ methods of the `jakarta.persistence.criteria.From` interface. [[criteria-from-fetch-example]] .Join fetch example @@ -274,7 +274,7 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-from-fetch-example] [NOTE] ==== Technically speaking, embedded attributes are always fetched with their owner. -However, in order to define the fetching of _Phone#addresses_ we needed a `javax.persistence.criteria.Fetch` because element collections are `LAZY` by default. +However, in order to define the fetching of _Phone#addresses_ we needed a `jakarta.persistence.criteria.Fetch` because element collections are `LAZY` by default. ==== [[criteria-path]] @@ -297,8 +297,8 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-param-example] ---- ==== -Use the parameter method of `javax.persistence.criteria.CriteriaBuilder` to obtain a parameter reference. -Then use the parameter reference to bind the parameter value to the `javax.persistence.Query`. +Use the parameter method of `jakarta.persistence.criteria.CriteriaBuilder` to obtain a parameter reference. +Then use the parameter reference to bind the parameter value to the `jakarta.persistence.Query`. [[criteria-group-by]] === Using group by diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc index 6e116c133c..dcce557ece 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc @@ -46,14 +46,14 @@ include::{modeldir}/WireTransferPayment.java[tags=hql-examples-domain-model-exam When using Hibernate, you can execute entity queries either via JPA or the Hibernate-specific API. Since 5.2, the Hibernate `Session` interface extends the JPA `EntityManager` interface. -For this reason, the query API was also merged, and now the Hibernate `org.hibernate.query.Query` interface extends the JPA `javax.persistence.Query`. +For this reason, the query API was also merged, and now the Hibernate `org.hibernate.query.Query` interface extends the JPA `jakarta.persistence.Query`. Next, we are going to see how the query API differs between the standard JPA interfaces and the Hibernate-specific API. [[jpql-api]] ==== JPA Query API -In JPA, the query is represented by `javax.persistence.Query` or `javax.persistence.TypedQuery` as obtained from the `EntityManager`. +In JPA, the query is represented by `jakarta.persistence.Query` or `jakarta.persistence.TypedQuery` as obtained from the `EntityManager`. The create an inline `Query` or `TypedQuery`, you need to use the `EntityManager#createQuery` method. For named queries, the `EntityManager#createNamedQuery` method is needed. @@ -109,13 +109,13 @@ Many of the settings controlling the execution of the query are defined as hints JPA defines some standard hints (like timeout in the example), but most are provider specific. Relying on provider specific hints limits your applications portability to some degree. -`javax.persistence.query.timeout`:: +`jakarta.persistence.query.timeout`:: Defines the query timeout, in milliseconds. -`javax.persistence.fetchgraph`:: +`jakarta.persistence.fetchgraph`:: Defines a _fetchgraph_ EntityGraph. Attributes explicitly specified as `AttributeNodes` are treated as `FetchType.EAGER` (via join fetch or subsequent select). For details, see the EntityGraph discussions in <>. -`javax.persistence.loadgraph`:: +`jakarta.persistence.loadgraph`:: Defines a _loadgraph_ EntityGraph. Attributes explicitly specified as AttributeNodes are treated as `FetchType.EAGER` (via join fetch or subsequent select). Attributes that are not specified are treated as `FetchType.LAZY` or `FetchType.EAGER` depending on the attribute's definition in metadata. @@ -131,7 +131,7 @@ Relying on provider specific hints limits your applications portability to some `org.hibernate.fetchSize`:: Defines the JDBC fetch-size to use. See `org.hibernate.query.Query#setFetchSize`. `org.hibernate.flushMode`:: - Defines the Hibernate-specific `FlushMode` to use. See `org.hibernate.query.Query#setFlushMode.` If possible, prefer using `javax.persistence.Query#setFlushMode` instead. + Defines the Hibernate-specific `FlushMode` to use. See `org.hibernate.query.Query#setFlushMode.` If possible, prefer using `jakarta.persistence.Query#setFlushMode` instead. `org.hibernate.readOnly`:: Defines that entities and collections loaded by this query should be marked as read-only. See `org.hibernate.query.Query#setReadOnly`. The final thing that needs to happen before the query can be executed is to bind the values for any defined parameters. @@ -542,7 +542,7 @@ Versioned updates is a Hibernate-specific feature and will not work in a portabl Custom version types, `org.hibernate.usertype.UserVersionType`, are not allowed in conjunction with an `update versioned` statement. ==== -An `UPDATE` statement is executed using the `executeUpdate()` of either `org.hibernate.query.Query` or `javax.persistence.Query`. +An `UPDATE` statement is executed using the `executeUpdate()` of either `org.hibernate.query.Query` or `jakarta.persistence.Query`. The method is named for those familiar with the JDBC `executeUpdate()` on `java.sql.PreparedStatement`. The `int` value returned by the `executeUpdate()` method indicates the number of entities affected by the operation. @@ -582,7 +582,7 @@ include::{extrasdir}/statement_delete_bnf.txt[] ---- ==== -A `DELETE` statement is also executed using the `executeUpdate()` method of either `org.hibernate.query.Query` or `javax.persistence.Query`. +A `DELETE` statement is also executed using the `executeUpdate()` method of either `org.hibernate.query.Query` or `jakarta.persistence.Query`. [[hql-insert]] === Insert statements @@ -975,7 +975,7 @@ VALUE:: Useful to explicitly show intent. Valid for any type of collection-valued reference. INDEX:: - According to HQL rules, this is valid for both `Maps` and `Lists` which specify a `javax.persistence.OrderColumn` annotation to refer to the `Map` key or the `List` position (aka the `OrderColumn` value). + According to HQL rules, this is valid for both `Maps` and `Lists` which specify a `jakarta.persistence.OrderColumn` annotation to refer to the `Map` key or the `List` position (aka the `OrderColumn` value). JPQL however, reserves this for use in the `List` case and adds `KEY` for the `Map` case. Applications interested in JPA provider portability should be aware of this distinction. KEY:: diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc index b80324f96a..034937310e 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc @@ -272,7 +272,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-multi-entity-query-alias-ex [NOTE] ==== -There's no such equivalent in JPA because the `javax.persistence.Query` interface does not define an `addEntity` method equivalent. +There's no such equivalent in JPA because the `jakarta.persistence.Query` interface does not define an `addEntity` method equivalent. ==== The `{pr.*}` and `{pt.*}` notation used above is shorthand for "all properties". @@ -337,7 +337,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-dto-query-example, indent=0 [NOTE] ==== -There's no such equivalent in JPA because the `javax.persistence.Query` interface does not define a `setResultTransformer` method equivalent. +There's no such equivalent in JPA because the `jakarta.persistence.Query` interface does not define a `setResultTransformer` method equivalent. ==== The above query will return a list of `PersonSummaryDTO` which has been instantiated and injected the values of `id` and `name` into its corresponding properties or fields. @@ -358,7 +358,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-inheritance-query-example] [NOTE] ==== -There's no such equivalent in JPA because the `javax.persistence.Query` interface does not define an `addEntity` method equivalent. +There's no such equivalent in JPA because the `jakarta.persistence.Query` interface does not define an `addEntity` method equivalent. ==== [[sql-query-parameters]] @@ -390,7 +390,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-query-parameters-example] Named SQL queries can also be defined during mapping and called in exactly the same way as a named HQL query. In this case, you do _not_ need to call `addEntity()` anymore. -JPA defines the `javax.persistence.NamedNativeQuery` annotation for this purpose, +JPA defines the `jakarta.persistence.NamedNativeQuery` annotation for this purpose, and the Hibernate `org.hibernate.annotations.NamedNativeQuery` annotation extends it and adds the following attributes: `flushMode()`:: diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Call.java b/documentation/src/main/java/org/hibernate/userguide/model/Call.java index 7b4fab994b..932138aefd 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Call.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Call.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.model; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java b/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java index 439ffdc54e..8d865fba85 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java @@ -6,7 +6,7 @@ */ package org.hibernate.userguide.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Image.java b/documentation/src/main/java/org/hibernate/userguide/model/Image.java index 6b565db013..f5a07a7690 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Image.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Image.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Partner.java b/documentation/src/main/java/org/hibernate/userguide/model/Partner.java index 7d515e6fbc..40ce8c606d 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Partner.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Partner.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.model; -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 Vlad Mihalcea @@ -46,4 +46,4 @@ public class Partner { } //tag::hql-examples-domain-model-example[] } -//end::hql-examples-domain-model-example[] \ No newline at end of file +//end::hql-examples-domain-model-example[] diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Payment.java b/documentation/src/main/java/org/hibernate/userguide/model/Payment.java index 81e4e9966e..d2ca0ceff0 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Payment.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Payment.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.model; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Person.java b/documentation/src/main/java/org/hibernate/userguide/model/Person.java index 0a236c51e1..ebe9888f7c 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Person.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Person.java @@ -11,33 +11,33 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.EnumType; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.ParameterMode; -import javax.persistence.QueryHint; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.EnumType; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Phone.java b/documentation/src/main/java/org/hibernate/userguide/model/Phone.java index 75a24c4c52..3844f85fb5 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Phone.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Phone.java @@ -11,24 +11,24 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyTemporal; -import javax.persistence.OneToMany; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.NamedNativeQueries; import org.hibernate.annotations.NamedNativeQuery; diff --git a/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java b/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java index 90529edcfe..8d99d0dfea 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java @@ -6,7 +6,7 @@ */ package org.hibernate.userguide.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/javadoc/overview.html b/documentation/src/main/javadoc/overview.html index dcd92f879a..0c3c8d7942 100644 --- a/documentation/src/main/javadoc/overview.html +++ b/documentation/src/main/javadoc/overview.html @@ -37,7 +37,7 @@ These interfaces are fully intended to be exposed to application code.

JPA

-The JPA interfaces are all defined by the JPA specification. For details see {@link javax.persistence}. +The JPA interfaces are all defined by the JPA specification. For details see {@link jakarta.persistence}. Not that since 5.2 Hibernate extends JPA (e.g. SessionFactory extends EntityManagerFactory) rather than wrapping it.

diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java index 60746b739e..fbcbe4c88a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java @@ -11,16 +11,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java index e3216fbba3..c9498ce021 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.associations; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java index 22e9224366..536278db32 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java index 514bda34fb..71a29a8f91 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java index 9c50991c20..3eafc82bf3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java index 878bdb5516..93eed47604 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.associations; import java.util.Objects; -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; import org.hibernate.annotations.JoinFormula; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java index 81fb51ead2..464bbc5c92 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java index 4f4d645945..63128f0b6c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java @@ -10,13 +10,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java index 99c5ba5c75..c8c71d374b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java index 93c98facf3..51ae543c39 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java index 004c51a5c6..ec20e51e57 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java @@ -1,13 +1,13 @@ package org.hibernate.userguide.associations; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -159,4 +159,4 @@ public class NotFoundTest extends BaseEntityManagerFunctionalTestCase { //tag::associations-not-found-domain-model-example[] } //end::associations-not-found-domain-model-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java index 2bd1ad8123..a4bca59571 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java index 7e94064210..d59d2d4f0e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java index fcdd772253..9e33a15c4d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java index bb6a4ba800..1004fd6564 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; @@ -71,7 +71,7 @@ public class OneToOneBidirectionalTest extends BaseEntityManagerFunctionalTestCa entityManager.flush(); entityManager.clear(); - //throws javax.persistence.PersistenceException: org.hibernate.HibernateException: More than one row with the given identifier was found: 1 + //throws jakarta.persistence.PersistenceException: org.hibernate.HibernateException: More than one row with the given identifier was found: 1 phone = entityManager.find( Phone.class, phone.getId() ); //end::associations-one-to-one-bidirectional-constraint-example[] phone.getDetails().getProvider(); diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java index 8b7003a22a..ac2a4195af 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java index f28a1100b8..859c4fb928 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java index b596d540da..8b774b0966 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java index 401423e394..54068aeedc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java index e251a73c88..4d28f57a04 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.associations.any; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; //tag::associations-any-property-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java index d3ffc1f72e..0646513298 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations.any; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Any; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java index 1c16c7c550..762d52a5f9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations.any; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ManyToAny; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java index d2d68c471c..35458e56f2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.associations.any; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; //tag::associations-any-property-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java b/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java index 86de9f8cfd..0bec711325 100644 --- a/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.batch; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.CacheMode; import org.hibernate.ScrollMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java index b6fc2cf11c..a2c4b7afc1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java @@ -14,20 +14,20 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import javax.persistence.AttributeConverter; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.Persistence; -import javax.persistence.PersistenceContext; -import javax.persistence.PersistenceProperty; -import javax.persistence.PersistenceUnit; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.PersistenceProperty; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.EmptyInterceptor; @@ -336,7 +336,7 @@ public class BootstrapTest { } //tag::bootstrap-event-listener-registration-example[] - public class MyIntegrator implements org.hibernate.integrator.spi.Integrator { + public class MyIntegrator implements Integrator { @Override public void integrate( diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java index 32d5182b2f..c04cb2255a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java @@ -8,18 +8,17 @@ package org.hibernate.userguide.caching; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; import org.hibernate.Session; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -30,16 +29,7 @@ public class FirstLevelCacheTest extends BaseEntityManagerFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] { - Person.class - }; - } - - @Override - @SuppressWarnings( "unchecked" ) - protected void addConfigOptions(Map options) { - options.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, Boolean.TRUE.toString() ); - options.put( AvailableSettings.CACHE_REGION_FACTORY, "jcache" ); + return new Class[] { Person.class }; } @Test diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java index 91f3398326..48e5f73ca7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java @@ -9,25 +9,23 @@ package org.hibernate.userguide.caching; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.cache.configuration.MutableConfiguration; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.cache.jcache.JCacheHelper; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.testing.FailureExpected; import org.junit.Test; -import org.jboss.logging.Logger; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -35,22 +33,23 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** * @author Vlad Mihalcea */ +@FailureExpected( jiraKey = "", message = "Relies on hibernate-jcache + JCache + Ehcache - Ehcache uses JAXB and has not been updated to use Jakarta" ) public class NonStrictReadWriteCacheTest extends BaseEntityManagerFunctionalTestCase { @Override public void buildEntityManagerFactory() { - JCacheHelper.locateStandardCacheManager().createCache( - "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person", - new MutableConfiguration<>() - ); - JCacheHelper.locateStandardCacheManager().createCache( - "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Phone", - new MutableConfiguration<>() - ); - JCacheHelper.locateStandardCacheManager().createCache( - "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person.phones", - new MutableConfiguration<>() - ); +// JCacheHelper.locateStandardCacheManager().createCache( +// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person", +// new MutableConfiguration<>() +// ); +// JCacheHelper.locateStandardCacheManager().createCache( +// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Phone", +// new MutableConfiguration<>() +// ); +// JCacheHelper.locateStandardCacheManager().createCache( +// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person.phones", +// new MutableConfiguration<>() +// ); super.buildEntityManagerFactory(); } diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java index a5602e7ff9..b76302f6b4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java @@ -9,14 +9,14 @@ package org.hibernate.userguide.caching; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.CacheMode; import org.hibernate.Session; @@ -162,7 +162,7 @@ public class SecondLevelCacheTest extends BaseEntityManagerFunctionalTestCase { .setParameter( "id", 0L) .setHint( QueryHints.HINT_CACHEABLE, "true") .setHint( QueryHints.HINT_CACHE_REGION, "query.cache.person" ) - .setHint( "javax.persistence.cache.storeMode", CacheStoreMode.REFRESH ) + .setHint( "jakarta.persistence.cache.storeMode", CacheStoreMode.REFRESH ) .getResultList(); //end::caching-query-region-store-mode-jpa-example[] }); @@ -206,8 +206,8 @@ public class SecondLevelCacheTest extends BaseEntityManagerFunctionalTestCase { doInJPA( this::entityManagerFactory, entityManager -> { //tag::caching-management-cache-mode-entity-jpa-example[] Map hints = new HashMap<>( ); - hints.put( "javax.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ); - hints.put( "javax.persistence.cache.storeMode" , CacheStoreMode.REFRESH ); + hints.put( "jakarta.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ); + hints.put( "jakarta.persistence.cache.storeMode" , CacheStoreMode.REFRESH ); Person person = entityManager.find( Person.class, 1L , hints); //end::caching-management-cache-mode-entity-jpa-example[] }); @@ -225,8 +225,8 @@ public class SecondLevelCacheTest extends BaseEntityManagerFunctionalTestCase { List persons = entityManager.createQuery( "select p from Person p", Person.class) .setHint( QueryHints.HINT_CACHEABLE, "true") - .setHint( "javax.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ) - .setHint( "javax.persistence.cache.storeMode" , CacheStoreMode.REFRESH ) + .setHint( "jakarta.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ) + .setHint( "jakarta.persistence.cache.storeMode" , CacheStoreMode.REFRESH ) .getResultList(); //end::caching-management-cache-mode-query-jpa-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java index fad6eb82ab..7e6334aaf1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.collections; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java index edf53fcb33..30c2504155 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java @@ -8,8 +8,8 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.cfg.Configuration; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java index f432646cac..7b83b5dd78 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java index 3d3642d3fa..50c336ce4f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java index 10f4363d29..19a11ecec3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java index 6b407f7c4a..2b349977e2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java index d79517a265..d811817d85 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java @@ -11,12 +11,12 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortComparator; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java index a9739f5007..2c58c2116d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java @@ -11,15 +11,15 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java index 118d568a93..1fde022eda 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java index f280238eb8..27ccdd778a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java index 171a3bd5f4..507cdd0411 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.collections; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java index 8d84af98ac..303c98009e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java @@ -10,12 +10,12 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortNatural; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java index a1a4d272ca..805f57fbfa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java @@ -9,15 +9,15 @@ package org.hibernate.userguide.collections; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java index 128fd2f537..4026353ee9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java index ad718cb4e5..e60536c504 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java @@ -9,16 +9,16 @@ package org.hibernate.userguide.collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyClass; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java index 67c80a2e4b..312d44ea45 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java @@ -12,15 +12,15 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.MapKeyType; import org.hibernate.annotations.Type; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java index 71db2b6256..eec8ecf714 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.ListIndexBase; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java index cd641a8249..3bda5525f2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java index 6df6e46e2d..46c7700284 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java @@ -10,11 +10,11 @@ import java.util.Collection; import java.util.LinkedList; import java.util.Objects; import java.util.Queue; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.CollectionType; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java index 4cea556997..b058a3a5e4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java index c91d76b7b4..e3ec4dca52 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java @@ -11,11 +11,11 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortComparator; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java index 26bd94c90a..4f52eb0181 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java @@ -11,17 +11,17 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKey; -import javax.persistence.MapKeyTemporal; -import javax.persistence.OneToMany; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java index 83487414ef..fc0ce302a5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java index 0aaf90a899..345100b585 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java index 2f16438f95..f6321356fe 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java @@ -9,11 +9,11 @@ package org.hibernate.userguide.collections; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java index f330b31d0d..5e958c8a58 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java @@ -10,11 +10,11 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortNatural; diff --git a/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java b/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java index ce5a24d479..3c30b04d3e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java @@ -11,18 +11,18 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.AddressType; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java index 43ac06a8d5..61e74d84ba 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java index c9d16d1717..9fee481233 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java index 2f94703a7d..dcd4bfc667 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.envers; import java.util.Arrays; import java.util.Date; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.cfg.AvailableSettings; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java index 08a1d19ec3..0fdac08d41 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java @@ -12,16 +12,16 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.cfg.AvailableSettings; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java index c902edc61d..01f2df6faf 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java @@ -12,17 +12,17 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.cfg.AvailableSettings; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java index c690dd95ec..eb601c13de 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java index 0d43d35a4f..2d4af319e2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java @@ -9,14 +9,14 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.dialect.HSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java index ba6903ab1d..652fd4bfd6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java @@ -12,14 +12,14 @@ import java.time.ZoneOffset; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java index 886d092bc4..0d19bbb83d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java index 468a66b792..5461331fc5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java b/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java index 213fb02685..a71a2e44ad 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java @@ -1,7 +1,7 @@ package org.hibernate.userguide.events; import java.sql.Timestamp; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java index f74570f01c..32902e89fb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.events; -import javax.persistence.Entity; -import javax.persistence.ExcludeDefaultListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java b/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java index 478c1d59f5..8e75804efb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.events; import java.io.Serializable; import java.util.Arrays; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java index 543eb5824d..e220cb17f3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java @@ -14,15 +14,15 @@ import java.time.ZoneOffset; import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; import org.hibernate.HibernateException; import org.hibernate.boot.Metadata; @@ -182,7 +182,7 @@ public class ListenerTest extends BaseEntityManagerFunctionalTestCase { //tag::events-interceptors-example[] public static class SecuredLoadEntityListener implements LoadEventListener { // this is the single method defined by the LoadEventListener interface - public void onLoad(LoadEvent event, LoadEventListener.LoadType loadType) + public void onLoad(LoadEvent event, LoadType loadType) throws HibernateException { if ( !Principal.isAuthorized( event.getEntityClassName(), event.getEntityId() ) ) { throw new SecurityException( "Unauthorized access" ); diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java index 1c28ac607f..2b748dd85c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java index e464f8150e..506ed51b05 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.fetching; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java index a0ebffc424..24ea43f401 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java index e2172177c3..2d8a4e591b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java index ffa08e9764..7c103452d9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java index 2dbec1f5b6..b6f50536c7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java @@ -8,17 +8,17 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.annotations.ColumnTransformer; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java index 1fe3b15f88..e07d98e8aa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java @@ -9,17 +9,17 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedSubgraph; -import javax.persistence.OneToMany; -import javax.persistence.QueryHint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedSubgraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.QueryHint; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.annotations.NaturalId; @@ -89,7 +89,7 @@ public class GraphFetchingTest extends BaseEntityManagerFunctionalTestCase { Employee.class, userId, Collections.singletonMap( - "javax.persistence.fetchgraph", + "jakarta.persistence.fetchgraph", entityManager.getEntityGraph( "employee.projects" ) ) ); @@ -103,7 +103,7 @@ public class GraphFetchingTest extends BaseEntityManagerFunctionalTestCase { Project.class, 1L, Collections.singletonMap( - "javax.persistence.fetchgraph", + "jakarta.persistence.fetchgraph", entityManager.getEntityGraph( "project.employees" ) ) ); diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java index 32328d7fae..62a7ba0138 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java @@ -4,16 +4,16 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.util.Collections; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.TypedQuery; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.TypedQuery; import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.entitygraph.parser.AbstractEntityGraphTest; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java index e129428979..13a577887c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java index 299927b757..c739cdcee8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Session; import org.hibernate.annotations.ColumnTransformer; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java index d3814f17bc..6e40236def 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.flush; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java index 649d7aed4c..867221b013 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.flush; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java index a1ea96bc8a..6222509b38 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java @@ -8,14 +8,14 @@ package org.hibernate.userguide.flush; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java index d124ece225..6e73af07a9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.flush; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java index 610bf6d96f..997a9f07e2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.flush; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java index 0eba25231f..f9a4fca7d3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.flush; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java index fa572c4ec6..2838cfc57c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java @@ -16,10 +16,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.FlushModeType; -import javax.persistence.Query; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; import org.hibernate.CacheMode; import org.hibernate.ScrollableResults; @@ -607,7 +607,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase { "from Person p " + "where p.name like :name" ) // timeout - in milliseconds - .setHint( "javax.persistence.query.timeout", 2000 ) + .setHint( "jakarta.persistence.query.timeout", 2000 ) // flush only at commit time .setFlushMode( FlushModeType.COMMIT ); //end::jpql-api-basic-usage-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java index 5dc9901513..32f8f14af3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.hql; import java.sql.Statement; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; import org.hibernate.Session; import org.hibernate.boot.spi.MetadataBuilderContributor; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java index a88d97dddf..1427f5c827 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java @@ -8,8 +8,8 @@ package org.hibernate.userguide.hql; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java index fdbd5f362a..723b8ccad6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java @@ -9,15 +9,15 @@ package org.hibernate.userguide.hql; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.QueryHints; diff --git a/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java b/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java index a4cb609d11..a2af3e78c3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.immutability; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Immutable; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java b/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java index 81dea2f205..92cf524d21 100644 --- a/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.immutability; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java index 16a503ef57..aa03147442 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java @@ -11,11 +11,11 @@ import java.sql.Statement; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java index a876946b11..2d5ef9715e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java @@ -11,11 +11,11 @@ import java.sql.Statement; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.Session; import org.hibernate.annotations.DiscriminatorOptions; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java index bfe845bd75..96c3edc9fb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java index 9442c377f7..db590bfe35 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java index 1ddbf7f551..4a318104b1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java index ec59c3bc2d..ae3e745422 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.DiscriminatorFormula; import org.hibernate.dialect.PostgreSQL81Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java index fc0316edfc..2123e7bb78 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java index 2db426456c..640fec270d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java index 6717a1baa7..bf1f985742 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.inheritance.polymorphism; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.Polymorphism; import org.hibernate.annotations.PolymorphismType; diff --git a/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java b/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java index b91d472f85..b17ff34d5c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.jmx; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java index 763b6252b3..05e8cf9a78 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java @@ -9,16 +9,16 @@ package org.hibernate.userguide.locking; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockScope; import org.hibernate.LockMode; import org.hibernate.LockOptions; @@ -60,7 +60,7 @@ public class ExplicitLockingTest extends BaseEntityManagerFunctionalTestCase { //tag::locking-jpa-query-hints-timeout-example[] entityManager.find( Person.class, id, LockModeType.PESSIMISTIC_WRITE, - Collections.singletonMap( "javax.persistence.lock.timeout", 200 ) + Collections.singletonMap( "jakarta.persistence.lock.timeout", 200 ) ); //end::locking-jpa-query-hints-timeout-example[] } ); @@ -84,7 +84,7 @@ public class ExplicitLockingTest extends BaseEntityManagerFunctionalTestCase { Person person = entityManager.find( Person.class, id, LockModeType.PESSIMISTIC_WRITE, Collections.singletonMap( - "javax.persistence.lock.scope", + "jakarta.persistence.lock.scope", PessimisticLockScope.EXTENDED ) ); //end::locking-jpa-query-hints-scope-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java index 325b90dd2e..b9d1804ea9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.locking; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.OptimisticLock; import org.hibernate.dialect.CockroachDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java index 3fdeb88e7c..a12adb3474 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.OptimisticLockType; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java index 1d48c2cc72..d552e573b8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.OptimisticLockType; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java index f28a1ac45d..3e3e134db2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; import java.time.Instant; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java index a4edb3cbdb..67ccd57226 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.locking; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java index 5a1e31d322..593fa1626c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java index 3b37e4601b..fdbfca7869 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.locking; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.Source; import org.hibernate.annotations.SourceType; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java index 1368870be3..7dd4b87bd6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java @@ -8,15 +8,15 @@ package org.hibernate.userguide.mapping.access; import java.util.ArrayList; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java index 7fbc929961..086956ef58 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java index b85c952489..ff52a63f35 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java index 844bddf965..19f375ffcf 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java index 0a5a752127..34672b9897 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java index 4f26234c4e..4e62727c7b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.basic; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java index 67cc88c232..6671adbe5b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.math.BigDecimal; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java index ec0d1d0ee2..65ac54aa64 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.math.BigInteger; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java index b42dfbbb13..1e1e44dfec 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.MappingMetamodel; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java index 838616d189..7ab90e3dec 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.MappingMetamodel; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java index e2a8b7ee97..c7636a1109 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JavaTypeRegistration; import org.hibernate.metamodel.mapping.SingularAttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java index ef72745481..04c3544756 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JavaType; import org.hibernate.metamodel.mapping.SingularAttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java index 470187d4d7..0dfbf41964 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.engine.spi.SessionFactoryImplementor; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; /** - * Tests for {@link org.hibernate.annotations.JdbcTypeCode} + * Tests for {@link JdbcTypeCode} * * @author Steve Ebersole */ diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java index fac56f3f25..448cf73490 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.annotations.JdbcTypeRegistration; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java index 9975436c11..0272f5e255 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JdbcType; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java index 8b5b19cfce..15b57d34fd 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.TypeDef; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java index baa87e38aa..4b683deca7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.cfg.Configuration; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java index 91c7d25e35..4ad724b674 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java @@ -7,13 +7,13 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; import org.hibernate.annotations.Type; import org.hibernate.cfg.Configuration; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java index d8d390838e..2044af9d0f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java index 834ebb5128..d979ea8901 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java @@ -11,9 +11,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.sql.Blob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.Session; import org.hibernate.engine.jdbc.BlobProxy; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java index e06ce795d8..b0e7dd2e7e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Basic; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java index f0caf607e0..9ed57fae15 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java index fd34ac35db..6b4ca3a28e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.AttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java index 1c160b34c8..b5e795193a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Calendar; import java.util.GregorianCalendar; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java index 49d5c96f28..50388164de 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.metamodel.MappingMetamodel; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java index 5245582dab..20c95896a5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java index 9f554c32a1..c588baf087 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java index d4069289b9..3493dd344a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.ZoneOffset; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java index 75ccb31976..d2d39fe517 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java index 5df1221983..724f4b7409 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java index 503413c636..38215aaa21 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java @@ -11,9 +11,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Reader; import java.sql.Clob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.Session; import org.hibernate.engine.jdbc.ClobProxy; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java index 2f9d044f12..79fdc4eb37 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java @@ -9,8 +9,8 @@ package org.hibernate.userguide.mapping.basic; import java.math.BigDecimal; import java.util.Currency; import java.util.Locale; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java index f286161ee7..8963e4b533 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.Currency; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java index f38223d48c..20c0272017 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Instant; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; @@ -45,7 +45,7 @@ public class DatePrecisionTests { final JdbcMapping jdbcMapping = attribute.getJdbcMapping(); final TemporalJavaTypeDescriptor jtd = (TemporalJavaTypeDescriptor) jdbcMapping.getJavaTypeDescriptor(); assertThat( jtd, is( attribute.getJavaTypeDescriptor() ) ); - assertThat( jtd.getJavaTypeClass(), equalTo( java.util.Date.class ) ); + assertThat( jtd.getJavaTypeClass(), equalTo( Date.class ) ); assertThat( jtd.getPrecision(), equalTo( TemporalType.TIMESTAMP ) ); assertThat( jdbcMapping.getJdbcTypeDescriptor().getJdbcTypeCode(), equalTo( Types.TIMESTAMP ) ); } @@ -55,7 +55,7 @@ public class DatePrecisionTests { final JdbcMapping jdbcMapping = attribute.getJdbcMapping(); final TemporalJavaTypeDescriptor jtd = (TemporalJavaTypeDescriptor) jdbcMapping.getJavaTypeDescriptor(); assertThat( jtd, is( attribute.getJavaTypeDescriptor() ) ); - assertThat( jtd.getJavaTypeClass(), equalTo( java.util.Date.class ) ); + assertThat( jtd.getJavaTypeClass(), equalTo( Date.class ) ); assertThat( jtd.getPrecision(), equalTo( TemporalType.DATE ) ); assertThat( jdbcMapping.getJdbcTypeDescriptor().getJdbcTypeCode(), equalTo( Types.DATE ) ); } @@ -65,7 +65,7 @@ public class DatePrecisionTests { final JdbcMapping jdbcMapping = attribute.getJdbcMapping(); final TemporalJavaTypeDescriptor jtd = (TemporalJavaTypeDescriptor) jdbcMapping.getJavaTypeDescriptor(); assertThat( jtd, is( attribute.getJavaTypeDescriptor() ) ); - assertThat( jtd.getJavaTypeClass(), equalTo( java.util.Date.class ) ); + assertThat( jtd.getJavaTypeClass(), equalTo( Date.class ) ); assertThat( jtd.getPrecision(), equalTo( TemporalType.TIME ) ); assertThat( jdbcMapping.getJdbcTypeDescriptor().getJdbcTypeCode(), equalTo( Types.TIME ) ); } diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java index 369220cf62..1a6907bb75 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java index eac212fbd5..1ebb189d2f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.SybaseDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java index 25b09eda72..7ba7462dd7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java index 7558400b27..70b71ab2a3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java index c84792eabc..7383aed50a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Duration; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.AttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java index 9dddf80076..d4572ff6e3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java index 186294850f..8a58bac9a6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java index 6e4e3dba49..a4ab4e42b7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java index 2f08e3906d..f1e2fed532 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java index 16f6c74b8d..4f2837e976 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java index 73d9cec584..a23629592c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java index e6eaa1f0f9..2d01dede14 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Formula; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java index 71fdfb310b..3407ed3bf5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java index c44f13443b..5d0170466b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.basic; import java.time.Instant; import java.time.format.DateTimeFormatter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java index bf218da83a..b153acbc74 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Duration; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java index 6dd1201386..23ff590588 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java index c038c9e491..c13ae636cc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java index 8ecc9ede73..d53a082d80 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Instant; import java.time.LocalDate; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java index e712cf5875..930ccd1f76 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.LocalDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java index e4ad710ffc..1aa5bcee1d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java index 0c3f0ae244..27f7981e84 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.LocalTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java index efd1ccee0d..7d0657f495 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.Currency; import java.util.Locale; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java index f56179c106..d0c581491a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java index 56e99942a5..c547bc8585 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java index 6514f7257b..c83326e25e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java index 7e7af93f8b..8e2f511560 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java @@ -11,9 +11,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Reader; import java.sql.NClob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.engine.jdbc.NClobProxy; @@ -134,4 +134,4 @@ public class NClobTest { //tag::basic-nclob-example[] } //end::basic-nclob-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java index 2817452f24..180d4c052a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Nationalized; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java index 8d4c0349c9..cb347773b1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.LocalTime; import java.time.OffsetDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java index 00de59b7ca..fa8fc30e34 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.OffsetDateTime; import java.time.OffsetTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java index 6a9b25b800..8f883f1a4e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Parent; import org.hibernate.annotations.Target; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java index f3a7d3bd5a..4053fe3e93 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.PhoneType; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java index 684cdc51c2..8b0363ea1e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.PhoneType; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java index 72d016adcd..0d2e82aeb3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java index 9afb41d4f6..dd629846c7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java index d21975502f..3bae678f94 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java index b07a0cdd9b..1065ce554e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java index 3328405b99..8f8da72874 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Subselect; import org.hibernate.annotations.Synchronize; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java index 1d7ac4538b..0db63286ed 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Target; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java index cb2376f283..788dcccfb3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java @@ -10,9 +10,9 @@ import java.sql.Types; import java.time.Duration; import java.time.ZoneId; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java index 7ec10e9e01..2195b29371 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.net.URL; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java index 2149e263fe..7aea3e2c66 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.ZoneOffset; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java index 94aae30247..1474ebc080 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.OffsetDateTime; import java.time.ZonedDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java index 6fc5389b29..c3c54fa2c9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.mapping.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java index 8abecb90f5..83553ac241 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.converter; import java.time.Period; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java index ac94713d78..5f08d3260c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.mapping.converter; import java.time.Period; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java index 1f1d8b0b61..b9f61de26e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.userguide.mapping.converter.hbm; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; //tag::basic-hbm-attribute-converter-mapping-moneyconverter-example[] public class MoneyConverter diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java b/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java index 54d1fc1312..a26b71ebc0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java @@ -1,8 +1,8 @@ package org.hibernate.userguide.mapping.dynamic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; //tag::access-field-mapping-example[] @Entity(name = "Book") diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java index c6dc6f87f0..a163e5efbb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.boot.MetadataBuilder; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java index 48cb1d2a6c..7a28104415 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java @@ -6,18 +6,18 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java index 53ac2616d0..106e0760b3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java index 77de0baba5..193a175be3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Parent; import org.hibernate.annotations.Target; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java index 39890360e9..d889a8855e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java index 6ae683fde5..06f892707d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java index 9ca7553af4..9852f77327 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Target; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java index ac684c98d3..26417c1f0a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.generated; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java index eaecbb921f..2b810c36c4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.generated; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.ValueGenerationType; import org.hibernate.dialect.SybaseDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java index 2e87e64a3a..3763fe1cfc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.generated; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java index 96777649b0..3bf885d37e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.generated; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.GenerationTime; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java index 7457a51373..984d96c4ab 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.generated; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.ValueGenerationType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java index 4f6664c35e..bdea5fd8e8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.generated; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.UpdateTimestamp; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java index a15fb3e2a4..96b772e6b2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java index b6a98220d7..6031aa035f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java index d5dc09344c..09e7f467b6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java @@ -7,34 +7,34 @@ package org.hibernate.userguide.mapping.identifier; import java.util.Map; -import javax.cache.configuration.MutableConfiguration; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; -import org.hibernate.cache.jcache.JCacheHelper; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.testing.FailureExpected; import org.junit.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ +@FailureExpected( jiraKey = "", message = "Relies on hibernate-jcache + JCache + Ehcache - Ehcache uses JAXB and has not been updated to use Jakarta" ) public class CacheableNaturalIdTest extends BaseEntityManagerFunctionalTestCase { @Override public void buildEntityManagerFactory() { - JCacheHelper.locateStandardCacheManager().createCache( "default-update-timestamps-region", new MutableConfiguration<>() ); - JCacheHelper.locateStandardCacheManager().createCache( "default-query-results-region", new MutableConfiguration<>() ); - JCacheHelper.locateStandardCacheManager().createCache( "org.hibernate.userguide.mapping.identifier.CacheableNaturalIdTest$Book##NaturalId", new MutableConfiguration<>() ); -// JCacheHelper.locateStandardCacheManager().createCache( "", new MutableConfiguration<>() ); +// JCacheHelper.locateStandardCacheManager().createCache( "default-update-timestamps-region", new MutableConfiguration<>() ); +// JCacheHelper.locateStandardCacheManager().createCache( "default-query-results-region", new MutableConfiguration<>() ); +// JCacheHelper.locateStandardCacheManager().createCache( "org.hibernate.userguide.mapping.identifier.CacheableNaturalIdTest$Book##NaturalId", new MutableConfiguration<>() ); +//// JCacheHelper.locateStandardCacheManager().createCache( "", new MutableConfiguration<>() ); super.buildEntityManagerFactory(); } diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java index d1a48f4603..6d97daf27b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java index 3d22e6493b..cd3d335088 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java index 718d0a1348..3ebf1be29f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java index 8b09f7ad00..05948b3013 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java index 9d57d68ab6..0dac13675b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java index 1b07bebcc1..0726addbb7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java index c839865d07..8cc46382ca 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java index ba38df119b..787e940d2b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java index 584e9ae5b2..93ccacfcad 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -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.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java index fc1f53c6e9..8ad3da3100 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java index c68bd26197..f92224d165 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java index 174e1be49d..4ba0aa3591 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java index 9b201eb31a..19a8e53f2f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.mapping.identifier; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java index a5644b6f58..ddbca05472 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.mapping.identifier; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java index dabd8ef18d..565640da08 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java index 350b0d7207..50c9c2e56c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Formula; import org.hibernate.annotations.RowId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java index 09a3debcfa..f202ffd248 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java index e62ba1a29f..acde5390e6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java index 3c4bc2dc32..ee14389f2d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java index 4baca1ee03..25e0edc793 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java index 2d6b5c874a..ca8d4aaf35 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.mapping.identifier; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -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.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java index cd49dc6752..f78e709d7c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java index e05b548f71..c2e7883aeb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java index d446fcf77d..8f058fe5e0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java index a5ad2b030e..c53f058f50 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.identifier; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java index 8463454259..5f1ad46303 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.identifier; import java.util.UUID; -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; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java index b6dd7ed465..9edda16317 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier.composite; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java index 18d8bcce27..19d523ecbb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java @@ -9,7 +9,7 @@ package org.hibernate.userguide.mapping.identifier.composite; import java.io.Serializable; import java.sql.Timestamp; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java b/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java index e86b5fe4be..5020b52f24 100644 --- a/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java @@ -13,8 +13,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.MultiTenancyStrategy; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java b/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java index db3e200795..e2ba0baab0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java @@ -17,9 +17,9 @@ import java.util.Map; import java.util.Properties; import java.util.TimeZone; import java.util.function.Consumer; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.MultiTenancyStrategy; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java b/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java index 3a9402df71..11e8d4fb2a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java +++ b/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java @@ -1,8 +1,8 @@ package org.hibernate.userguide.osgi.jpa; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -41,4 +41,4 @@ public class HibernateUtil { return emf; } } -//end::osgi-discover-EntityManagerFactory[] \ No newline at end of file +//end::osgi-discover-EntityManagerFactory[] diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java index e8f447acb7..168b06d9f8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java @@ -10,13 +10,13 @@ import java.sql.Blob; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java index 96780aaaae..95d705aaf2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java @@ -2,13 +2,13 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -146,4 +146,4 @@ public class CascadeOnDeleteCollectionTest extends BaseEntityManagerFunctionalTe //tag::pc-cascade-on-delete-collection-mapping-Phone-example[] } //end::pc-cascade-on-delete-collection-mapping-Phone-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java index d25836f399..6fc319ee1e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java @@ -1,11 +1,11 @@ package org.hibernate.userguide.pc; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -130,4 +130,4 @@ public class CascadeOnDeleteTest extends BaseEntityManagerFunctionalTestCase { //tag::pc-cascade-on-delete-mapping-Phone-example[] } //end::pc-cascade-on-delete-mapping-Phone-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java index 002ba26fc6..ce575a30f0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.pc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java index aad30a91be..919b28bf75 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java @@ -8,14 +8,14 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.Session; import org.hibernate.annotations.FilterDef; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java index 27271139e5..6c7066bc11 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java @@ -9,16 +9,16 @@ package org.hibernate.userguide.pc; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NoResultException; -import javax.persistence.OneToMany; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NoResultException; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Filter; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java index c13f2db15e..72ad7cfbda 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java @@ -8,17 +8,17 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NoResultException; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NoResultException; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Filter; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java index 6428c70411..7b737ec1ca 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.pc; import java.util.List; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.CacheMode; import org.hibernate.Session; @@ -44,8 +44,8 @@ public class MultiLoadIdTest extends BaseEntityManagerFunctionalTestCase { @Override protected void addMappings(Map settings) { - settings.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, true ); - settings.put( AvailableSettings.CACHE_REGION_FACTORY, "jcache" ); +// settings.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, true ); +// settings.put( AvailableSettings.CACHE_REGION_FACTORY, "jcache" ); settings.put( AvailableSettings.GENERATE_STATISTICS, Boolean.TRUE.toString() ); sqlStatementInterceptor = new SQLStatementInterceptor( settings ); } diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java index 0802b8d629..e8aa9155fa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.pc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java index 48908b4f63..98dd319628 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java @@ -10,15 +10,15 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityNotFoundException; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Persistence; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.PersistenceUtil; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.PersistenceUtil; import org.hibernate.Hibernate; import org.hibernate.LockMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/Person.java b/documentation/src/test/java/org/hibernate/userguide/pc/Person.java index 620af209a6..1fc93d7018 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/Person.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/Person.java @@ -2,10 +2,10 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java b/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java index 9208313a0c..74ee29fc84 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java @@ -1,10 +1,10 @@ package org.hibernate.userguide.pc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Vlad Mihalcea @@ -50,4 +50,4 @@ public class Phone { } //tag::pc-cascade-domain-model-example[] } -//end::pc-cascade-domain-model-example[] \ No newline at end of file +//end::pc-cascade-domain-model-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java index eec43345db..cad750a29e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java @@ -9,11 +9,11 @@ package org.hibernate.userguide.pc; import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.Session; import org.hibernate.annotations.WhereJoinTable; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java index c08a56470d..005a4ae87c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Where; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/persister/Author.java b/documentation/src/test/java/org/hibernate/userguide/persister/Author.java index 4dd34a7881..d51f11e94c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/persister/Author.java +++ b/documentation/src/test/java/org/hibernate/userguide/persister/Author.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.persister; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Persister; diff --git a/documentation/src/test/java/org/hibernate/userguide/persister/Book.java b/documentation/src/test/java/org/hibernate/userguide/persister/Book.java index a15925d927..de9bb04c28 100644 --- a/documentation/src/test/java/org/hibernate/userguide/persister/Book.java +++ b/documentation/src/test/java/org/hibernate/userguide/persister/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.persister; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Persister; diff --git a/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java b/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java index cdab9f7b26..689314bbe9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.proxy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Proxy; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java index 1af55e7528..500b3ce2b0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; import org.hibernate.annotations.Check; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java index 42aac6e834..3dc091660e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java index 2d21f5bafc..2c6e3def64 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java @@ -6,17 +6,17 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.exception.ConstraintViolationException; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java index dc0ecf863a..ef8bb757c0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java @@ -11,13 +11,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.NaturalId; @@ -51,7 +51,7 @@ public class SchemaGenerationTest extends BaseEntityManagerFunctionalTestCase { AvailableSettings.HBM2DDL_IMPORT_FILES, "schema-generation.sql" ); - settings.put( org.hibernate.cfg.AvailableSettings.HBM2DDL_AUTO, "update" ); + settings.put( AvailableSettings.HBM2DDL_AUTO, "update" ); } return settings; } diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java index ba6f042ff8..0f3cc95cc1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java b/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java index a48168b5a5..b9de461b58 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.userguide.sql; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard @@ -34,4 +34,4 @@ public class Captain { } //tag::sql-composite-key-entity-associations_named-query-example[] } -//end::sql-composite-key-entity-associations_named-query-example[] \ No newline at end of file +//end::sql-composite-key-entity-associations_named-query-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java index 0cdf7fbd4b..78c1180c64 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java @@ -10,12 +10,12 @@ import java.sql.Statement; import java.sql.Types; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java index c2af82b64d..3c9bdd17f3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java @@ -7,15 +7,15 @@ package org.hibernate.userguide.sql; import java.sql.Statement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java index 0da5d92979..e93bcf601d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.sql; import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java b/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java index e34918adf3..fd50e6c237 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.userguide.sql; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java b/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java index ea195067bc..94b437e464 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.userguide.sql; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java index f9a762fb7e..921452cce8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java @@ -10,8 +10,8 @@ import java.time.ZoneOffset; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.MySQL5Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java index fcc7213d7c..fca90ff534 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.sql; import java.sql.Statement; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java index cdee4b32b1..a3082e6f19 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java @@ -7,8 +7,8 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.Oracle8iDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java index 2c39857e11..f3ed763a49 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java b/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java index a9d22ff158..2cab480002 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java @@ -8,18 +8,18 @@ //$Id$ package org.hibernate.userguide.sql; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FetchType; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FetchType; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; /** * @author Emmanuel Bernard diff --git a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java index 6050861d55..07c39ba988 100644 --- a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.transactions; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java b/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java index 66e0aec1e8..b10942d37d 100644 --- a/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java +++ b/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.spatial.dialect.postgis.PostgisDialect; diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle index d10914f2d2..0fff558307 100644 --- a/gradle/java-module.gradle +++ b/gradle/java-module.gradle @@ -54,8 +54,29 @@ if ( !project.description ) { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Configurations and Dependencies -configurations.all*.exclude group: 'xml-apis', module: 'xml-apis' +configurations.all { + resolutionStrategy { + dependencySubstitution { + // will handle dependencies pulled in transitively + substitute module( 'javax.persistence:javax.persistence-api' ) with module( libraries.jakarta_jpa ) + substitute module( 'javax.transaction:jta' ) with module( libraries.jakarta_jta ) + substitute module( 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec' ) with module( libraries.jakarta_jta ) + substitute module( 'javax.validation:validation-api' ) with module( libraries.jakarta_validation ) + substitute module( 'javax.interceptor:javax.interceptor-api' ) with module( libraries.jakarta_interceptor ) + substitute module( 'javax.activation:javax.activation-api' ) with module( libraries.jakarta_activation ) + substitute module( 'javax.enterprise:cdi-api' ) with module( libraries.jakarta_cdi ) + substitute module( 'org.jboss.weld.se:weld-se-shaded' ) with module( libraries.jakarta_weld ) + substitute module( 'javax.xml.bind:jaxb-api' ) with module( libraries.jakarta_jaxb_api ) + substitute module( 'org.glassfish.jaxb:jaxb-runtime' ) with module( libraries.jakarta_jaxb_runtime ) + substitute module( 'org.jboss.narayana.jta:narayana-jta' ) with module( libraries.jboss_jta_jakarta ) + substitute module( 'org.jboss:jboss-transaction-spi' ) with module( libraries.jboss_tx_spi_jakarta ) + substitute module( 'org.hibernate.validator:hibernate-validator' ) with module( libraries.jakarta_validator ) + substitute module( 'org.glassfish:javax.el' ) with module( libraries.jakarta_el ) + } + } + exclude group: 'xml-apis', module: 'xml-apis' +} dependencies { implementation libraries.logging diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle index d5b37d59a0..5817fc251d 100644 --- a/gradle/javadoc.gradle +++ b/gradle/javadoc.gradle @@ -32,9 +32,9 @@ javadoc { encoding = 'UTF-8' links += [ 'https://docs.oracle.com/javase/8/docs/api/', - 'https://docs.jboss.org/hibernate/beanvalidation/spec/2.0/api/', - 'https://docs.jboss.org/cdi/api/2.0/', - 'https://javaee.github.io/javaee-spec/javadocs/' +// 'https://docs.jboss.org/hibernate/beanvalidation/spec/2.0/api/', +// 'https://docs.jboss.org/cdi/api/2.0/', + 'https://jakarta.ee/specifications/platform/10/apidocs/' ] tags = [ "apiNote", 'implSpec', 'implNote', 'todo' ] @@ -75,7 +75,7 @@ task javadocJar(type: Jar) { // Hibernate-specific JAR manifest attributes 'Hibernate-VersionFamily': project.ormVersion.family, - 'Hibernate-JpaVersion': project.jpaVersion.name + 'Hibernate-JpaVersion': project.jakartaJpaVersion.name ) } archiveClassifier.set( 'javadoc' ) diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle index 7a7938db92..6de0f86257 100644 --- a/gradle/libraries.gradle +++ b/gradle/libraries.gradle @@ -44,7 +44,7 @@ ext { // We can't upgrade JAXB in Karaf (yet), but fortunately everything works fine with the version built in Karaf jaxbApiVersionOsgiRange = "[2.2,3)" jaxbRuntimeVersion = '2.3.1' - jakartaJaxbRuntimeVersion = '3.0.0' + jakartaJaxbRuntimeVersion = '3.0.2' //GraalVM graalvmVersion = '19.3.1' @@ -72,15 +72,6 @@ ext { // Byte Buddy byteBuddy: "net.bytebuddy:byte-buddy:${byteBuddyVersion}", - // javax - jpa: "javax.persistence:javax.persistence-api:${project.jpaVersion}", - jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final', - validation: "javax.validation:validation-api:${validationApiVersion}", - jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final', - interceptor: 'javax.interceptor:javax.interceptor-api:1.2', - // required by JAXB from JDK 9 as it is not available anymore in JDK 9 - activation: 'javax.activation:javax.activation-api:1.2.0', - // jakarta jakarta_jpa: "jakarta.persistence:jakarta.persistence-api:${project.jakartaJpaVersion}", jakarta_jta: 'jakarta.transaction:jakarta.transaction-api:2.0.0', @@ -90,15 +81,25 @@ ext { jakarta_activation: 'jakarta.activation:jakarta.activation-api:2.0.1', jakarta_resource: 'jakarta.resource:jakarta.resource-api:2.0.0', jakarta_jaxb_api: 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1', + jakarta_jaxb_xjc: "org.glassfish.jaxb:jaxb-xjc:${jakartaJaxbRuntimeVersion}", jakarta_jaxb_runtime: "org.glassfish.jaxb:jaxb-runtime:${jakartaJaxbRuntimeVersion}", jakarta_cdi: 'jakarta.enterprise:jakarta.enterprise.cdi-api:3.0.0', + jakarta_weld: "org.jboss.weld.se:weld-se-shaded:${jakartaWeldVersion}", + jboss_jta_jakarta: "org.jboss.narayana.jta:narayana-jta-jakarta:5.11.2.Final", + jboss_tx_spi_jakarta: "org.jboss:jboss-transaction-spi-jakarta:7.6.1.Final", + jakarta_validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorJakartaVersion}", + jakarta_el: 'org.glassfish:jakarta.el:4.0.1', - // logging - logging: 'org.jboss.logging:jboss-logging:3.4.2.Final', - logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.1.0.Final', - logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final', - - // jaxb task + // javax + jpa: "javax.persistence:javax.persistence-api:${project.jpaVersion}", + jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final', + validation: "javax.validation:validation-api:${validationApiVersion}", + jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final', + interceptor: 'javax.interceptor:javax.interceptor-api:1.2', + // required by JAXB from JDK 9 as it is not available anymore in JDK 9 + activation: 'javax.activation:javax.activation-api:1.2.0', + cdi: "javax.enterprise:cdi-api:${cdiVersion}", + weld: "org.jboss.weld.se:weld-se-shaded:${weldVersion}", jaxb_api: "javax.xml.bind:jaxb-api:${jaxbApiVersion}", jaxb_runtime: "org.glassfish.jaxb:jaxb-runtime:${jaxbRuntimeVersion}", jaxb_xjc: "org.glassfish.jaxb:jaxb-xjc:${jaxbRuntimeVersion}", @@ -106,6 +107,18 @@ ext { // See https://github.com/highsource/jaxb2-basics jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics:0.12.0', jaxb2_basics_ant: 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.12.0', + jboss_jta: "org.jboss.narayana.jta:narayana-jta:5.11.2.Final", + jboss_tx_spi: "org.jboss:jboss-transaction-spi:7.6.1.Final", + validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}", + expression_language: "org.glassfish:javax.el:${elVersion}", + + + // logging + logging: 'org.jboss.logging:jboss-logging:3.4.2.Final', + logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.1.0.Final', + logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final', + + // jaxb task geolatte: "org.geolatte:geolatte-geom:${geolatteVersion}", @@ -152,25 +165,13 @@ ext { informix: 'com.ibm.informix:jdbc:4.10.12', firebird: 'org.firebirdsql.jdbc:jaybird:4.0.3.java8', - jboss_jta: "org.jboss.narayana.jta:narayana-jta:5.11.2.Final", - jboss_tx_spi: "org.jboss:jboss-transaction-spi:7.6.1.Final", - jboss_jta_jakarta: "org.jboss.narayana.jta:narayana-jta-jakarta:5.11.2.Final", - jboss_tx_spi_jakarta: "org.jboss:jboss-transaction-spi-jakarta:7.6.1.Final", xapool: "com.experlog:xapool:1.5.0", mockito: 'org.mockito:mockito-core:2.19.1', mockito_inline: 'org.mockito:mockito-inline:2.19.1', - validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}", - // EL required by Hibernate Validator at test runtime - expression_language: "org.glassfish:javax.el:${elVersion}", - - jakarta_validator:"org.hibernate.validator:hibernate-validator:${hibernateValidatorJakartaVersion}", - // EL required by Hibernate Validator at test runtime - jakarta_el: 'org.glassfish:jakarta.el:4.0.1', - c3p0: "com.mchange:c3p0:0.9.5.5", ehcache: "net.sf.ehcache:ehcache:2.10.6", - ehcache3: "org.ehcache:ehcache:3.6.1", + ehcache3: "org.ehcache:ehcache:3.8.1", jcache: "javax.cache:cache-api:1.0.0", proxool: "proxool:proxool:0.8.3", hikaricp: "com.zaxxer:HikariCP:3.2.0", @@ -182,9 +183,6 @@ ext { atomikos: "com.atomikos:transactions:4.0.6", atomikos_jta: "com.atomikos:transactions-jta:4.0.6", - cdi: "javax.enterprise:cdi-api:${cdiVersion}", - weld: "org.jboss.weld.se:weld-se-shaded:${weldVersion}", - jakarta_weld: "org.jboss.weld.se:weld-se-shaded:${jakartaWeldVersion}", assertj: "org.assertj:assertj-core:${assertjVersion}", assertj_api: "org.assertj:assertj-core-api:${assertjVersion}", @@ -197,10 +195,7 @@ ext { shrinkwrap_descriptors_impl_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-impl-javaee:${shrinkwrapDescriptorsVersion}", jboss_vfs: "org.jboss:jboss-vfs:3.2.11.Final", - wildfly_transaction_client : 'org.wildfly.transaction:wildfly-transaction-client:1.1.7.Final', - // todo (jakarta): update the version when it is released - wildfly_transaction_client_jakarta : 'org.wildfly.transaction:wildfly-transaction-client-jakarta:1.2.0.Final-SNAPSHOT', - + wildfly_transaction_client : 'org.wildfly.transaction:wildfly-transaction-client-jakarta:2.0.0.Final', jboss_ejb_spec_jar : 'org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final', jboss_annotation_spec_jar : 'org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final', @@ -211,7 +206,7 @@ ext { // - which does not seem to work anyway // todo (6.0) : come back and verify whether this ever works asciidoclet : 'org.asciidoctor:asciidoclet:1.5.7-SNAPSHOT' - ] + ] } configurations.all { diff --git a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java index 3d707ca513..44df1a49f9 100644 --- a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java +++ b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java @@ -14,8 +14,8 @@ import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.sql.Connection; import java.sql.SQLException; import java.util.List; diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle index bd3ede340f..f3102abeb6 100644 --- a/hibernate-c3p0/hibernate-c3p0.gradle +++ b/hibernate-c3p0/hibernate-c3p0.gradle @@ -12,20 +12,15 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { implementation project( ':hibernate-core' ) implementation libraries.c3p0 - testImplementation project( ':hibernate-testing' ) testImplementation libraries.mockito testImplementation libraries.mockito_inline - testImplementation( libraries.validator ) { - // for test runtime - transitive = true - } - // EL libraries are provided scope in Validator - testRuntimeOnly( libraries.expression_language ) + testImplementation libraries.jakarta_validator + testRuntimeOnly libraries.jakarta_el if ( db.equalsIgnoreCase( 'oracle' ) ) { - testRuntimeOnly( libraries.oracle ) + testRuntimeOnly libraries.oracle } } diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java index 37ca6529ed..52555f316b 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java @@ -3,8 +3,8 @@ package org.hibernate.test.c3p0; import java.sql.Connection; import java.sql.SQLException; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java index e8560d3e74..55d4bd9ed3 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java @@ -3,8 +3,8 @@ package org.hibernate.test.c3p0; import java.sql.Connection; import java.sql.SQLException; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java index 5de40e2786..fefc4d0b95 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.c3p0; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.validator.constraints.NotBlank; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java index 568da506fc..012e3b7d9f 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java @@ -3,12 +3,12 @@ package org.hibernate.test.c3p0; import java.sql.SQLException; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; import org.hibernate.annotations.NamedNativeQuery; import org.hibernate.c3p0.internal.C3P0ConnectionProvider; @@ -125,7 +125,7 @@ public class OracleSQLCallableStatementProxyTest extends ), }) @Entity(name = "Person") - @javax.persistence.Table(name = "person") + @jakarta.persistence.Table(name = "person") public static class Person { @Id diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java index 5c9169d3e2..94fc41e249 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java @@ -8,8 +8,8 @@ package org.hibernate.test.c3p0; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; diff --git a/hibernate-community-dialects/hibernate-community-dialects.gradle b/hibernate-community-dialects/hibernate-community-dialects.gradle index ede2c8f31c..226d253489 100644 --- a/hibernate-community-dialects/hibernate-community-dialects.gradle +++ b/hibernate-community-dialects/hibernate-community-dialects.gradle @@ -10,22 +10,8 @@ description = 'Hibernate\'s community supported dialects' apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { - api( project( ':hibernate-core' ) ) { - // Exclude access to this to avoid future use. - // todo (6.0) : this should no longer be transitive from core. Come back and verify this - exclude group: "org.javassist", module: "javassist" - } - - implementation libraries.commons_annotations - - // TODO HHH-13703: get rid of this dependency - implementation libraries.dom4j + api project( ':hibernate-core' ) testImplementation project( ':hibernate-testing' ) testImplementation project( path: ':hibernate-core', configuration: 'tests' ) } - -//test { -// dependsOn project(':hibernate-core').tasks.compileTestJava -// test.testClassesDirs = project(':hibernate-core').tasks.test.testClassesDirs -//} \ No newline at end of file diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java index e1bb0c6a08..e19c3b8f62 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java @@ -34,7 +34,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.query.TemporalUnit.*; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java index cb9fbd306e..1919228040 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java @@ -43,7 +43,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java index 5d121cc468..83ffecac01 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java @@ -66,7 +66,7 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.type.descriptor.DateTimeUtils.formatAsTimestampWithMillis; @@ -325,7 +325,7 @@ public class FirebirdDialect extends Dialect { } /** - * Firebird 2.5 doesn't have a real {@link java.sql.Types#BOOLEAN} + * Firebird 2.5 doesn't have a real {@link Types#BOOLEAN} * type, so... */ @Override diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java index 0701aeae03..ed7020299c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java @@ -53,7 +53,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * An SQL dialect for Ingres 9.2. diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java index 8b60e3d17e..1be895dac1 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java @@ -32,7 +32,7 @@ import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * A dialect for Mimer SQL 11. diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java index 7aefe7a70c..db8e855843 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java @@ -35,7 +35,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.jboss.logging.Logger; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * This is the Hibernate dialect for the Unisys 2200 Relational Database (RDMS). diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java index cddd912db7..47586dc9b7 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java @@ -7,7 +7,7 @@ package org.hibernate.community.dialect; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.ScrollMode; import org.hibernate.community.dialect.identity.SQLiteIdentityColumnSupport; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java index 8da51895a4..e88f5e18b9 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java @@ -55,7 +55,7 @@ import java.sql.Types; import java.util.Iterator; import java.util.Map; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java index c7015c5c7a..abc12c1b03 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java @@ -40,7 +40,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * A SQL dialect for TimesTen 5.1. diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java index e779a1d842..91070aaf65 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java @@ -9,10 +9,10 @@ package org.hibernate.community.dialect; import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java index 4324d55dbc..35531ca200 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java @@ -14,9 +14,9 @@ import java.util.Date; */ public class TestInterSystemsFunctionsClass { private Long id; - private java.util.Date date3; - private java.util.Date date1; - private java.util.Date date; + private Date date3; + private Date date1; + private Date date; private String dateText; public TestInterSystemsFunctionsClass() { diff --git a/hibernate-core-jakarta/hibernate-core-jakarta.gradle b/hibernate-core-jakarta/hibernate-core-jakarta.gradle deleted file mode 100644 index 262459ec9f..0000000000 --- a/hibernate-core-jakarta/hibernate-core-jakarta.gradle +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -description = 'Hibernate O/RM implementation of the Jakarta Persistence specification' - -apply from: rootProject.file( 'gradle/published-jakarta-java-module.gradle' ) - -evaluationDependsOn( ':hibernate-core' ) - -dependencies { - api libraries.jakarta_jpa - // This can now be made provided - // Could be made optional? - api libraries.byteBuddy - api libraries.antlr - api libraries.jakarta_jta - api libraries.jandex - api libraries.classmate - api libraries.jakarta_activation - - compileOnly libraries.jakarta_jacc - compileOnly libraries.jakarta_validation - compileOnly libraries.ant - compileOnly libraries.jakarta_cdi - - api libraries.dom4j - api libraries.commons_annotations - - api libraries.jakarta_jaxb_api - api libraries.jakarta_jaxb_runtime - - testImplementation project(':hibernate-testing-jakarta') - - testImplementation libraries.shrinkwrap_api - testImplementation libraries.shrinkwrap - testImplementation libraries.jakarta_jacc - testImplementation libraries.jakarta_validation - testImplementation libraries.jandex - testImplementation libraries.classmate - testImplementation libraries.mockito - testImplementation libraries.mockito_inline - testImplementation libraries.jodaTime - testImplementation libraries.assertj - - testImplementation libraries.jakarta_cdi - - testImplementation( libraries.jakarta_validator ) { - // for test runtime - transitive = true - } - - // for testing stored procedure support - testImplementation libraries.derby - - testRuntimeOnly 'org.hamcrest:hamcrest-all:1.3' - testRuntimeOnly "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" - testRuntimeOnly libraries.jakarta_el - testRuntimeOnly 'jaxen:jaxen:1.1' - testRuntimeOnly libraries.byteBuddy - testRuntimeOnly libraries.jakarta_weld - testRuntimeOnly libraries.atomikos - testRuntimeOnly libraries.atomikos_jta -// todo (jakarta): replace this when the jakarta artifact is released - testRuntimeOnly project(':hibernate-transaction-client') -// testRuntimeOnly libraries.wildfly_transaction_client_jakarta - - testImplementation libraries.shrinkwrap_descriptors_api_javaee - testImplementation libraries.shrinkwrap_descriptors_impl_javaee - - testImplementation libraries.jboss_ejb_spec_jar - testImplementation libraries.jboss_annotation_spec_jar -} - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// main jar -// -//tasks.jar { -// enabled false -//} -// -//task jakartafyJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.jar.archiveFile -// targetJar = tasks.jar.archiveFile -//} -// -//tasks.jar.dependsOn project(':hibernate-core').tasks.jar -//tasks.jar.finalizedBy tasks.jakartafyJar -//tasks.jakartafyJar.dependsOn tasks.jar -//tasks.jakartafyJar.mustRunAfter tasks.jar - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// javadoc jar - -//tasks.javadocJar { -// enabled false -//} -// -//task jakartafyJavadocJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.javadocJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.javadocJar.dependsOn project(':hibernate-core').tasks.javadocJar -//tasks.javadocJar.finalizedBy tasks.jakartafyJavadocJar -//tasks.jakartafyJavadocJar.dependsOn tasks.javadocJar -//tasks.jakartafyJavadocJar.mustRunAfter tasks.javadocJar - - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// sources jar - -//tasks.sourcesJar { -// enabled false -//} -// -//task jakartafySourcesJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.sourcesJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.sourcesJar.dependsOn project(':hibernate-core').tasks.sourcesJar -//tasks.sourcesJar.finalizedBy tasks.jakartafySourcesJar -//tasks.jakartafySourcesJar.dependsOn tasks.sourcesJar -//tasks.jakartafySourcesJar.mustRunAfter tasks.sourcesJar -// - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// testing - -project.ext { - testClassesUnpackTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/unpack/classes' ) - testClassesTransformationTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/test/classes' ) - - templateUnpackTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/unpack/templates' ) - templatesTransformationTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/test/templates' ) -} - -//tasks.compileTestJava { -// enabled false -// dependsOn project(':hibernate-core').tasks.compileTestJava -// dependsOn -//} -// -//tasks.processTestResources { -// enabled false -// dependsOn project(':hibernate-core').tasks.compileTestJava -//} -// -//task unpackTests(type: Copy) { -// from project( ':hibernate-core' ).sourceSets.test.output -//// from zipTree( project( ':hibernate-core' ).tasks.testJar.archiveFile ) -// into project.testClassesUnpackTargetDirectory -// exclude 'templates/**' -//} -// -//task jakartafyTests(type: JakartaDirectoryTransformation) { -// sourceDirectory = project.testClassesUnpackTargetDirectory -// targetDirectory = project.testClassesTransformationTargetDirectory -// -// dependsOn 'compileTestJava' -// dependsOn 'unpackTests' -//} - -//tasks.test.dependsOn tasks.jakartafyTests -//tasks.jakartafyTests.dependsOn tasks.unpackTests -//tasks.unpackTests.dependsOn project( ':hibernate-core' ).tasks.testJar - -tasks.collectTests { - exclude 'templates/**' -} - -final Provider bundleCollectDir = project.getLayout().getBuildDirectory().dir( "jakarta/collect/bundles" ); -final Provider bundleTransformedDir = project.getLayout().getBuildDirectory().dir( "jakarta/transformed/bundles" ); - -task copyTestBundles(type: Copy) { - // `:hibernate-core:processTestResources` also triggers processing the - // packaging "bundle templates" into it's `${buildDir}/bundles` dir. - // we want to start with that form - dependsOn project( ':hibernate-core' ).tasks.processTestResources - - inputs.dir project( ':hibernate-core' ).layout.buildDirectory.dir( 'bundles' ) - outputs.dir bundleCollectDir - - from project( ':hibernate-core' ).layout.buildDirectory.dir( 'bundles' ) - into bundleCollectDir - - // There are persistence.xml files referencing jar files through their absolute path so we - // have to replace 'hibernate-core' references in the path with 'hibernate-core-jakarta' - filter { line -> - line.replaceAll( 'hibernate-core/target', 'hibernate-core-jakarta/target' ) - } - - doFirst { - bundleCollectDir.get().asFile.mkdirs() - } -} - -task jakartafyTemplates(type: JakartaDirectoryTransformation) { - dependsOn tasks.copyTestBundles - dependsOn tasks.jakartafyTests - - sourceDirectory = bundleCollectDir - targetDirectory = bundleTransformedDir -} - -tasks.test { - testClassesDirs += project.files( bundleTransformedDir ) - classpath += project.files( bundleTransformedDir ) - - systemProperty 'file.encoding', 'utf-8' - - if ( gradle.ext.javaVersions.test.launcher.asInt() >= 9 ) { - // See org.hibernate.boot.model.naming.NamingHelperTest.DefaultCharset.set - jvmArgs( ['--add-opens', 'java.base/java.nio.charset=ALL-UNNAMED'] ) - // Weld needs this to generate proxies - jvmArgs( ['--add-opens', 'java.base/java.security=ALL-UNNAMED'] ) - jvmArgs( ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] ) - } - // Allow to exclude specific tests - if ( project.hasProperty( 'excludeTests' ) ) { - filter { - excludeTestsMatching project.property( 'excludeTests' ).toString() - } - } -} \ No newline at end of file diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index d598285246..f29331902b 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -1,7 +1,3 @@ -plugins { - id 'org.hibernate.build.xjc' -} - /* * Hibernate, Relational Persistence for Idiomatic Java * @@ -10,6 +6,10 @@ plugins { */ import org.apache.tools.ant.filters.ReplaceTokens +plugins { + id 'org.hibernate.build.xjc-jakarta' +} + description = 'Hibernate\'s core ORM functionality' apply from: rootProject.file( 'gradle/published-java-module.gradle' ) @@ -25,49 +25,50 @@ configurations { dependencies { - api libraries.jpa - api libraries.jta + api libraries.jakarta_jpa + api libraries.jakarta_jta + api libraries.jakarta_activation + api libraries.jakarta_jaxb_api + api libraries.jakarta_jaxb_runtime api libraries.jandex api libraries.classmate api libraries.commons_annotations - api libraries.jaxb_api implementation libraries.byteBuddy implementation libraries.activation implementation libraries.jaxb_runtime implementation libraries.antlr - compileOnly libraries.jacc - compileOnly libraries.validation + compileOnly libraries.jakarta_jacc + compileOnly libraries.jakarta_validation + compileOnly libraries.jakarta_cdi + compileOnly libraries.ant - compileOnly libraries.cdi testImplementation project(':hibernate-testing') testImplementation libraries.shrinkwrap_api testImplementation libraries.shrinkwrap testImplementation libraries.shrinkwrap_descriptors_api_javaee testImplementation libraries.shrinkwrap_descriptors_impl_javaee - testImplementation libraries.jacc - testImplementation libraries.validation - testImplementation( libraries.validator ) { + testImplementation libraries.jakarta_jacc + testImplementation libraries.jakarta_validation + testImplementation( libraries.jakarta_validator ) { // for test runtime transitive = true } - testImplementation libraries.jandex - testImplementation libraries.classmate testImplementation libraries.mockito testImplementation libraries.mockito_inline testImplementation libraries.jodaTime testImplementation libraries.assertj - testImplementation libraries.cdi + testImplementation libraries.jakarta_cdi testImplementation libraries.jboss_ejb_spec_jar testImplementation libraries.jboss_annotation_spec_jar testRuntimeOnly "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" - testRuntimeOnly libraries.expression_language + testRuntimeOnly libraries.jakarta_el testRuntimeOnly 'jaxen:jaxen:1.1' testRuntimeOnly libraries.byteBuddy - testRuntimeOnly libraries.weld + testRuntimeOnly libraries.jakarta_weld testRuntimeOnly libraries.atomikos testRuntimeOnly libraries.atomikos_jta testRuntimeOnly libraries.wildfly_transaction_client @@ -76,11 +77,9 @@ dependencies { antlr libraries.antlr - xjc libraries.jaxb_runtime - xjc libraries.jaxb_xjc - xjc libraries.jaxb2_basics - xjc libraries.jaxb2_basics_ant - xjc libraries.activation + xjc libraries.jakarta_jaxb_xjc + xjc libraries.jakarta_jaxb_runtime + xjc rootProject.fileTree(dir: 'patched-libs/jaxb2-basics', include: '*.jar') } jar { diff --git a/hibernate-core/src/main/java/org/hibernate/Cache.java b/hibernate-core/src/main/java/org/hibernate/Cache.java index c8e2393620..18ccf06654 100644 --- a/hibernate-core/src/main/java/org/hibernate/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/Cache.java @@ -19,7 +19,7 @@ import java.io.Serializable; * @author Steve Ebersole */ @SuppressWarnings( {"UnusedDeclaration"}) -public interface Cache extends javax.persistence.Cache { +public interface Cache extends jakarta.persistence.Cache { /** * Access to the SessionFactory this Cache is bound to. * diff --git a/hibernate-core/src/main/java/org/hibernate/CacheMode.java b/hibernate-core/src/main/java/org/hibernate/CacheMode.java old mode 100755 new mode 100644 index 5a7c6c20e5..9a56e53f22 --- a/hibernate-core/src/main/java/org/hibernate/CacheMode.java +++ b/hibernate-core/src/main/java/org/hibernate/CacheMode.java @@ -7,8 +7,8 @@ package org.hibernate; import java.util.Locale; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; /** * Controls how the session interacts with the second-level cache and query cache. diff --git a/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java b/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java index 2761e96fb8..d3260076f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java @@ -10,7 +10,7 @@ import org.hibernate.internal.util.StringHelper; /** * Indicates the manner in which JDBC Connections should be acquired. Inverse to - * {@link org.hibernate.ConnectionReleaseMode}. + * {@link ConnectionReleaseMode}. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/FetchMode.java index a34557e16f..6397722109 100644 --- a/hibernate-core/src/main/java/org/hibernate/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/FetchMode.java @@ -13,7 +13,7 @@ package org.hibernate; *
* For HQL queries, use the FETCH keyword instead. * - * @see Criteria#setFetchMode(java.lang.String, FetchMode) + * @see Criteria#setFetchMode(String, FetchMode) * * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/HibernateException.java b/hibernate-core/src/main/java/org/hibernate/HibernateException.java index 7d3d1a8e10..d35a402177 100644 --- a/hibernate-core/src/main/java/org/hibernate/HibernateException.java +++ b/hibernate-core/src/main/java/org/hibernate/HibernateException.java @@ -6,7 +6,7 @@ */ package org.hibernate; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * The base exception type for Hibernate exceptions. diff --git a/hibernate-core/src/main/java/org/hibernate/JDBCException.java b/hibernate-core/src/main/java/org/hibernate/JDBCException.java index 12402613e2..3efdce55a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/JDBCException.java +++ b/hibernate-core/src/main/java/org/hibernate/JDBCException.java @@ -13,7 +13,7 @@ import java.sql.SQLException; * * @author Gavin King * - * @see java.sql.SQLException + * @see SQLException */ public class JDBCException extends HibernateException { private final SQLException sqlException; @@ -47,7 +47,7 @@ public class JDBCException extends HibernateException { * * @return The X/Open or ANSI SQL SQLState error code; may return null. * - * @see java.sql.SQLException#getSQLState() + * @see SQLException#getSQLState() */ public String getSQLState() { return sqlException.getSQLState(); @@ -58,7 +58,7 @@ public class JDBCException extends HibernateException { * * @return The vendor specific error code * - * @see java.sql.SQLException#getErrorCode() + * @see SQLException#getErrorCode() */ public int getErrorCode() { return sqlException.getErrorCode(); diff --git a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java index df10981d61..07d408428d 100644 --- a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java +++ b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java @@ -15,8 +15,8 @@ import org.jboss.logging.Logger; * * For example, when an uninitialized proxy or collection is accessed after the session was closed. * - * @see Hibernate#initialize(java.lang.Object) - * @see Hibernate#isInitialized(java.lang.Object) + * @see Hibernate#initialize(Object) + * @see Hibernate#isInitialized(Object) * @author Gavin King */ public class LazyInitializationException extends HibernateException { diff --git a/hibernate-core/src/main/java/org/hibernate/LobHelper.java b/hibernate-core/src/main/java/org/hibernate/LobHelper.java index 85b6d5c481..42188e98d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/LobHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/LobHelper.java @@ -39,11 +39,11 @@ public interface LobHelper { public Blob createBlob(InputStream stream, long length); /** - * Create a new {@link java.sql.Clob} from content. + * Create a new {@link Clob} from content. * * @param string The string data * - * @return The created {@link java.sql.Clob} + * @return The created {@link Clob} */ public Clob createClob(String string); diff --git a/hibernate-core/src/main/java/org/hibernate/LockMode.java b/hibernate-core/src/main/java/org/hibernate/LockMode.java index 18e5498df5..a0d2c63e4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/LockMode.java +++ b/hibernate-core/src/main/java/org/hibernate/LockMode.java @@ -76,7 +76,7 @@ public enum LockMode { FORCE( 15, "force" ), /** - * start of javax.persistence.LockModeType equivalent modes + * start of jakarta.persistence.LockModeType equivalent modes */ /** diff --git a/hibernate-core/src/main/java/org/hibernate/Metamodel.java b/hibernate-core/src/main/java/org/hibernate/Metamodel.java index 923c64f876..853dea1361 100644 --- a/hibernate-core/src/main/java/org/hibernate/Metamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/Metamodel.java @@ -6,7 +6,7 @@ */ package org.hibernate; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.JpaMetamodel; @@ -19,7 +19,7 @@ import org.hibernate.metamodel.model.domain.JpaMetamodel; * @see JpaMetamodel */ @Deprecated -public interface Metamodel extends javax.persistence.metamodel.Metamodel { +public interface Metamodel extends jakarta.persistence.metamodel.Metamodel { /** * Access to the SessionFactory that this Metamodel instance is bound to. * diff --git a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java old mode 100755 new mode 100644 index d30e648d96..63419cbb58 --- a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java @@ -17,14 +17,14 @@ public enum ScrollMode { /** * Requests a scrollable result that is only scrollable forwards. * - * @see java.sql.ResultSet#TYPE_FORWARD_ONLY + * @see ResultSet#TYPE_FORWARD_ONLY */ FORWARD_ONLY( ResultSet.TYPE_FORWARD_ONLY ), /** * Requests a scrollable result which is sensitive to changes in the underlying data. * - * @see java.sql.ResultSet#TYPE_SCROLL_SENSITIVE + * @see ResultSet#TYPE_SCROLL_SENSITIVE */ SCROLL_SENSITIVE( ResultSet.TYPE_SCROLL_SENSITIVE ), @@ -35,7 +35,7 @@ public enum ScrollMode { * might need to explicitly evict objects, if you need to see * changes made by other transactions. * - * @see java.sql.ResultSet#TYPE_SCROLL_INSENSITIVE + * @see ResultSet#TYPE_SCROLL_INSENSITIVE */ SCROLL_INSENSITIVE( ResultSet.TYPE_SCROLL_INSENSITIVE ); diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java index 6bdb06c3ca..64bf8932d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/Session.java +++ b/hibernate-core/src/main/java/org/hibernate/Session.java @@ -9,12 +9,12 @@ package org.hibernate; import java.io.Closeable; import java.sql.Connection; import java.util.List; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.graph.RootGraph; import org.hibernate.stat.SessionStatistics; @@ -422,7 +422,7 @@ public interface Session extends SharedSessionContract, EntityManager, AutoClose * * @param object a transient or detached instance containing new or updated state * - * @see Session#save(java.lang.Object) + * @see Session#save(Object) * @see Session#update(Object object) */ void saveOrUpdate(Object object); @@ -918,7 +918,7 @@ public interface Session extends SharedSessionContract, EntityManager, AutoClose * * To get the default read-only/modifiable setting used for * entities and proxies that are loaded into the session: - * @see org.hibernate.Session#isDefaultReadOnly() + * @see Session#isDefaultReadOnly() * * @param entityOrProxy an entity or HibernateProxy * @return {@code true} if the entity or proxy is read-only, {@code false} if the entity or proxy is modifiable. @@ -935,7 +935,7 @@ public interface Session extends SharedSessionContract, EntityManager, AutoClose * * To set the default read-only/modifiable setting used for * entities and proxies that are loaded into the session: - * @see org.hibernate.Session#setDefaultReadOnly(boolean) + * @see Session#setDefaultReadOnly(boolean) * * To override this session's read-only/modifiable setting for entities * and proxies loaded by a Query: diff --git a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java index 1522d8099c..b7a2ecbffd 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java @@ -82,7 +82,7 @@ public interface SessionBuilder { * * @return {@code this}, for method chaining * - * @see javax.persistence.SynchronizationType#SYNCHRONIZED + * @see jakarta.persistence.SynchronizationType#SYNCHRONIZED */ T autoJoinTransactions(boolean autoJoinTransactions); @@ -102,7 +102,7 @@ public interface SessionBuilder { * * @return {@code this}, for method chaining * - * @see javax.persistence.PersistenceContextType + * @see jakarta.persistence.PersistenceContextType */ T flushMode(FlushMode flushMode); @@ -136,7 +136,7 @@ public interface SessionBuilder { /** * Should {@link org.hibernate.query.Query#setParameter} perform parameter validation - * when the Session is bootstrapped via JPA {@link javax.persistence.EntityManagerFactory} + * when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory} * * @param enabled {@code true} indicates the validation should be performed, {@code false} otherwise *

@@ -157,7 +157,7 @@ public interface SessionBuilder { * * @return {@code this}, for method chaining * - * @see javax.persistence.PersistenceContextType + * @see jakarta.persistence.PersistenceContextType * * @deprecated Only integrations can specify autoClosing behavior of individual sessions. See * {@link org.hibernate.engine.spi.SessionOwner} diff --git a/hibernate-core/src/main/java/org/hibernate/SessionException.java b/hibernate-core/src/main/java/org/hibernate/SessionException.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java index 074935eeb1..b242bc905e 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import javax.naming.Referenceable; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.spi.FilterDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java index 88d7450c20..2314457143 100644 --- a/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java +++ b/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java @@ -8,10 +8,10 @@ package org.hibernate; import java.io.Serializable; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.jdbc.ReturningWork; import org.hibernate.jdbc.Work; @@ -88,7 +88,7 @@ public interface SharedSessionContract extends QueryProducer, Serializable { * * @return The ProcedureCall * - * @see javax.persistence.NamedStoredProcedureQuery + * @see jakarta.persistence.NamedStoredProcedureQuery */ ProcedureCall getNamedProcedureCall(String name); diff --git a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java index 701ff448b3..18763bf487 100644 --- a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java @@ -19,7 +19,7 @@ import java.util.Optional; */ public interface SimpleNaturalIdLoadAccess { /** - * Specify the {@link org.hibernate.LockOptions} to use when retrieving the entity. + * Specify the {@link LockOptions} to use when retrieving the entity. * * @param lockOptions The lock options to use. * diff --git a/hibernate-core/src/main/java/org/hibernate/StaleStateException.java b/hibernate-core/src/main/java/org/hibernate/StaleStateException.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java index 0654347676..c9ef1eb40d 100644 --- a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java @@ -41,7 +41,7 @@ public interface StatelessSessionBuilder { /** * Should {@link org.hibernate.query.Query#setParameter} perform parameter validation - * when the Session is bootstrapped via JPA {@link javax.persistence.EntityManagerFactory} + * when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory} * * @param enabled {@code true} indicates the validation should be performed, {@code false} otherwise *

diff --git a/hibernate-core/src/main/java/org/hibernate/Transaction.java b/hibernate-core/src/main/java/org/hibernate/Transaction.java index 6ac446908d..971eae41c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/Transaction.java +++ b/hibernate-core/src/main/java/org/hibernate/Transaction.java @@ -6,8 +6,8 @@ */ package org.hibernate; -import javax.persistence.EntityTransaction; -import javax.transaction.Synchronization; +import jakarta.persistence.EntityTransaction; +import jakarta.transaction.Synchronization; import org.hibernate.resource.transaction.spi.TransactionStatus; @@ -17,7 +17,7 @@ import org.hibernate.resource.transaction.spi.TransactionStatus; * implementation (eg. JTA, JDBC). *

* A transaction is associated with a {@link Session} and is usually initiated by a call to - * {@link org.hibernate.Session#beginTransaction()}. A single session might span multiple transactions since + * {@link Session#beginTransaction()}. A single session might span multiple transactions since * the notion of a session (a conversation between the application and the datastore) is of coarser granularity than * the notion of a transaction. However, it is intended that there be at most one uncommitted transaction associated * with a particular {@link Session} at any time. diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java index 9931f40e42..5f386b6750 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java @@ -35,7 +35,7 @@ import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.exec.spi.ExecutionContext; /** - * An {@link org.hibernate.engine.spi.ActionQueue} {@link org.hibernate.action.spi.Executable} for ensuring + * An {@link org.hibernate.engine.spi.ActionQueue} {@link Executable} for ensuring * shared cache cleanup in relation to performed bulk HQL queries. *

* NOTE: currently this executes for INSERT queries as well as diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java index ad7c6e5c86..5fd9ba2a2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java @@ -8,7 +8,7 @@ package org.hibernate.action.internal; import org.hibernate.HibernateException; /** - * An exception indicating that an {@link org.hibernate.action.internal.EntityAction} was vetoed. + * An exception indicating that an {@link EntityAction} was vetoed. * * @author Vlad Mihalcea */ @@ -20,7 +20,7 @@ public class EntityActionVetoException extends HibernateException { * Constructs a EntityActionVetoException * * @param message Message explaining the exception condition - * @param entityAction The {@link org.hibernate.action.internal.EntityAction} was vetoed that was vetoed. + * @param entityAction The {@link EntityAction} was vetoed that was vetoed. */ public EntityActionVetoException(String message, EntityAction entityAction) { super( message ); diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java index 9e487cedb4..6408baabb4 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java @@ -87,14 +87,14 @@ public class UnresolvedEntityInsertActions { } /** - * Throws {@link org.hibernate.PropertyValueException} if there are any unresolved + * Throws {@link PropertyValueException} if there are any unresolved * entity insert actions that depend on non-nullable associations with * a transient entity. This method should be called on completion of * an operation (after all cascades are completed) that saves an entity. * - * @throws org.hibernate.PropertyValueException if there are any unresolved entity - * insert actions; {@link org.hibernate.PropertyValueException#getEntityName()} - * and {@link org.hibernate.PropertyValueException#getPropertyName()} will + * @throws PropertyValueException if there are any unresolved entity + * insert actions; {@link PropertyValueException#getEntityName()} + * and {@link PropertyValueException#getPropertyName()} will * return the entity name and property value for the first unresolved * entity insert action. */ diff --git a/hibernate-core/src/main/java/org/hibernate/action/package.html b/hibernate-core/src/main/java/org/hibernate/action/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java index 331d673ed0..d153a7dd2f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java @@ -6,8 +6,8 @@ */ package org.hibernate.annotations; import java.lang.annotation.Retention; -import javax.persistence.Column; -import javax.persistence.FetchType; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java index f98c27996c..11f1c9e2b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java @@ -16,7 +16,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Names a persistent property access strategy ({@link org.hibernate.property.access.spi.PropertyAccessStrategy}) to use. + * Names a persistent property access strategy ({@link PropertyAccessStrategy}) to use. * * Can be specified at either:

    *
  • @@ -28,13 +28,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; *
    • *
* - * Should only be used to name custom {@link org.hibernate.property.access.spi.PropertyAccessStrategy}. For - * {@code property/field} access, the JPA {@link javax.persistence.Access} annotation should be preferred - * using the appropriate {@link javax.persistence.AccessType}. However, if this annotation is used with + * Should only be used to name custom {@link PropertyAccessStrategy}. For + * {@code property/field} access, the JPA {@link jakarta.persistence.Access} annotation should be preferred + * using the appropriate {@link jakarta.persistence.AccessType}. However, if this annotation is used with * either {@code value="property"} or {@code value="field"}, it will act just as the corresponding usage - * of {@link javax.persistence.Access}. + * of {@link jakarta.persistence.Access}. * - * @see org.hibernate.property.access.spi.PropertyAccessStrategy + * @see PropertyAccessStrategy * @see org.hibernate.property.access.spi.PropertyAccessStrategyResolver * * @author Steve Ebersole @@ -44,14 +44,14 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) public @interface AttributeAccessor { /** - * Names the {@link org.hibernate.property.access.spi.PropertyAccessStrategy} strategy. + * Names the {@link PropertyAccessStrategy} strategy. * * @deprecated use {@link #strategy()} */ @Deprecated String value() default ""; /** - * A class implementing {@link org.hibernate.property.access.spi.PropertyAccessStrategy}. + * A class implementing {@link PropertyAccessStrategy}. */ Class strategy() default PropertyAccessStrategy.class; } diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java index 088743b796..6ff5fa2062 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java @@ -14,8 +14,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Apply a cascade strategy on an association. Used to apply Hibernate specific cascades. For JPA cascading, prefer - * using {@link javax.persistence.CascadeType} on {@link javax.persistence.OneToOne}, - * {@link javax.persistence.OneToMany}, etc. Hibernate will merge together both sets of cascades. + * using {@link jakarta.persistence.CascadeType} on {@link jakarta.persistence.OneToOne}, + * {@link jakarta.persistence.OneToMany}, etc. Hibernate will merge together both sets of cascades. * * @author Emmanuel Bernard * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java index b5e873e6e2..910f1a65b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java @@ -16,22 +16,22 @@ public enum CascadeType { ALL, /** - * Corresponds to {@link javax.persistence.CascadeType#PERSIST}. + * Corresponds to {@link jakarta.persistence.CascadeType#PERSIST}. */ PERSIST, /** - * Corresponds to {@link javax.persistence.CascadeType#MERGE}. + * Corresponds to {@link jakarta.persistence.CascadeType#MERGE}. */ MERGE, /** - * Corresponds to {@link javax.persistence.CascadeType#REMOVE}. + * Corresponds to {@link jakarta.persistence.CascadeType#REMOVE}. */ REMOVE, /** - * Corresponds to {@link javax.persistence.CascadeType#REFRESH}. + * Corresponds to {@link jakarta.persistence.CascadeType#REFRESH}. */ REFRESH, @@ -64,7 +64,7 @@ public enum CascadeType { LOCK, /** - * Corresponds to {@link javax.persistence.CascadeType#DETACH}. + * Corresponds to {@link jakarta.persistence.CascadeType#DETACH}. */ DETACH } diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java index 4bdecabe92..96ff35bcd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java @@ -1,41 +1,41 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.persistence.Column; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Describe an identifier column for a bag (ie an idbag). - * - * EXPERIMENTAL: the structure of this annotation might slightly change (generator() mix strategy and generator - * - * @author Emmanuel Bernard - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -public @interface CollectionId { - /** - * Collection id column(s). - */ - Column[] columns(); - - /** - * id type, type.type() must be set. - */ - Type type(); - - /** - * The generator name. For example 'identity' or a defined generator name - */ - String generator(); -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import jakarta.persistence.Column; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Describe an identifier column for a bag (ie an idbag). + * + * EXPERIMENTAL: the structure of this annotation might slightly change (generator() mix strategy and generator + * + * @author Emmanuel Bernard + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface CollectionId { + /** + * Collection id column(s). + */ + Column[] columns(); + + /** + * id type, type.type() must be set. + */ + Type type(); + + /** + * The generator name. For example 'identity' or a defined generator name + */ + String generator(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java index 242076de2f..d0b3104794 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java @@ -8,7 +8,7 @@ package org.hibernate.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.Column; +import jakarta.persistence.Column; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java index 4c4fd9fe09..11c35275f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java @@ -14,7 +14,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Used to apply a Hibernate formula (derived value) as the inheritance discriminator "column". Used in place of - * the JPA {@link javax.persistence.DiscriminatorColumn} when a formula is wanted. + * the JPA {@link jakarta.persistence.DiscriminatorColumn} when a formula is wanted. * * To be placed on the root entity. * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java index fa1e03a764..46014d4bbd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java @@ -1,28 +1,28 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -/** - * Fetch options on associations. Defines more of the "how" of fetching, whereas JPA {@link javax.persistence.FetchType} - * focuses on the "when". - * - * @author Emmanuel Bernard - */ -public enum FetchMode { - /** - * Use a secondary select for each individual entity, collection, or join load. - */ - SELECT, - /** - * Use an outer join to load the related entities, collections or joins. - */ - JOIN, - /** - * Available for collections only.  When accessing a non-initialized collection, this fetch mode will trigger loading all elements of all collections of the same role for all owners associated with the persistence context using a single secondary select. - */ - SUBSELECT -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.annotations; + +/** + * Fetch options on associations. Defines more of the "how" of fetching, whereas JPA {@link jakarta.persistence.FetchType} + * focuses on the "when". + * + * @author Emmanuel Bernard + */ +public enum FetchMode { + /** + * Use a secondary select for each individual entity, collection, or join load. + */ + SELECT, + /** + * Use an outer join to load the related entities, collections or joins. + */ + JOIN, + /** + * Available for collections only.  When accessing a non-initialized collection, this fetch mode will trigger loading all elements of all collections of the same role for all owners associated with the persistence context using a single secondary select. + */ + SUBSELECT +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java index 2686c3448b..a26c6a477c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java @@ -7,7 +7,7 @@ package org.hibernate.annotations; /** - * Enumeration extending javax.persistence flush modes. + * Enumeration extending jakarta.persistence flush modes. * * @author Carlos Gonzalez-Cadenas */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java index d3693beffc..6b9e3b05fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java @@ -1,37 +1,37 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Define the foreign key name. - * - * @deprecated Prefer the JPA 2.1 introduced {@link javax.persistence.ForeignKey} instead. - */ -@Target({FIELD, METHOD, TYPE}) -@Retention(RUNTIME) -@Deprecated -public @interface ForeignKey { - /** - * Name of the foreign key. Used in OneToMany, ManyToOne, and OneToOne - * relationships. Used for the owning side in ManyToMany relationships - */ - String name(); - - /** - * Used for the non-owning side of a ManyToMany relationship. Ignored - * in other relationships - */ - String inverseName() default ""; -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Define the foreign key name. + * + * @deprecated Prefer the JPA 2.1 introduced {@link jakarta.persistence.ForeignKey} instead. + */ +@Target({FIELD, METHOD, TYPE}) +@Retention(RUNTIME) +@Deprecated +public @interface ForeignKey { + /** + * Name of the foreign key. Used in OneToMany, ManyToOne, and OneToOne + * relationships. Used for the owning side in ManyToMany relationships + */ + String name(); + + /** + * Used for the non-owning side of a ManyToMany relationship. Ignored + * in other relationships + */ + String inverseName() default ""; +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Index.java b/hibernate-core/src/main/java/org/hibernate/annotations/Index.java index 9103b35a09..9584262e5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Index.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Index.java @@ -17,7 +17,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author Emmanuel Bernard * - * @deprecated Using {@link javax.persistence.Index} instead. + * @deprecated Using {@link jakarta.persistence.Index} instead. */ @Target({FIELD, METHOD}) @Retention(RUNTIME) diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java b/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java index b0b0615919..96dc2164fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java @@ -18,7 +18,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author Matthew Inger * - * @deprecated Prefer the standard JPA {@link javax.persistence.OrderColumn} annotation and the Hibernate specific + * @deprecated Prefer the standard JPA {@link jakarta.persistence.OrderColumn} annotation and the Hibernate specific * {@link ListIndexBase} (for replacing {@link #base()}). */ @Target({METHOD, FIELD}) diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java index eb6fab8376..6ca32d9c5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java @@ -42,9 +42,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * ```` * * Other forms of influencing the JDBC type used include:
    - *
  • {@link javax.persistence.Enumerated} / {@link javax.persistence.EnumType}
    • - *
  • {@link javax.persistence.TemporalType}
    • - *
  • {@link javax.persistence.Lob}
    • + *
  • {@link jakarta.persistence.Enumerated} / {@link jakarta.persistence.EnumType}
    • + *
  • {@link jakarta.persistence.TemporalType}
    • + *
  • {@link jakarta.persistence.Lob}
    • *
  • {@link Nationalized}
    • *
  • {@link JdbcType}
    • *
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java index 1a2c832f0e..6b08a774ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java @@ -9,7 +9,7 @@ package org.hibernate.annotations; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.JoinColumn; +import jakarta.persistence.JoinColumn; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java index 943cdebeda..09253d0080 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java @@ -17,9 +17,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * By default list indexes are stored starting at zero. * - * Generally used in conjunction with {@link javax.persistence.OrderColumn}. + * Generally used in conjunction with {@link jakarta.persistence.OrderColumn}. * - * @see javax.persistence.OrderColumn + * @see jakarta.persistence.OrderColumn * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java index aac5ede2d8..d98fac3b6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java @@ -7,8 +7,8 @@ package org.hibernate.annotations; import java.lang.annotation.Retention; -import javax.persistence.Column; -import javax.persistence.FetchType; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java index ba48a40523..d54b66a24d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java @@ -14,7 +14,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * A grouping of Hibernate-specific {@link NamedNativeQuery} definitions. Effectively extends the named native - * query definitions made available through {@link javax.persistence.NamedNativeQueries}. + * query definitions made available through {@link jakarta.persistence.NamedNativeQueries}. * * @author Emmanuel Bernard */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java index 1158a031b1..9eec23ef56 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java @@ -15,7 +15,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Extends {@link javax.persistence.NamedNativeQuery} with Hibernate features. + * Extends {@link jakarta.persistence.NamedNativeQuery} with Hibernate features. * * @author Emmanuel Bernard * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java index 7b648b7826..99eb8bb1b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java @@ -14,7 +14,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * A grouping of Hibernate-specific {@link NamedQuery} definitions. Effectively extends the named query - * definitions made available through {@link javax.persistence.NamedQueries}. + * definitions made available through {@link jakarta.persistence.NamedQueries}. * * @author Emmanuel Bernard * @author Carlos Gonzalez-Cadenas diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java index 850155c4df..95b5b835f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java @@ -15,7 +15,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Extends {@link javax.persistence.NamedQuery} with Hibernate features. + * Extends {@link jakarta.persistence.NamedQuery} with Hibernate features. * * @author Carlos Gonzalez-Cadenas * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java b/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java index 0f5e7886f2..80f7b36f06 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.annotations; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java index 731e824822..731a090321 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java @@ -19,7 +19,7 @@ public enum OptimisticLockType { /** * Perform optimistic locking using a dedicated version column. * - * @see javax.persistence.Version + * @see jakarta.persistence.Version */ VERSION, /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java index cf930daa3a..4e638a30d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java @@ -15,13 +15,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Order a collection using SQL ordering (not HQL ordering). * - * Different from {@link javax.persistence.OrderBy} in that this expects SQL fragment, JPA OrderBy expects a + * Different from {@link jakarta.persistence.OrderBy} in that this expects SQL fragment, JPA OrderBy expects a * valid JPQL order-by fragment. * * @author Emmanuel Bernard * @author Steve Ebersole * - * @see javax.persistence.OrderBy + * @see jakarta.persistence.OrderBy * @see SortComparator * @see SortNatural */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java index 39166baa23..8b1c49a979 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java @@ -100,9 +100,9 @@ public class QueryHints { /** * Available to apply lock mode to a native SQL query since JPA requires that - * {@link javax.persistence.Query#setLockMode} throw an IllegalStateException if called for a native query. + * {@link jakarta.persistence.Query#setLockMode} throw an IllegalStateException if called for a native query. *

- * Accepts a {@link javax.persistence.LockModeType} or a {@link org.hibernate.LockMode} + * Accepts a {@link jakarta.persistence.LockModeType} or a {@link org.hibernate.LockMode} */ public static final String NATIVE_LOCKMODE = "org.hibernate.lockMode"; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java index 51db734f35..1f060e0842 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java @@ -14,7 +14,7 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Optional annotation in conjunction with {@link javax.persistence.Version} and timestamp version properties + * Optional annotation in conjunction with {@link jakarta.persistence.Version} and timestamp version properties * indicating the source of the timestamp value. * * @author Hardy Ferentschik diff --git a/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java index 2a0dddb164..6073d9f81e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; import org.hibernate.boot.spi.MetadataBuildingContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java b/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java index 664b9f3cb4..bf4efb38d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java @@ -40,14 +40,14 @@ import org.hibernate.query.sqm.function.SqmFunctionDescriptor; */ public interface Metadata extends Mapping { /** - * Get the builder for {@link org.hibernate.SessionFactory} instances based on this metamodel. + * Get the builder for {@link SessionFactory} instances based on this metamodel. * - * @return The builder for {@link org.hibernate.SessionFactory} instances. + * @return The builder for {@link SessionFactory} instances. */ SessionFactoryBuilder getSessionFactoryBuilder(); /** - * Short-hand form of building a {@link org.hibernate.SessionFactory} through the builder without any additional + * Short-hand form of building a {@link SessionFactory} through the builder without any additional * option overrides. * * @return THe built SessionFactory. @@ -55,7 +55,7 @@ public interface Metadata extends Mapping { SessionFactory buildSessionFactory(); /** - * Gets the {@link java.util.UUID} for this metamodel. + * Gets the {@link UUID} for this metamodel. * * @return the UUID. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java index 70621d65fa..6f07c374d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java @@ -6,8 +6,8 @@ */ package org.hibernate.boot; -import javax.persistence.AttributeConverter; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.SharedCacheMode; import org.hibernate.boot.archive.scan.spi.ScanEnvironment; import org.hibernate.boot.archive.scan.spi.ScanOptions; @@ -119,7 +119,7 @@ public interface MetadataBuilder { * @return {@code this}, for method chaining * * @see org.hibernate.cfg.AvailableSettings#DEFAULT_CACHE_CONCURRENCY_STRATEGY - * @see #applySharedCacheMode(javax.persistence.SharedCacheMode) + * @see #applySharedCacheMode(jakarta.persistence.SharedCacheMode) */ MetadataBuilder applyAccessType(AccessType accessType); @@ -189,10 +189,10 @@ public interface MetadataBuilder { /** * Should we enable support for the "new" (since 3.2) identifier generator mappings for * handling:

    - *
  • {@link javax.persistence.GenerationType#SEQUENCE}
    • - *
  • {@link javax.persistence.GenerationType#IDENTITY}
    • - *
  • {@link javax.persistence.GenerationType#TABLE}
    • - *
  • {@link javax.persistence.GenerationType#AUTO}
    • + *
  • {@link jakarta.persistence.GenerationType#SEQUENCE}
    • + *
  • {@link jakarta.persistence.GenerationType#IDENTITY}
    • + *
  • {@link jakarta.persistence.GenerationType#TABLE}
    • + *
  • {@link jakarta.persistence.GenerationType#AUTO}
    • *
*

* Its default is defined by the {@link org.hibernate.cfg.AvailableSettings#USE_NEW_ID_GENERATOR_MAPPINGS} @@ -338,7 +338,7 @@ public interface MetadataBuilder { * Ideally we should avoid accessing ClassLoaders when perform 1st phase of bootstrap. This * is a ClassLoader that can be used in cases when we have to. IN EE managed environments, this * is the ClassLoader mandated by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}. This ClassLoader + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}. This ClassLoader * is thrown away by the container afterwards. The idea being that the Class can still be enhanced * in the application ClassLoader. In other environments, pass a ClassLoader that performs the * same function if desired. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java index 7edc26dfa1..b42a84e29b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java @@ -178,7 +178,7 @@ public class MetadataSources implements Serializable { */ private MetadataBuilder getCustomBuilderOrDefault(MetadataBuilderImpl defaultBuilder) { final ClassLoaderService cls = serviceRegistry.getService( ClassLoaderService.class ); - final java.util.Collection discoveredBuilderFactories = cls.loadJavaServices( MetadataBuilderFactory.class ); + final Collection discoveredBuilderFactories = cls.loadJavaServices( MetadataBuilderFactory.class ); MetadataBuilder builder = null; List activeFactoryNames = null; @@ -206,7 +206,7 @@ public class MetadataSources implements Serializable { /** * Short-hand form of calling {@link #getMetadataBuilder()} and using its - * {@link org.hibernate.boot.MetadataBuilder#build()} method in cases where the application wants + * {@link MetadataBuilder#build()} method in cases where the application wants * to accept the defaults. * * @return The built metadata. @@ -363,11 +363,11 @@ public class MetadataSources implements Serializable { /** * Read mappings from a particular XML file * - * @param path The path to a file. Expected to be resolvable by {@link java.io.File#File(String)} + * @param path The path to a file. Expected to be resolvable by {@link File#File(String)} * * @return this (for method chaining purposes) * - * @see #addFile(java.io.File) + * @see #addFile(File) */ public MetadataSources addFile(String path) { addFile( new File( path ) ); @@ -401,13 +401,13 @@ public class MetadataSources implements Serializable { } /** - * See {@link #addCacheableFile(java.io.File)} for description + * See {@link #addCacheableFile(File)} for description * - * @param path The path to a file. Expected to be resolvable by {@link java.io.File#File(String)} + * @param path The path to a file. Expected to be resolvable by {@link File#File(String)} * * @return this (for method chaining purposes) * - * @see #addCacheableFile(java.io.File) + * @see #addCacheableFile(File) */ public MetadataSources addCacheableFile(String path) { addCacheableFile( new File( path ) ); @@ -415,13 +415,13 @@ public class MetadataSources implements Serializable { } /** - * See {@link #addCacheableFile(java.io.File)} for description + * See {@link #addCacheableFile(File)} for description * - * @param path The path to a file. Expected to be resolvable by {@link java.io.File#File(String)} + * @param path The path to a file. Expected to be resolvable by {@link File#File(String)} * * @return this (for method chaining purposes) * - * @see #addCacheableFile(java.io.File) + * @see #addCacheableFile(File) */ public MetadataSources addCacheableFile(String path, File cacheDirectory) { addCacheableFile( new File( path ), cacheDirectory ); @@ -468,15 +468,15 @@ public class MetadataSources implements Serializable { /** * INTENDED FOR TESTSUITE USE ONLY! *

- * Much like {@link #addCacheableFile(java.io.File)} except that here we will fail immediately if + * Much like {@link #addCacheableFile(File)} except that here we will fail immediately if * the cache version cannot be found or used for whatever reason * * @param file The xml file, not the bin! * * @return The dom "deserialized" from the cached file. * - * @throws org.hibernate.type.SerializationException Indicates a problem deserializing the cached dom tree - * @throws java.io.FileNotFoundException Indicates that the cached file was not found or was not usable. + * @throws SerializationException Indicates a problem deserializing the cached dom tree + * @throws FileNotFoundException Indicates that the cached file was not found or was not usable. */ public MetadataSources addCacheableFileStrictly(File file) throws SerializationException { final XmlSource xmlSource = XmlSources.fromCacheableFile( file, true ); @@ -488,15 +488,15 @@ public class MetadataSources implements Serializable { /** * INTENDED FOR TESTSUITE USE ONLY! *

- * Much like {@link #addCacheableFile(java.io.File)} except that here we will fail immediately if + * Much like {@link #addCacheableFile(File)} except that here we will fail immediately if * the cache version cannot be found or used for whatever reason * * @param file The xml file, not the bin! * * @return The dom "deserialized" from the cached file. * - * @throws org.hibernate.type.SerializationException Indicates a problem deserializing the cached dom tree - * @throws java.io.FileNotFoundException Indicates that the cached file was not found or was not usable. + * @throws SerializationException Indicates a problem deserializing the cached dom tree + * @throws FileNotFoundException Indicates that the cached file was not found or was not usable. */ public MetadataSources addCacheableFileStrictly(File file, File cacheDir) throws SerializationException { final XmlSource xmlSource = XmlSources.fromCacheableFile( file, cacheDir, true ); @@ -506,7 +506,7 @@ public class MetadataSources implements Serializable { } /** - * Read metadata from an {@link java.io.InputStream} access + * Read metadata from an {@link InputStream} access * * @param xmlInputStreamAccess Access to an input stream containing a DOM. * @@ -520,7 +520,7 @@ public class MetadataSources implements Serializable { } /** - * Read metadata from an {@link java.io.InputStream}. + * Read metadata from an {@link InputStream}. * * @param xmlInputStream The input stream containing a DOM. * @@ -534,7 +534,7 @@ public class MetadataSources implements Serializable { } /** - * Read mappings from a {@link java.net.URL} + * Read mappings from a {@link URL} * * @param url The url for the mapping document to be read. * @@ -548,7 +548,7 @@ public class MetadataSources implements Serializable { } /** - * Read mappings from a DOM {@link org.w3c.dom.Document} + * Read mappings from a DOM {@link Document} * * @param document The DOM document * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java index 2cb0caddcf..1d67fd9915 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java @@ -30,7 +30,7 @@ import org.hibernate.tuple.entity.EntityTuplizer; import org.hibernate.tuple.entity.EntityTuplizerFactory; /** - * The contract for building a {@link org.hibernate.SessionFactory} given a number of options. + * The contract for building a {@link SessionFactory} given a number of options. * * @author Steve Ebersole * @author Gail Badner @@ -178,7 +178,7 @@ public interface SessionFactoryBuilder { /** * Specifies a custom entity dirtiness strategy to be applied to the SessionFactory. See the contract - * of {@link org.hibernate.CustomEntityDirtinessStrategy} for details. + * of {@link CustomEntityDirtinessStrategy} for details. * * @param strategy The custom strategy to be used. * @@ -189,7 +189,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder applyCustomEntityDirtinessStrategy(CustomEntityDirtinessStrategy strategy); /** - * Specifies one or more entity name resolvers to be applied to the SessionFactory (see the {@link org.hibernate.EntityNameResolver} + * Specifies one or more entity name resolvers to be applied to the SessionFactory (see the {@link EntityNameResolver} * contract for more information.. Can be called multiple times to add additional resolvers.. * * @param entityNameResolvers The entityNameResolvers to add @@ -199,7 +199,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder addEntityNameResolver(EntityNameResolver... entityNameResolvers); /** - * Names the {@link org.hibernate.proxy.EntityNotFoundDelegate} to be applied to the SessionFactory. EntityNotFoundDelegate is a + * Names the {@link EntityNotFoundDelegate} to be applied to the SessionFactory. EntityNotFoundDelegate is a * strategy that accounts for different exceptions thrown between Hibernate and JPA when an entity cannot be found. * * @param entityNotFoundDelegate The delegate/strategy to use. @@ -267,7 +267,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder applyEntityTuplizerFactory(EntityTuplizerFactory entityTuplizerFactory); /** - * Register the default {@link org.hibernate.tuple.entity.EntityTuplizer} to be applied to the SessionFactory. + * Register the default {@link EntityTuplizer} to be applied to the SessionFactory. * * @param entityMode The entity mode that which this tuplizer will be applied. * @param tuplizerClass The custom tuplizer class. @@ -402,10 +402,10 @@ public interface SessionFactoryBuilder { /** * If using the built-in Hibernate JTA-based TransactionCoordinator/Builder, should it prefer to use - * {@link javax.transaction.UserTransaction} over {@link javax.transaction.Transaction}? + * {@link jakarta.transaction.UserTransaction} over {@link jakarta.transaction.Transaction}? * - * @param preferUserTransactions {@code true} indicates we should prefer {@link javax.transaction.UserTransaction}; - * {@code false} indicates we should prefer {@link javax.transaction.Transaction} + * @param preferUserTransactions {@code true} indicates we should prefer {@link jakarta.transaction.UserTransaction}; + * {@code false} indicates we should prefer {@link jakarta.transaction.Transaction} * * @return {@code this}, for method chaining * @@ -702,7 +702,7 @@ public interface SessionFactoryBuilder { /** * Apply a SQLFunction to the underlying {@link org.hibernate.query.sqm.function.SqmFunctionRegistry}. *

- * TODO : Ultimately I would like this to move to {@link org.hibernate.boot.MetadataBuilder} in conjunction with allowing mappings to reference SQLFunctions. + * TODO : Ultimately I would like this to move to {@link MetadataBuilder} in conjunction with allowing mappings to reference SQLFunctions. * today mappings can only name SQL functions directly, not through the SQLFunctionRegistry indirection * * @param registrationName The name to register it under. @@ -715,7 +715,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder allowOutOfTransactionUpdateOperations(boolean allow); /** - * Should resources held by {@link javax.persistence.EntityManager} instance be released immediately on close? + * Should resources held by {@link jakarta.persistence.EntityManager} instance be released immediately on close? *

* The other option is to release them as part of an after-transaction callback. * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java index 2c5c650c8d..11454fdb3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java @@ -152,7 +152,7 @@ public class ArchiveHelper { * * @throws IOException Indicates a problem accessing the stream * - * @see #getBytesFromInputStreamSafely(java.io.InputStream) + * @see #getBytesFromInputStreamSafely(InputStream) */ public static byte[] getBytesFromInputStream(InputStream inputStream) throws IOException { // Optimized by HHH-7835 diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java index af53a5ef8c..7b014dff8d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java @@ -27,7 +27,7 @@ import org.hibernate.boot.archive.spi.InputStreamAccess; import static org.hibernate.internal.log.UrlMessageBundle.URL_MESSAGE_LOGGER; /** - * An ArchiveDescriptor implementation leveraging the {@link java.util.jar.JarFile} API for processing. + * An ArchiveDescriptor implementation leveraging the {@link JarFile} API for processing. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java index 7c44e447a3..0c5aa54c1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java @@ -22,7 +22,7 @@ import org.hibernate.boot.archive.spi.InputStreamAccess; import static org.hibernate.internal.log.UrlMessageBundle.URL_MESSAGE_LOGGER; /** - * An ArchiveDescriptor implementation that works on archives accessible through a {@link java.util.jar.JarInputStream}. + * An ArchiveDescriptor implementation that works on archives accessible through a {@link JarInputStream}. * NOTE : This is less efficient implementation than {@link JarFileBasedArchiveDescriptor} * * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java index 8679accff6..37fa7f7d00 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java @@ -8,10 +8,10 @@ package org.hibernate.boot.archive.scan.spi; import java.io.IOException; import java.io.InputStream; -import javax.persistence.Converter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Converter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import org.hibernate.boot.archive.scan.internal.ClassDescriptorImpl; import org.hibernate.boot.archive.scan.internal.ScanResultCollector; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java index 71a34abb54..e96cf24438 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java @@ -18,12 +18,12 @@ import org.jboss.logging.Logger; import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEventLocator; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventReader; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java index 82f680bedd..d6dbfd0525 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java @@ -45,19 +45,19 @@ public class MappingReference { public static MappingReference consume(JaxbCfgMappingReferenceType jaxbMapping) { if ( StringHelper.isNotEmpty( jaxbMapping.getClazz() ) ) { - return new MappingReference( MappingReference.Type.CLASS, jaxbMapping.getClazz() ); + return new MappingReference( Type.CLASS, jaxbMapping.getClazz() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getFile() ) ) { - return new MappingReference( MappingReference.Type.FILE, jaxbMapping.getFile() ); + return new MappingReference( Type.FILE, jaxbMapping.getFile() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getResource() ) ) { - return new MappingReference( MappingReference.Type.RESOURCE, jaxbMapping.getResource() ); + return new MappingReference( Type.RESOURCE, jaxbMapping.getResource() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getJar() ) ) { - return new MappingReference( MappingReference.Type.JAR, jaxbMapping.getJar() ); + return new MappingReference( Type.JAR, jaxbMapping.getJar() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getPackage() ) ) { - return new MappingReference( MappingReference.Type.PACKAGE, jaxbMapping.getPackage() ); + return new MappingReference( Type.PACKAGE, jaxbMapping.getPackage() ); } else { throw new ConfigurationException( " named unexpected reference type" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java index f6cd496811..77d5f655b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java @@ -11,7 +11,7 @@ import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; /** - * The default implementation of {@link org.hibernate.CustomEntityDirtinessStrategy} which does nada. + * The default implementation of {@link CustomEntityDirtinessStrategy} which does nada. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java index 725a902a04..a995979de4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java @@ -8,9 +8,9 @@ package org.hibernate.boot.internal; import java.util.ArrayList; import java.util.UUID; -import javax.persistence.GenerationType; -import javax.persistence.SequenceGenerator; -import javax.persistence.TableGenerator; +import jakarta.persistence.GenerationType; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.TableGenerator; import org.hibernate.boot.model.IdGeneratorStrategyInterpreter; import org.hibernate.boot.model.IdentifierGeneratorDefinition; @@ -215,7 +215,7 @@ public class IdGeneratorInterpreterImpl implements IdGeneratorStrategyInterprete return "identity"; } case SEQUENCE: { - return org.hibernate.id.enhanced.SequenceStyleGenerator.class.getName(); + return SequenceStyleGenerator.class.getName(); } case TABLE: { return org.hibernate.id.enhanced.TableGenerator.class.getName(); @@ -232,7 +232,7 @@ public class IdGeneratorInterpreterImpl implements IdGeneratorStrategyInterprete return UUIDGenerator.class.getName(); } - return org.hibernate.id.enhanced.SequenceStyleGenerator.class.getName(); + return SequenceStyleGenerator.class.getName(); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java index 2d3089b178..a789ab3706 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java @@ -20,10 +20,10 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.AttributeConverter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MapsId; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MapsId; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; @@ -1124,7 +1124,7 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector else if ( clazz.isAnnotationPresent( Embeddable.class ) ) { type = AnnotatedClassType.EMBEDDABLE; } - else if ( clazz.isAnnotationPresent( javax.persistence.MappedSuperclass.class ) ) { + else if ( clazz.isAnnotationPresent( jakarta.persistence.MappedSuperclass.class ) ) { type = AnnotatedClassType.EMBEDDABLE_SUPERCLASS; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java index e5b87b4fd4..0f6f16a5ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java @@ -10,9 +10,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; -import javax.persistence.AttributeConverter; -import javax.persistence.ConstraintMode; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.HibernateException; import org.hibernate.MultiTenancyStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java index 01d7f4737e..5b644c93df 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java @@ -11,9 +11,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -38,7 +38,7 @@ import static org.hibernate.procedure.spi.NamedCallableQueryMemento.ParameterMem * * @author Steve Ebersole * - * @see javax.persistence.NamedStoredProcedureQuery + * @see jakarta.persistence.NamedStoredProcedureQuery */ public class NamedProcedureCallDefinitionImpl implements NamedProcedureCallDefinition { private final String registeredName; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java index 9efe198188..142d7b3ec9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java @@ -135,7 +135,7 @@ import static org.hibernate.internal.CoreLogging.messageLogger; import static org.hibernate.jpa.AvailableSettings.DISCARD_PC_ON_CLOSE; /** - * In-flight state of {@link org.hibernate.boot.spi.SessionFactoryOptions} + * In-flight state of {@link SessionFactoryOptions} * during {@link org.hibernate.boot.SessionFactoryBuilder} processing. * * The intention is that SessionFactoryBuilder internally creates and populates diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java index 30c21ac2d3..a4775c3462 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java @@ -7,9 +7,9 @@ package org.hibernate.boot.jaxb.internal; import java.io.InputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java index 6f0b31232b..bd0dad1733 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java @@ -6,9 +6,9 @@ */ package org.hibernate.boot.jaxb.internal; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEventLocator; /** * ValidationEventHandler implementation providing easier access to where (line/column) an error occurred. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java index 50732a690d..6cf11d0148 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java @@ -6,8 +6,8 @@ */ package org.hibernate.boot.jaxb.internal; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java index f1a3242cac..125023d403 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java @@ -27,7 +27,7 @@ import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.w3c.dom.Document; /** - * Helper for building and handling {@link org.hibernate.boot.jaxb.spi.XmlSource} references + * Helper for building and handling {@link XmlSource} references * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java index 1a91f9be60..f202a79a7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java @@ -17,9 +17,9 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; /** - * Base class for {@link javax.xml.stream.XMLEventReader}s that want to modify or remove events from the reader stream. - * If a {@link javax.xml.stream.events.StartElement} event is removed the subclass's {@link #filterEvent(javax.xml.stream.events.XMLEvent, boolean)} will - * not see any events until after the matching {@link javax.xml.stream.events.EndElement} event. + * Base class for {@link XMLEventReader}s that want to modify or remove events from the reader stream. + * If a {@link StartElement} event is removed the subclass's {@link #filterEvent(XMLEvent, boolean)} will + * not see any events until after the matching {@link EndElement} event. * * Note, copied from the uPortal project by permission of author. See * https://github.com/Jasig/uPortal/blob/master/uportal-war/src/main/java/org/jasig/portal/xml/stream/FilteringXMLEventReader.java diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java index 12f4477673..50f3b0ec9a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java @@ -7,7 +7,6 @@ package org.hibernate.boot.jaxb.internal.stax; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import javax.xml.namespace.QName; @@ -21,11 +20,10 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import javax.xml.stream.util.EventReaderDelegate; -import org.hibernate.boot.xsd.LocalXsdResolver; import org.hibernate.boot.xsd.MappingXsdSupport; /** - * A JPA {@code orm.xml} specific StAX EVentReader to handle a few oddities. + * StAX EVentReader which handles a few oddities specific to JPA {@code orm.xml} * * Mainly we handle the namespace change. * @@ -40,11 +38,6 @@ import org.hibernate.boot.xsd.MappingXsdSupport; */ public class JpaOrmXmlEventReader extends EventReaderDelegate { - private static final List NAMESPACE_URIS_TO_MAP = Collections.singletonList( - // JPA 1.0 and 2.0 namespace uri - "http://java.sun.com/xml/ns/persistence/orm" - ); - private static final String ROOT_ELEMENT_NAME = "entity-mappings"; private static final String VERSION_ATTRIBUTE_NAME = "version"; @@ -82,8 +75,8 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { } private StartElement wrap(StartElement startElement) { - List newElementAttributeList = mapAttributes( startElement ); - List newNamespaceList = mapNamespaces( startElement ); + final List newElementAttributeList = mapAttributes( startElement ); + final List newNamespaceList = mapNamespaces( startElement ); // Transfer the location info from the incoming event to the event factory // so that the event we ask it to generate for us has the same location info @@ -98,7 +91,7 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { private List mapAttributes(StartElement startElement) { final List mappedAttributes = new ArrayList<>(); - Iterator existingAttributesIterator = existingXmlAttributesIterator( startElement ); + final Iterator existingAttributesIterator = existingXmlAttributesIterator( startElement ); while ( existingAttributesIterator.hasNext() ) { final Attribute originalAttribute = existingAttributesIterator.next(); final Attribute attributeToUse = mapAttribute( startElement, originalAttribute ); @@ -126,11 +119,11 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { if ( VERSION_ATTRIBUTE_NAME.equals( originalAttribute.getName().getLocalPart() ) ) { final String specifiedVersion = originalAttribute.getValue(); - if ( !LocalXsdResolver.isValidJpaVersion( specifiedVersion ) ) { + if ( ! MappingXsdSupport.isValidJpaVersion( specifiedVersion ) ) { throw new BadVersionException( specifiedVersion ); } - return xmlEventFactory.createAttribute( VERSION_ATTRIBUTE_NAME, LocalXsdResolver.latestJpaVerison() ); + return xmlEventFactory.createAttribute( VERSION_ATTRIBUTE_NAME, MappingXsdSupport.latestJpaDescriptor().getVersion() ); } } @@ -169,9 +162,12 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { } private Namespace mapNamespace(Namespace originalNamespace) { - if ( NAMESPACE_URIS_TO_MAP.contains( originalNamespace.getNamespaceURI() ) ) { + if ( MappingXsdSupport.shouldBeMappedToLatestJpaDescriptor( originalNamespace.getNamespaceURI() ) ) { // this is a namespace "to map" so map it - return xmlEventFactory.createNamespace( originalNamespace.getPrefix(), MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri() ); + return xmlEventFactory.createNamespace( + originalNamespace.getPrefix(), + MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri() + ); } return originalNamespace; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java index 0897b2bece..9f22cb2ff3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java @@ -68,7 +68,7 @@ public enum LocalSchema { return schema; } - private static javax.xml.validation.Schema resolveLocalSchema(String schemaName) { + private static Schema resolveLocalSchema(String schemaName) { return resolveLocalSchema( resolveLocalSchemaUrl( schemaName ) ); } @@ -80,7 +80,7 @@ public enum LocalSchema { return url; } - private static javax.xml.validation.Schema resolveLocalSchema(URL schemaUrl) { + private static Schema resolveLocalSchema(URL schemaUrl) { try { InputStream schemaStream = schemaUrl.openStream(); try { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java index 89a749a2d1..87a3f5c1d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java @@ -12,10 +12,13 @@ import java.net.URL; import javax.xml.stream.XMLStreamException; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; -import org.hibernate.internal.log.DeprecationLogger; +import org.hibernate.boot.xsd.ConfigXsdSupport; +import org.hibernate.boot.xsd.MappingXsdSupport; import org.jboss.logging.Logger; +import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER; + /** * @author Steve Ebersole */ @@ -36,72 +39,57 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver { if ( namespace != null ) { log.debugf( "Interpreting namespace : %s", namespace ); - if ( INITIAL_JPA_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( INITIAL_JPA_XSD_MAPPING.getMappedLocalUrl() ); + if ( MappingXsdSupport.jpa10.getNamespaceUri().matches( namespace ) ) { + // JPA 1.0 and 2.0 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.jpa10.getLocalResourceName() ) ); } - else if ( JPA_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( JPA_XSD_MAPPING.getMappedLocalUrl() ); + else if ( MappingXsdSupport.jpa21.getNamespaceUri().matches( namespace ) ) { + // JPA 2.1 and 2.2 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.jpa21.getLocalResourceName() ) ); } - else if ( PERSISTENCE_ORM_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( PERSISTENCE_ORM_XSD_MAPPING.getMappedLocalUrl() ); + else if ( ConfigXsdSupport.getJPA10().getNamespaceUri().matches( namespace ) ) { + // JPA 1.0 and 2.0 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( ConfigXsdSupport.getJPA10().getLocalResourceName() ) ); } - else if ( PERSISTENCE_ORM_XSD_MAPPING2.matches( namespace ) ) { - return openUrlStream( PERSISTENCE_ORM_XSD_MAPPING2.getMappedLocalUrl() ); + else if ( ConfigXsdSupport.getJPA21().getNamespaceUri().matches( namespace ) ) { + // JPA 2.1 and 2.2 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( ConfigXsdSupport.getJPA21().getLocalResourceName() ) ); } - else if ( HBM_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( HBM_XSD_MAPPING.getMappedLocalUrl() ); + else if ( MappingXsdSupport.hibernateMappingXml.getNamespaceUri().matches( namespace ) ) { + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.hibernateMappingXml.getLocalResourceName() ) ); } - else if ( HBM_XSD_MAPPING2.matches( namespace ) ) { - return openUrlStream( HBM_XSD_MAPPING2.getMappedLocalUrl() ); + else if ( MappingXsdSupport.hbmXml.getNamespaceUri().matches( namespace ) ) { + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.hbmXml.getLocalResourceName() ) ); } - else if ( CFG_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( CFG_XSD_MAPPING.getMappedLocalUrl() ); + else if ( ConfigXsdSupport.cfgXsd().getNamespaceUri().matches( namespace ) ) { + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( ConfigXsdSupport.cfgXsd().getLocalResourceName() ) ); } } if ( publicID != null || systemID != null ) { - log.debugf( "Interpreting public/system identifier : [%s] - [%s]", publicID, systemID ); - if ( HBM_DTD_MAPPING.matches( publicID, systemID ) ) { - log.debug( - "Recognized hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() ); + log.debugf( "Checking public/system identifiers `%s`/`%s` as DTD references", publicID, systemID ); + + if ( MAPPING_DTD.matches( publicID, systemID ) ) { + return openUrlStream( MAPPING_DTD.localSchemaUrl ); } - else if ( LEGACY_HBM_DTD_MAPPING.matches( publicID, systemID ) ) { - DeprecationLogger.DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( - LEGACY_HBM_DTD_MAPPING.getIdentifierBase(), - HBM_DTD_MAPPING.getIdentifierBase() - ); - log.debug( - "Recognized legacy hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() ); + + if ( LEGACY_MAPPING_DTD.matches( publicID, systemID ) ) { + DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( LEGACY_MAPPING_DTD.getIdentifierBase(), MAPPING_DTD.getIdentifierBase() ); + return openUrlStream( MAPPING_DTD.localSchemaUrl ); } - else if ( LEGACY2_HBM_DTD_MAPPING.matches( publicID, systemID ) ) { - DeprecationLogger.DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( - LEGACY2_HBM_DTD_MAPPING.getIdentifierBase(), - HBM_DTD_MAPPING.getIdentifierBase() - ); - log.debug( - "Recognized legacy hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() ); + + if ( LEGACY2_MAPPING_DTD.matches( publicID, systemID ) ) { + DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( LEGACY2_MAPPING_DTD.getIdentifierBase(), MAPPING_DTD.getIdentifierBase() ); + return openUrlStream( MAPPING_DTD.localSchemaUrl ); } - else if ( CFG_DTD_MAPPING.matches( publicID, systemID ) ) { - log.debug( - "Recognized hibernate-configuration identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( CFG_DTD_MAPPING.getMappedLocalUrl() ); + + if ( CFG_DTD.matches( publicID, systemID ) ) { + return openUrlStream( CFG_DTD.localSchemaUrl ); } - else if ( LEGACY_CFG_DTD_MAPPING.matches( publicID, systemID ) ) { - DeprecationLogger.DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( - LEGACY_CFG_DTD_MAPPING.getIdentifierBase(), - CFG_DTD_MAPPING.getIdentifierBase() - ); - log.debug( - "Recognized hibernate-configuration identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( CFG_DTD_MAPPING.getMappedLocalUrl() ); + + if ( LEGACY_CFG_DTD.matches( publicID, systemID ) ) { + DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( LEGACY_CFG_DTD.getIdentifierBase(), CFG_DTD.getIdentifierBase() ); + return openUrlStream( CFG_DTD.localSchemaUrl ); } } @@ -143,119 +131,58 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver { } } - /** - * Maps the namespace for the orm.xml xsd for jpa 1.0 and 2.0 - */ - public static final NamespaceSchemaMapping INITIAL_JPA_XSD_MAPPING = new NamespaceSchemaMapping( - "http://java.sun.com/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_2_0.xsd" - ); - - /** - * Maps the namespace for the orm.xml xsd for jpa 2.1+ - */ - public static final NamespaceSchemaMapping JPA_XSD_MAPPING = new NamespaceSchemaMapping( - "http://xmlns.jcp.org/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_2_1.xsd" - ); - - /** - * Maps the namespace for the orm.xml xsd for Jakarta Persistence 2.2 - */ - public static final NamespaceSchemaMapping PERSISTENCE_ORM_XSD_MAPPING = new NamespaceSchemaMapping( - "http://xmlns.jcp.org/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_2_2.xsd" - ); - - /** - * Maps the namespace for the orm.xml xsd for Jakarta Persistence 3.0 - */ - public static final NamespaceSchemaMapping PERSISTENCE_ORM_XSD_MAPPING2 = new NamespaceSchemaMapping( - "https://jakarta.ee/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_3_0.xsd" - ); - - public static final NamespaceSchemaMapping HBM_XSD_MAPPING = new NamespaceSchemaMapping( - "http://www.hibernate.org/xsd/orm/hbm", - "org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd" - ); - - public static final NamespaceSchemaMapping HBM_XSD_MAPPING2 = new NamespaceSchemaMapping( - "http://www.hibernate.org/xsd/hibernate-mapping", - "org/hibernate/hibernate-mapping-4.0.xsd" - ); - - public static final NamespaceSchemaMapping CFG_XSD_MAPPING = new NamespaceSchemaMapping( - "http://www.hibernate.org/xsd/orm/cfg", - "org/hibernate/xsd/cfg/legacy-configuration-4.0.xsd" - ); - - public static final DtdMapping HBM_DTD_MAPPING = new DtdMapping( - "http://www.hibernate.org/dtd/hibernate-mapping", + public static final DtdDescriptor MAPPING_DTD = new DtdDescriptor( + "www.hibernate.org/dtd/hibernate-mapping", "org/hibernate/hibernate-mapping-3.0.dtd" ); - public static final DtdMapping LEGACY_HBM_DTD_MAPPING = new DtdMapping( - "http://www.hibernate.org/dtd/hibernate-mapping", + public static final DtdDescriptor LEGACY_MAPPING_DTD = new DtdDescriptor( + "www.hibernate.org/dtd/hibernate-mapping", "org/hibernate/hibernate-mapping-3.0.dtd" ); - public static final DtdMapping LEGACY2_HBM_DTD_MAPPING = new DtdMapping( - "http://hibernate.sourceforge.net/hibernate-mapping", + public static final DtdDescriptor LEGACY2_MAPPING_DTD = new DtdDescriptor( + "hibernate.sourceforge.net/hibernate-mapping", "org/hibernate/hibernate-mapping-3.0.dtd" ); - public static final DtdMapping CFG_DTD_MAPPING = new DtdMapping( - "http://www.hibernate.org/dtd/hibernate-configuration", + public static final DtdDescriptor CFG_DTD = new DtdDescriptor( + "www.hibernate.org/dtd/hibernate-configuration", "org/hibernate/hibernate-configuration-3.0.dtd" ); - public static final DtdMapping LEGACY_CFG_DTD_MAPPING = new DtdMapping( - "http://hibernate.sourceforge.net/hibernate-configuration", + public static final DtdDescriptor LEGACY_CFG_DTD = new DtdDescriptor( + "hibernate.sourceforge.net/hibernate-configuration", "org/hibernate/hibernate-configuration-3.0.dtd" ); - public static class NamespaceSchemaMapping { - private final String namespace; + public static class DtdDescriptor { + private final String httpBase; + private final String httpsBase; private final URL localSchemaUrl; - public NamespaceSchemaMapping(String namespace, String resourceName) { - this.namespace = namespace; - this.localSchemaUrl = LocalSchemaLocator.resolveLocalSchemaUrl( resourceName ); - } - - public boolean matches(String namespace) { - return this.namespace.equals( namespace ); - } - - public URL getMappedLocalUrl() { - return localSchemaUrl; - } - } - - public static class DtdMapping { - private final String identifierBase; - private final URL localSchemaUrl; - - public DtdMapping(String identifierBase, String resourceName) { - this.identifierBase = identifierBase; + public DtdDescriptor(String identifierBase, String resourceName) { + this.httpBase = "http://" + identifierBase; + this.httpsBase = "https://" + identifierBase; this.localSchemaUrl = LocalSchemaLocator.resolveLocalSchemaUrl( resourceName ); } public String getIdentifierBase() { - return identifierBase; + return httpBase; } public boolean matches(String publicId, String systemId) { if ( publicId != null ) { - if ( publicId.startsWith( identifierBase ) ) { + if ( publicId.startsWith( httpBase ) + || publicId.matches( httpsBase ) ) { return true; } } if ( systemId != null ) { - if ( systemId.startsWith( identifierBase ) ) { + if ( systemId.startsWith( httpBase ) + || systemId.matches( httpsBase ) ) { return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java index 6d413c8024..9795d689a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.AccessType; +import jakarta.persistence.AccessType; /** * Marshalling support for dealing with JPA AccessType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java index 48049d56a7..0fdfea728a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.ConstraintMode; +import jakarta.persistence.ConstraintMode; /** * Marshalling support for dealing with JPA ConstraintMode enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java index 06ece7dff1..7e83f88b57 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorType; /** * Marshalling support for dealing with JPA DiscriminatorType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java index 9164ad6e6f..e0784744ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; /** * Marshalling support for dealing with JPA EnumType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java index 537c76377d..d4415f9ea1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.FetchType; +import jakarta.persistence.FetchType; /** * Marshalling support for dealing with JPA FetchType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java index 04e815d939..a2c4308f36 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.GenerationType; +import jakarta.persistence.GenerationType; /** * Marshalling support for dealing with JPA GenerationType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java index 93668921b7..22ad54e650 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.InheritanceType; +import jakarta.persistence.InheritanceType; /** * Marshalling support for dealing with JPA InheritanceType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java index fb975cc756..2990e96d53 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Marshalling support for dealing with JPA LockModeType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java index a481933400..f4389454a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; /** * Marshalling support for dealing with JPA ParameterMode enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java index 09ace499db..fb23ff6842 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * Marshalling support for dealing with JPA TemporalType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java index dc81a6f224..8cf4df7e00 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java @@ -7,8 +7,8 @@ package org.hibernate.boot.jaxb.mapping.spi; import java.util.List; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; /** * Common interface for Jaxb bindings that represent persistent collection attributes. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java index edce1ae655..03ce9ef0b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.spi; -import javax.persistence.FetchType; +import jakarta.persistence.FetchType; /** * Common interface for JAXB bindings that represent attributes with laziness and fetch style. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java index 7d8da934bd..a2498e78ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.spi; -import javax.persistence.AccessType; +import jakarta.persistence.AccessType; /** * Common interface for JAXB bindings representing entities, mapped-superclasses and embeddables (JPA collective diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java index 79ded21dc1..0345884f43 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java @@ -8,7 +8,7 @@ package org.hibernate.boot.jaxb.mapping.spi; import java.io.Serializable; import java.util.List; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; public interface NamedQuery extends Serializable { String getDescription(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java index f1ee13b1ed..bd879814d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.spi; -import javax.persistence.AccessType; +import jakarta.persistence.AccessType; /** * Common interface for JAXB bindings that represent persistent attributes. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java b/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java index 81ea7c2136..404fedff5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java @@ -6,10 +6,10 @@ */ package org.hibernate.boot.model; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.SequenceGenerator; -import javax.persistence.TableGenerator; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.TableGenerator; /** * Strategy for interpreting identifier generator related information. @@ -43,7 +43,7 @@ public interface IdGeneratorStrategyInterpreter { * For implementations that need it, the {@link GeneratedValue#generator()} * is passed as part of the `context`. * - * @param generationType The {@link javax.persistence.GeneratedValue#strategy} value + * @param generationType The {@link jakarta.persistence.GeneratedValue#strategy} value * @param context The context for resolution (method parameter object) * * @return The {@link org.hibernate.id.IdentifierGenerator} name (FQN, short name, etc) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java index 2cd08e243f..6972b44f26 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java @@ -41,13 +41,13 @@ import org.hibernate.usertype.UserType; /** * Models the information pertaining to a custom type definition supplied by the user. Used - * to delay instantiation of the actual {@link org.hibernate.type.Type} instance. + * to delay instantiation of the actual {@link Type} instance. * * Generally speaking this information would come from annotations * ({@link org.hibernate.annotations.TypeDef}) or XML mappings. An alternative form of * supplying custom types is programmatically via one of:

    - *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.type.BasicType)}
    • - *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.usertype.UserType, String[])}
    • + *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(BasicType)}
    • + *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(UserType, String[])}
    • *
  • {@link org.hibernate.boot.MetadataBuilder#applyTypes(TypeContributor)}
    • *
* diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java index 24d6159298..1df2f073cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java @@ -7,8 +7,8 @@ package org.hibernate.boot.model.convert.internal; import java.util.List; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.hibernate.AnnotationException; import org.hibernate.boot.internal.ClassmateContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java index 2df2223341..73d2d05a0d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.model.convert.internal; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.internal.ClassmateContext; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java index f391d6a078..f2e9d6ad2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.model.convert.internal; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.internal.ClassmateContext; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java index aa9910407b..4a71715e53 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java @@ -7,7 +7,7 @@ /** * Package defining boot-time handling of JPA's - * {@link javax.persistence.AttributeConverter} + * {@link jakarta.persistence.AttributeConverter} * * The general paradigm is that handling converters is split into a * boot-time piece and a run-time piece. This package defines the diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java index 8bca894438..ce92598779 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.model.convert.spi; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java index 340f656c82..ef36d878ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java @@ -31,7 +31,7 @@ public interface EntityNaming { public String getEntityName(); /** - * The JPA-specific entity name. See {@link javax.persistence.Entity#name()} for details. + * The JPA-specific entity name. See {@link jakarta.persistence.Entity#name()} for details. * * @return The JPA entity name, if one was specified. May return {@code null} if one * was not explicitly specified. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java index a796e38187..b2d1e0ae5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.model.source.spi.AttributePath; * * @author Steve Ebersole * - * @see javax.persistence.Column + * @see jakarta.persistence.Column */ public interface ImplicitBasicColumnNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java index 14f6e53cff..b12a5da472 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.model.source.spi.AttributePath; * * @author Steve Ebersole * - * @see javax.persistence.CollectionTable + * @see jakarta.persistence.CollectionTable */ public interface ImplicitCollectionTableNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java index 0a16ee3fec..40da30c853 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java @@ -10,11 +10,11 @@ import org.hibernate.boot.model.source.spi.AttributePath; /** * Context for determining the implicit name of a "join column" (think - * {@link javax.persistence.JoinColumn}). + * {@link jakarta.persistence.JoinColumn}). * * @author Steve Ebersole * - * @see javax.persistence.JoinColumn + * @see jakarta.persistence.JoinColumn */ public interface ImplicitJoinColumnNameSource extends ImplicitNameSource { public static enum Nature { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java index a2368abe7e..116de065dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.model.source.spi.AttributePath; * * @author Steve Ebersole * - * @see javax.persistence.JoinTable + * @see jakarta.persistence.JoinTable */ public interface ImplicitJoinTableNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java index 7c77c574cd..f06c69e2d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java @@ -11,13 +11,13 @@ import org.hibernate.boot.model.source.spi.AttributePath; /** * Context for determining the implicit name of a column used to back the key * of a {@link java.util.Map}. This is used for both - * {@link javax.persistence.MapKeyColumn} and - * {@link javax.persistence.MapKeyJoinColumn} cases. + * {@link jakarta.persistence.MapKeyColumn} and + * {@link jakarta.persistence.MapKeyJoinColumn} cases. * * @author Steve Ebersole * - * @see javax.persistence.MapKeyColumn - * @see javax.persistence.MapKeyJoinColumn + * @see jakarta.persistence.MapKeyColumn + * @see jakarta.persistence.MapKeyJoinColumn */ public interface ImplicitMapKeyColumnNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java index 57eea2b2be..9e3e9c151b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java @@ -18,10 +18,10 @@ package org.hibernate.boot.model.naming; *
  • * Entity primary table - {@link #determinePrimaryTableName}. Used when the * primary table for an entity is not explicitly named in the metadata. See - * {@link javax.persistence.Table} for details. + * {@link jakarta.persistence.Table} for details. *
    • *
  • - * Join table - {@link #determineJoinTableName}. See {@link javax.persistence.JoinTable} + * Join table - {@link #determineJoinTableName}. See {@link jakarta.persistence.JoinTable} * for details. Join table covers basically any entity association whether in the form * of a collection of entities (one-to-many, many-to-many) or a singular entity association * (many-to-one, and occasionally one-to-one). @@ -29,7 +29,7 @@ package org.hibernate.boot.model.naming; *
  • * Collection table - {@link #determineCollectionTableName} - Collection table * refers to any non-entity collection (basic, component/embeddable, any). See - * {@link javax.persistence.CollectionTable} for details. + * {@link jakarta.persistence.CollectionTable} for details. *
    • *
  • * Notice that secondary tables are not mentioned, since they must always be explicitly named @@ -114,7 +114,7 @@ public interface ImplicitNamingStrategy { public Identifier determineBasicColumnName(ImplicitBasicColumnNameSource source); /** - * Determine the column name related to {@link javax.persistence.JoinColumn}. In + * Determine the column name related to {@link jakarta.persistence.JoinColumn}. In * {@code hbm.xml} terms, this would be a {@code } defined for a collection * or the column associated with a many-to-one. * @@ -125,7 +125,7 @@ public interface ImplicitNamingStrategy { public Identifier determineJoinColumnName(ImplicitJoinColumnNameSource source); /** - * Determine the column name related to {@link javax.persistence.PrimaryKeyJoinColumn}. In + * Determine the column name related to {@link jakarta.persistence.PrimaryKeyJoinColumn}. In * {@code hbm.xml} terms, this would be a {@code } defined for a {@code } * or a {@code } (others?) * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java index 4ae2299aae..ae96d6a7f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java @@ -18,7 +18,7 @@ import org.hibernate.internal.util.StringHelper; * to JPA standards. *

    * For the legacy JPA-based naming standards initially implemented by Hibernate, - * see/use {@link org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl} + * see/use {@link ImplicitNamingStrategyLegacyJpaImpl} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java index 1f0c88826a..cdaaa08c93 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java @@ -16,12 +16,12 @@ public interface NamingStrategyHelper { * Called when the user supplied no explicit name/identifier for the given database object. *

    * Typically implementations will access the {@link ImplicitNamingStrategy} via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getBuildingOptions()} -> + * {@link MetadataBuildingContext#getBuildingOptions()} -> * {@link org.hibernate.boot.spi.MetadataBuildingOptions#getImplicitNamingStrategy()} *

    * For proper quoting, {@link org.hibernate.boot.model.relational.Database#toIdentifier(String)} * should be used via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getMetadataCollector()} -> + * {@link MetadataBuildingContext#getMetadataCollector()} -> * {@link org.hibernate.boot.spi.InFlightMetadataCollector#getDatabase()} * * @param buildingContext The building context in which this is called. @@ -34,12 +34,12 @@ public interface NamingStrategyHelper { * Called when the user has supplied an explicit name for the database object. *

    * Typically implementations will access the {@link ImplicitNamingStrategy} via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getBuildingOptions()} -> + * {@link MetadataBuildingContext#getBuildingOptions()} -> * {@link org.hibernate.boot.spi.MetadataBuildingOptions#getImplicitNamingStrategy()} *

    * For proper quoting, {@link org.hibernate.boot.model.relational.Database#toIdentifier(String)} * should be used via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getMetadataCollector()} -> + * {@link MetadataBuildingContext#getMetadataCollector()} -> * {@link org.hibernate.boot.spi.InFlightMetadataCollector#getDatabase()} * * @param explicitName The explicit object name. @@ -53,12 +53,12 @@ public interface NamingStrategyHelper { * Handle converting a logical name to a physical name *

    * Typically implementations will access the {@link PhysicalNamingStrategy} via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getBuildingOptions()} -> + * {@link MetadataBuildingContext#getBuildingOptions()} -> * {@link org.hibernate.boot.spi.MetadataBuildingOptions#getPhysicalNamingStrategy()} *

    * For proper quoting, {@link org.hibernate.boot.model.relational.Database#toIdentifier(String)} * should be used via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getMetadataCollector()} -> + * {@link MetadataBuildingContext#getMetadataCollector()} -> * {@link org.hibernate.boot.spi.InFlightMetadataCollector#getDatabase()} * * @param logicalName The logical name to convert to a physical name diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java index 824b009ad3..cfb17768aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java @@ -95,8 +95,8 @@ public abstract class ObjectNameNormalizer { /** * Intended only for use in handling quoting requirements for {@code column-definition} - * as defined by {@link javax.persistence.Column#columnDefinition()}, - * {@link javax.persistence.JoinColumn#columnDefinition}, etc. This method should not + * as defined by {@link jakarta.persistence.Column#columnDefinition()}, + * {@link jakarta.persistence.JoinColumn#columnDefinition}, etc. This method should not * be called in any other scenario. * * @param text The specified column definition @@ -112,9 +112,9 @@ public abstract class ObjectNameNormalizer { /** * Access the contextual information related to the current process of building metadata. Here, * that typically might be needed for accessing:

      - *
    • {@link org.hibernate.boot.model.naming.ImplicitNamingStrategy}
      • - *
    • {@link org.hibernate.boot.model.naming.PhysicalNamingStrategy}
      • - *
    • {@link org.hibernate.boot.model.relational.Database}
      • + *
    • {@link ImplicitNamingStrategy}
      • + *
    • {@link PhysicalNamingStrategy}
      • + *
    • {@link Database}
      • *
    * * @return The current building context diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java index 3fc7f8c721..bfde63a91a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java @@ -10,8 +10,8 @@ import java.io.Serializable; import java.lang.reflect.Type; import java.util.function.Function; import java.util.function.Supplier; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; import org.hibernate.MappingException; import org.hibernate.mapping.BasicValue; @@ -49,7 +49,7 @@ public class InferredBasicValueResolver { public static BasicValue.Resolution from( Function explicitJavaTypeAccess, Function explicitSqlTypeAccess, - java.lang.reflect.Type resolvedJavaType, + Type resolvedJavaType, Supplier reflectedJtdResolver, JdbcTypeDescriptorIndicators stdIndicators, Table table, @@ -364,7 +364,7 @@ public class InferredBasicValueResolver { TemporalJavaTypeDescriptor reflectedJtd, BasicJavaDescriptor explicitJavaType, JdbcTypeDescriptor explicitJdbcType, - java.lang.reflect.Type resolvedJavaType, + Type resolvedJavaType, JdbcTypeDescriptorIndicators stdIndicators, TypeConfiguration typeConfiguration) { final TemporalType requestedTemporalPrecision = stdIndicators.getTemporalPrecision(); @@ -384,7 +384,7 @@ public class InferredBasicValueResolver { if ( requestedTemporalPrecision != null && explicitTemporalJtd.getPrecision() != requestedTemporalPrecision ) { throw new MappingException( - "Temporal precision (`javax.persistence.TemporalType`) mismatch... requested precision = " + requestedTemporalPrecision + + "Temporal precision (`jakarta.persistence.TemporalType`) mismatch... requested precision = " + requestedTemporalPrecision + "; explicit JavaTypeDescriptor (`" + explicitTemporalJtd + "`) precision = " + explicitTemporalJtd.getPrecision() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java index f7ce186370..cb49823700 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java @@ -7,7 +7,7 @@ package org.hibernate.boot.model.process.internal; import java.util.function.Function; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.model.convert.internal.ClassBasedConverterDescriptor; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java index f7d0f76c29..d1ad65e694 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java @@ -39,7 +39,7 @@ import org.hibernate.service.ServiceRegistry; import org.jboss.logging.Logger; /** - * Coordinates the process of executing {@link org.hibernate.boot.archive.scan.spi.Scanner} (if enabled) + * Coordinates the process of executing {@link Scanner} (if enabled) * and applying the resources (classes, packages and mappings) discovered. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java index 4403bbc18f..b85dce92d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java @@ -7,7 +7,7 @@ package org.hibernate.boot.model.process.internal; import java.util.function.Function; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java index 9273c0c779..f6cdf8d96f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java @@ -52,7 +52,7 @@ import org.jboss.jandex.IndexView; import org.jboss.logging.Logger; /** - * Represents the process of of transforming a {@link org.hibernate.boot.MetadataSources} + * Represents the process of of transforming a {@link MetadataSources} * reference into a {@link org.hibernate.boot.Metadata} reference. Allows for 2 different process paradigms:
      *
    • * Single step : as defined by the {@link #build} method; internally leverages the 2-step paradigm @@ -356,7 +356,7 @@ public class MetadataBuildingProcess { final TypeContributions typeContributions = new TypeContributions() { @Override - public void contributeType(org.hibernate.type.BasicType type) { + public void contributeType(BasicType type) { getBasicTypeRegistry().register( type ); final JavaTypeDescriptor jtd; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java index c504f42d02..99f1479671 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java @@ -11,11 +11,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.common.reflection.MetadataProviderInjector; import org.hibernate.annotations.common.reflection.ReflectionManager; @@ -245,7 +245,7 @@ public class AnnotationMetadataSourceProcessorImpl implements MetadataSourceProc private void insertMappedSuperclasses(List original, List copy) { final boolean debug = log.isDebugEnabled(); for ( XClass clazz : original ) { - if ( clazz.isAnnotationPresent( javax.persistence.MappedSuperclass.class ) ) { + if ( clazz.isAnnotationPresent( jakarta.persistence.MappedSuperclass.class ) ) { if ( debug ) { log.debugf( "Skipping explicit MappedSuperclass %s, the class will be discovered analyzing the implementing class", @@ -260,7 +260,7 @@ public class AnnotationMetadataSourceProcessorImpl implements MetadataSourceProc && !reflectionManager.equals( superClass, Object.class ) && !copy.contains( superClass ) ) { if ( superClass.isAnnotationPresent( Entity.class ) - || superClass.isAnnotationPresent( javax.persistence.MappedSuperclass.class ) ) { + || superClass.isAnnotationPresent( jakarta.persistence.MappedSuperclass.class ) ) { copy.add( superClass ); } superClass = superClass.getSuperclass(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java index 9236cec881..3b0f6aabe8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java @@ -8,7 +8,7 @@ package org.hibernate.boot.model.source.internal.hbm; import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.hibernate.boot.MappingException; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmAnyAssociationType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java index 046149d1b2..6362b658e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java @@ -23,7 +23,7 @@ public class FetchProfileBinder { *

      * This form handles fetch profiles defined at the {@code } * root. For handling of fetch profiles defined within an entity, see - * {@link #processFetchProfile(HbmLocalMetadataBuildingContext, org.hibernate.boot.jaxb.hbm.spi.JaxbHbmFetchProfileType, String)} + * {@link #processFetchProfile(HbmLocalMetadataBuildingContext, JaxbHbmFetchProfileType, String)} * * @param context Access to information relative to the mapping document containing this binding * @param fetchProfileBinding The {@code } binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java index f250a10d78..21a81fc6dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java @@ -9,7 +9,7 @@ package org.hibernate.boot.model.source.internal.hbm; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.hibernate.boot.MappingException; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmFilterDefinitionType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java index 37247ca177..76f7ae27af 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java @@ -7,7 +7,7 @@ package org.hibernate.boot.model.source.internal.hbm; import java.util.Locale; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNamedNativeQueryType; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNamedQueryType; @@ -97,7 +97,7 @@ public class NamedQueryBinder { String prefix) { if ( namedQueryBinding.isCallable() ) { DeprecationLogger.DEPRECATION_LOGGER.warn( - "Marking named native queries as callable is no longer supported; use `@javax.persistence.NamedStoredProcedureQuery` instead. Ignoring." + "Marking named native queries as callable is no longer supported; use `@jakarta.persistence.NamedStoredProcedureQuery` instead. Ignoring." ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java index 957c91400a..fe1b1df9d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java @@ -144,7 +144,7 @@ public class RelationalValueSourceHelper { public static RelationalValueSource buildValueSource( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { final List sources = buildValueSources( mappingDocument, containingTableName, @@ -189,7 +189,7 @@ public class RelationalValueSourceHelper { public static ColumnSource buildColumnSource( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { final List sources = buildValueSources( mappingDocument, containingTableName, @@ -257,7 +257,7 @@ public class RelationalValueSourceHelper { public static List buildColumnSources( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { final List sources = buildValueSources( mappingDocument, containingTableName, @@ -306,7 +306,7 @@ public class RelationalValueSourceHelper { public static List buildValueSources( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { List result = new ArrayList<>(); if ( StringHelper.isNotEmpty( columnsAndFormulasSource.getFormulaAttribute() ) ) { @@ -383,7 +383,7 @@ public class RelationalValueSourceHelper { private static void validateUseOfFormulaAttribute( MappingDocument sourceDocument, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { // 1) make sure there is no column attribute if ( StringHelper.isNotEmpty( columnsAndFormulasSource.getColumnAttribute() ) ) { final String errorMessage; @@ -436,7 +436,7 @@ public class RelationalValueSourceHelper { private static void validateUseOfColumnOrFormulaNestedElements( MappingDocument sourceDocument, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { if ( StringHelper.isNotEmpty( columnsAndFormulasSource.getColumnAttribute() ) ) { final String errorMessage; if ( columnsAndFormulasSource.getSourceType().canBeNamed() @@ -463,7 +463,7 @@ public class RelationalValueSourceHelper { private static void validateCustomWriteFragment( MappingDocument sourceDocument, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource, + ColumnsAndFormulasSource columnsAndFormulasSource, JaxbHbmColumnType columnMapping, String customWrite) { if ( customWrite != null && !customWrite.matches("[^?]*\\?[^?]*") ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java index 790debf82a..5a89f66f20 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java @@ -10,8 +10,8 @@ import org.hibernate.boot.model.IdentifierGeneratorDefinition; /** * Common contract for composite identifiers. Specific sub-types include aggregated - * (think {@link javax.persistence.EmbeddedId}) and non-aggregated (think - * {@link javax.persistence.IdClass}). + * (think {@link jakarta.persistence.EmbeddedId}) and non-aggregated (think + * {@link jakarta.persistence.IdClass}). * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java index e51f65fd00..8309f9941c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.jaxb.Origin; /** * Common contract between Entity and MappedSuperclass sources. The - * terminology is taken from JPA's {@link javax.persistence.metamodel.IdentifiableType} + * terminology is taken from JPA's {@link jakarta.persistence.metamodel.IdentifiableType} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java index af327460aa..e916b783a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java @@ -14,7 +14,7 @@ import java.util.List; * {@link org.hibernate.id.EntityIdentifierNature#AGGREGATED_COMPOSITE}. *

      * This equates to an identifier which is made up of multiple values which are - * defined as part of a component/embedded; i.e. {@link javax.persistence.EmbeddedId} + * defined as part of a component/embedded; i.e. {@link jakarta.persistence.EmbeddedId} * * @author Strong Liu * @author Steve Ebersole @@ -28,7 +28,7 @@ public interface IdentifierSourceAggregatedComposite extends CompositeIdentifier public SingularAttributeSourceEmbedded getIdentifierAttributeSource(); /** - * Obtain the mapping of attributes annotated with {@link javax.persistence.MapsId}. + * Obtain the mapping of attributes annotated with {@link jakarta.persistence.MapsId}. * * @return The MapsId sources. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java index 860eaf87b8..dab1693f68 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java @@ -12,7 +12,7 @@ import java.util.List; * Additional contract describing the source of an identifier mapping whose {@link #getNature() nature} is * {@link org.hibernate.id.EntityIdentifierNature#NON_AGGREGATED_COMPOSITE }. *

      - * Think {@link javax.persistence.IdClass} + * Think {@link jakarta.persistence.IdClass} * * @author Steve Ebersole */ @@ -25,7 +25,7 @@ public interface IdentifierSourceNonAggregatedComposite extends CompositeIdentif public List getAttributeSourcesMakingUpIdentifier(); /** - * Retrieve the source information for the {@link javax.persistence.IdClass} definition + * Retrieve the source information for the {@link jakarta.persistence.IdClass} definition * * @return The IdClass source information, or {@code null} if none. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java index b2863de750..0e8de30e4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java @@ -14,22 +14,22 @@ import java.lang.annotation.Annotation; public interface JpaCallbackSource { /** - * @param callbackType {@link javax.persistence.PrePersist}, {@link javax.persistence.PreRemove}, {@link javax.persistence.PreUpdate}, {@link javax.persistence.PostLoad}, - * {@link javax.persistence.PostPersist}, {@link javax.persistence.PostRemove}, or {@link javax.persistence.PostUpdate} - * @return the name of the JPA callback method defined for the associated {@link javax.persistence.Entity entity} or {@link javax.persistence.MappedSuperclass + * @param callbackType {@link jakarta.persistence.PrePersist}, {@link jakarta.persistence.PreRemove}, {@link jakarta.persistence.PreUpdate}, {@link jakarta.persistence.PostLoad}, + * {@link jakarta.persistence.PostPersist}, {@link jakarta.persistence.PostRemove}, or {@link jakarta.persistence.PostUpdate} + * @return the name of the JPA callback method defined for the associated {@link jakarta.persistence.Entity entity} or {@link jakarta.persistence.MappedSuperclass * mapped superclass} and for the supplied callback annotation class. */ String getCallbackMethod(Class callbackType); /** - * @return the name of the instantiated container where the JPA callbacks for the associated {@link javax.persistence.Entity entity} or - * {@link javax.persistence.MappedSuperclass mapped superclass} are defined. This can be either the entity/mapped superclass itself or an - * {@link javax.persistence.EntityListeners entity listener}. + * @return the name of the instantiated container where the JPA callbacks for the associated {@link jakarta.persistence.Entity entity} or + * {@link jakarta.persistence.MappedSuperclass mapped superclass} are defined. This can be either the entity/mapped superclass itself or an + * {@link jakarta.persistence.EntityListeners entity listener}. */ String getName(); /** - * @return true if this callback class represents callbacks defined within an {@link javax.persistence.EntityListeners entity + * @return true if this callback class represents callbacks defined within an {@link jakarta.persistence.EntityListeners entity * listener}. */ boolean isListener(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java index 17e422924b..4e965cb539 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java @@ -7,13 +7,13 @@ package org.hibernate.boot.model.source.spi; /** - * Describes a relationship annotated with {@link javax.persistence.MapsId} + * Describes a relationship annotated with {@link jakarta.persistence.MapsId} * * @author Steve Ebersole */ public interface MapsIdSource { /** - * Obtain the {@link javax.persistence.MapsId#value()} naming the attribute + * Obtain the {@link jakarta.persistence.MapsId#value()} naming the attribute * within the EmbeddedId mapped by this relationship. * * @return The corresponding id attribute name. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java index 67c1333a07..e08c60b7f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java @@ -26,7 +26,7 @@ public interface Orderable { * If the ordering element is not specified, ordering by * the primary key of the associated entity is assumed * - * @see javax.persistence.OrderBy#value() + * @see jakarta.persistence.OrderBy#value() * * @return The {@code ORDER BY} fragment used during loading this plural attribute from DB. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java index f3c37f7d50..989a7e5cce 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java @@ -20,7 +20,7 @@ package org.hibernate.boot.model.source.spi; *

    *

    * {@link PluralAttributeMapKeySourceEntityAttribute} is only relevant from - * annotations when using {@link javax.persistence.MapKey}. + * annotations when using {@link jakarta.persistence.MapKey}. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java index 0d21c45aed..25d2ce2c1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java @@ -294,7 +294,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryReturnType + * @see JaxbHbmNativeQueryReturnType */ public static class EntityResultDescriptor implements ResultDescriptor, HbmFetchParent { private final String entityName; @@ -480,7 +480,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryPropertyReturnType + * @see JaxbHbmNativeQueryPropertyReturnType */ public static class PropertyFetchDescriptor implements HbmFetchDescriptor { private final HbmFetchParent parent; @@ -562,7 +562,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryJoinReturnType + * @see JaxbHbmNativeQueryJoinReturnType */ public static class JoinDescriptor implements HbmFetchDescriptor, HbmFetchParent { private final String ownerTableAlias; @@ -688,7 +688,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryCollectionLoadReturnType + * @see JaxbHbmNativeQueryCollectionLoadReturnType */ public static class CollectionResultDescriptor implements ResultDescriptor, HbmFetchParent { private final NavigablePath collectionPath; @@ -776,7 +776,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryScalarReturnType + * @see JaxbHbmNativeQueryScalarReturnType */ public static class ScalarDescriptor implements ResultDescriptor { private final String columnName; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java index 2f6f205b7c..f55fa6f070 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java @@ -17,7 +17,7 @@ import org.hibernate.query.hql.spi.NamedHqlQueryMemento; * Boot-time descriptor of a named HQL query, as defined in * annotations or xml * - * @see javax.persistence.NamedQuery + * @see jakarta.persistence.NamedQuery * @see org.hibernate.annotations.NamedQuery * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java index 5f2c2cddca..51347d5905 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java @@ -20,7 +20,7 @@ import org.hibernate.query.sql.spi.NamedNativeQueryMemento; * Boot-time descriptor of a named native query, as defined in * annotations or xml * - * @see javax.persistence.NamedNativeQuery + * @see jakarta.persistence.NamedNativeQuery * @see org.hibernate.annotations.NamedNativeQuery * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java index 595e3c13f6..e905420ebb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java @@ -13,7 +13,7 @@ import org.hibernate.procedure.spi.NamedCallableQueryMemento; * Boot-time descriptor of a named procedure/function query, as defined in * annotations or xml * - * @see javax.persistence.NamedStoredProcedureQuery + * @see jakarta.persistence.NamedStoredProcedureQuery * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java index d7ac23f427..e04720a77e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java @@ -11,11 +11,11 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.SqlResultSetMapping; import org.hibernate.LockMode; import org.hibernate.MappingException; @@ -135,7 +135,7 @@ public class SqlResultSetMappingDescriptor implements NamedResultSetMappingDescr /** - * @see javax.persistence.ColumnResult + * @see jakarta.persistence.ColumnResult */ private static class JpaColumnResultDescriptor implements ResultDescriptor { private final ColumnResult columnResult; @@ -161,7 +161,7 @@ public class SqlResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see javax.persistence.ConstructorResult + * @see jakarta.persistence.ConstructorResult */ private static class ConstructorResultDescriptor implements ResultDescriptor { private static class ArgumentDescriptor { @@ -228,7 +228,7 @@ public class SqlResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see javax.persistence.EntityResult + * @see jakarta.persistence.EntityResult */ public static class EntityResultDescriptor implements ResultDescriptor { @SuppressWarnings( { "FieldCanBeLocal", "FieldMayBeFinal", "unused" } ) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java index d91e7a8247..8574fe03f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java @@ -9,7 +9,7 @@ package org.hibernate.boot.registry; import org.hibernate.service.ServiceRegistry; /** - * Specialization of the {@link org.hibernate.service.ServiceRegistry} contract mainly for type safety. + * Specialization of the {@link ServiceRegistry} contract mainly for type safety. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java index a756631729..0df5ed6246 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java @@ -28,12 +28,12 @@ import org.hibernate.service.internal.ProvidedService; import org.hibernate.service.spi.ServiceContributor; /** - * Builder for standard {@link org.hibernate.service.ServiceRegistry} instances. + * Builder for standard {@link ServiceRegistry} instances. * * @author Steve Ebersole * * @see StandardServiceRegistryImpl - * @see org.hibernate.boot.registry.BootstrapServiceRegistryBuilder + * @see BootstrapServiceRegistryBuilder */ public class StandardServiceRegistryBuilder { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java index a80ef689d6..c624cf73fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java @@ -6,8 +6,8 @@ */ package org.hibernate.boot.spi; -import javax.persistence.AttributeConverter; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.SharedCacheMode; import org.hibernate.boot.CacheRegionDefinition; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java index bf959a7f62..2c52169dc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java @@ -7,7 +7,7 @@ package org.hibernate.boot.spi; import java.util.List; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.HibernateException; import org.hibernate.MultiTenancyStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java index 6aec5582b7..c3436a7053 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java @@ -9,7 +9,7 @@ package org.hibernate.boot.spi; import java.util.Collection; import java.util.Map; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import javax.xml.stream.XMLInputFactory; import org.hibernate.Incubating; @@ -56,7 +56,7 @@ public interface BootstrapContext { /** * Access the temporary ClassLoader passed to us as defined by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. * * @return The tempo ClassLoader */ @@ -119,7 +119,7 @@ public interface BootstrapContext { /** * Access to the Jandex index passed by call to - * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(org.jboss.jandex.IndexView)}, if any. + * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(IndexView)}, if any. *

    * Note that Jandex is currently not used. See https://github.com/hibernate/hibernate-orm/wiki/Roadmap7.0 * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java index 44e50cb3ff..27d980a41a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.function.Function; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.DuplicateMappingException; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java index 206c258de2..16625a758a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java @@ -7,7 +7,7 @@ package org.hibernate.boot.spi; import java.util.List; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.MultiTenancyStrategy; import org.hibernate.annotations.common.reflection.ReflectionManager; @@ -66,7 +66,7 @@ public interface MetadataBuildingOptions { * registered via calls to:

      *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.type.BasicType)}
      • *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.type.BasicType, String[])}
      • - *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.usertype.UserType, java.lang.String[])}
      • + *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.usertype.UserType, String[])}
      • *
    * * @return The BasicType registrations @@ -89,7 +89,7 @@ public interface MetadataBuildingOptions { /** * Access to the Jandex index passed by call to - * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(org.jboss.jandex.IndexView)}, if any. + * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(IndexView)}, if any. * * @return The Jandex index * @@ -145,7 +145,7 @@ public interface MetadataBuildingOptions { /** * Access the temporary ClassLoader passed to us as defined by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. * * @return The tempo ClassLoader * @@ -242,7 +242,7 @@ public interface MetadataBuildingOptions { /** * Should we create constraint by default? * - * @see javax.persistence.ConstraintMode#PROVIDER_DEFAULT + * @see jakarta.persistence.ConstraintMode#PROVIDER_DEFAULT * @see org.hibernate.cfg.AvailableSettings#DEFAULT_CONSTRAINT_MODE * * @return {@code true} if not create constraint by default; {@code false} otherwise. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java index 0c07666632..bf4d889af8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java @@ -12,7 +12,7 @@ import org.jboss.jandex.IndexView; * Contract for contributing to Metadata (InFlightMetadataCollector). * * This hook occurs just after all processing of all {@link org.hibernate.boot.MetadataSources}, - * and just before {@link org.hibernate.boot.spi.AdditionalJaxbMappingProducer}. + * and just before {@link AdditionalJaxbMappingProducer}. * * @author Steve Ebersole * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java index 9cf29cba63..553af0e1d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java @@ -320,7 +320,7 @@ public interface SessionFactoryOptions extends QueryEngineOptions { /** * Controls whether Hibernate should try to map named parameter names * specified in a {@link org.hibernate.procedure.ProcedureCall} or - * {@link javax.persistence.StoredProcedureQuery} to named parameters in + * {@link jakarta.persistence.StoredProcedureQuery} to named parameters in * the JDBC {@link java.sql.CallableStatement}. *

    * As JPA is defined, the use of named parameters is essentially of dubious diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java index d68773b857..166747a122 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java @@ -6,6 +6,8 @@ */ package org.hibernate.boot.xsd; +import org.hibernate.Internal; + /** * Support for XSD handling related to Hibernate's `cfg.xml` and * JPA's `persistence.xml`. @@ -16,6 +18,7 @@ package org.hibernate.boot.xsd; * @author Steve Ebersole * @author Sanne Grinovero */ +@Internal @SuppressWarnings("unused") public class ConfigXsdSupport { @@ -35,6 +38,11 @@ public class ConfigXsdSupport { return getJPA22(); } + public static boolean shouldBeMappedToLatestJpaDescriptor(String uri) { + // JPA 1.0 and 2.0 share the same namespace URI + return getJPA10().getNamespaceUri().matches( uri ); + } + public XsdDescriptor jpaXsd(String version) { switch ( version ) { case "1.0": { @@ -58,7 +66,7 @@ public class ConfigXsdSupport { } } - public XsdDescriptor cfgXsd() { + public static XsdDescriptor cfgXsd() { final int index = 0; synchronized ( xsdCache ) { XsdDescriptor cfgXml = xsdCache[index]; @@ -74,7 +82,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA10() { + public static XsdDescriptor getJPA10() { final int index = 1; synchronized ( xsdCache ) { XsdDescriptor jpa10 = xsdCache[index]; @@ -90,7 +98,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA20() { + public static XsdDescriptor getJPA20() { final int index = 2; synchronized ( xsdCache ) { XsdDescriptor jpa20 = xsdCache[index]; @@ -106,7 +114,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA21() { + public static XsdDescriptor getJPA21() { final int index = 3; synchronized ( xsdCache ) { XsdDescriptor jpa21 = xsdCache[index]; @@ -122,7 +130,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA22() { + public static XsdDescriptor getJPA22() { final int index = 4; synchronized ( xsdCache ) { XsdDescriptor jpa22 = xsdCache[index]; @@ -138,7 +146,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA30() { + public static XsdDescriptor getJPA30() { final int index = 5; synchronized ( xsdCache ) { XsdDescriptor jpa30 = xsdCache[index]; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java index 0ba5ee2ab8..876b0ef7ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java @@ -6,6 +6,8 @@ */ package org.hibernate.boot.xsd; +import org.hibernate.Internal; + /** * Support for XSD handling related to Hibernate's `hbm.xml` and * JPA's `orm.xml`. @@ -13,6 +15,7 @@ package org.hibernate.boot.xsd; * @author Steve Ebersole */ @SuppressWarnings("unused") +@Internal public class MappingXsdSupport { /** @@ -20,50 +23,74 @@ public class MappingXsdSupport { */ public static final MappingXsdSupport INSTANCE = new MappingXsdSupport(); - private final XsdDescriptor jpa10 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa10 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_1_0.xsd", "1.0", "http://java.sun.com/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa20 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa20 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_2_0.xsd", "2.0", "http://java.sun.com/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa21 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa21 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_2_1.xsd", "2.1", "http://xmlns.jcp.org/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa22 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa22 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_2_2.xsd", "2.2", "http://xmlns.jcp.org/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa30 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa30 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_3_0.xsd", "3.0", "https://jakarta.ee/xml/ns/persistence/orm" ); - - private final XsdDescriptor hbmXml = LocalXsdResolver.buildXsdDescriptor( + + public static final XsdDescriptor hbmXml = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd", "4.0", "http://www.hibernate.org/xsd/orm/hbm" ); + public static final XsdDescriptor hibernateMappingXml = LocalXsdResolver.buildXsdDescriptor( + "org/hibernate/hibernate-mapping-4.0.xsd", + "4.0", + "http://www.hibernate.org/xsd/hibernate-mapping" + ); + private MappingXsdSupport() { //Do not construct new instances } - public XsdDescriptor latestJpaDescriptor() { + public static XsdDescriptor latestJpaDescriptor() { return jpa22; } + public static boolean shouldBeMappedToLatestJpaDescriptor(String uri) { + // JPA 1.0 and 2.0 share the same namespace URI + return jpa10.getNamespaceUri().equals( uri ); + } + + public static boolean isValidJpaVersion(String version) { + switch ( version ) { + case "1.0": + case "2.0": + case "2.1": + case "2.2": + case "3.0": + return true; + default: + return false; + } + } + public XsdDescriptor jpaXsd(String version) { switch ( version ) { case "1.0": { diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java index 2c27732a7e..7579386afa 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java @@ -11,12 +11,12 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import net.bytebuddy.utility.OpenedClassReader; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java index d142264bd9..6ea74e6a62 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java @@ -18,9 +18,9 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Transient; import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker; import org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker; @@ -359,7 +359,7 @@ public class EnhancerImpl implements Enhancer { // See HHH-10977 HHH-11284 HHH-11404 --- check for declaration of Managed interface on the class, not inherited private boolean alreadyEnhanced(TypeDescription managedCtClass) { - for ( TypeDescription.Generic declaredInterface : managedCtClass.getInterfaces() ) { + for ( Generic declaredInterface : managedCtClass.getInterfaces() ) { if ( declaredInterface.asErasure().isAssignableTo( Managed.class ) ) { return true; } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java index 7bb0f27e9b..e20d733ddb 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java @@ -9,7 +9,7 @@ package org.hibernate.bytecode.enhance.internal.bytebuddy; import static net.bytebuddy.matcher.ElementMatchers.hasDescriptor; import static net.bytebuddy.matcher.ElementMatchers.named; -import javax.persistence.Id; +import jakarta.persistence.Id; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.type.TypeDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java index 1c61641c29..cb9f5b49bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java @@ -9,9 +9,9 @@ package org.hibernate.bytecode.enhance.internal.bytebuddy; import java.util.Collection; import java.util.Objects; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Id; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java index 4ede4c2af9..6d62c10c30 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.Embedded; +import jakarta.persistence.Embedded; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java index 861515bcc4..0feb06c8ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java @@ -6,15 +6,15 @@ */ package org.hibernate.bytecode.enhance.spi; -import javax.persistence.Basic; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; /** * default implementation of EnhancementContext. May be sub-classed as needed. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java index d9b242728a..f4a2c4ec16 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java @@ -24,7 +24,7 @@ public interface EnhancementContext { /** * Obtain access to the ClassLoader that can be used to load Class references. In JPA SPI terms, this * should be a "temporary class loader" as defined by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()} + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()} * * @return The class loader that the enhancer can use. */ diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java index 9cd3bbebff..fc18a2ea8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java @@ -19,7 +19,7 @@ import java.security.ProtectionDomain; * @author Bill Burke * @author Emmanuel Bernard */ -public interface ClassTransformer extends javax.persistence.spi.ClassTransformer { +public interface ClassTransformer extends jakarta.persistence.spi.ClassTransformer { /** * Invoked when a class is being loaded or redefined to add hooks for persistence bytecode manipulation. * diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java index 025bdf25eb..f491d87bf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.HibernateException; import org.hibernate.cache.cfg.spi.CollectionDataCachingConfig; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/package.html b/hibernate-core/src/main/java/org/hibernate/cache/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/FilterKey.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/FilterKey.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java index 7ed60687f5..f405649f2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java @@ -47,7 +47,7 @@ public interface Region { * during {@link org.hibernate.SessionFactory#close()} to give * the region a chance to cleanup. * - * @throws org.hibernate.cache.CacheException Indicates problem shutting down + * @throws CacheException Indicates problem shutting down */ void destroy() throws CacheException; } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java index 0fd21f1fc0..82862bd95e 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java @@ -44,7 +44,7 @@ public interface RegionFactory extends Service, Stoppable { * @param settings The settings in effect. * @param configValues The available config values * - * @throws org.hibernate.cache.CacheException Indicates problems starting the L2 cache impl; + * @throws CacheException Indicates problems starting the L2 cache impl; * considered as a sign to stop {@link org.hibernate.SessionFactory} * building. */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java index 5aaf7a66d1..c161e6d9f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java @@ -7,7 +7,7 @@ package org.hibernate.cache.spi.access; import java.io.Serializable; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.DomainDataRegion; @@ -190,7 +190,7 @@ public interface CachedDomainDataAccess { * isolation and/or locking. This behavior is exactly Hibernate legacy behavior, but * it is also required by JPA - so we cannot remove it. *

    - * Used from JPA's {@link javax.persistence.Cache#evict(Class, Object)}, as well as the + * Used from JPA's {@link jakarta.persistence.Cache#evict(Class, Object)}, as well as the * Hibernate extension {@link org.hibernate.Cache#evictEntityData(Class, Serializable)} * and {@link org.hibernate.Cache#evictEntityData(String, Serializable)} * diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/package.html b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java index c5e39b2fff..a5bf9aa7e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.CollectionDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#NONSTRICT_READ_WRITE} access type. + * using the {@link AccessType#NONSTRICT_READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java index bcbc4fe45a..d62441fd42 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java @@ -13,7 +13,7 @@ import org.hibernate.cache.spi.access.AccessType; /** * Standard support for {@link org.hibernate.cache.spi.access.CollectionDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_ONLY} access type. + * using the {@link AccessType#READ_ONLY} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java index d5ec0c7036..c67a024859 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java @@ -19,8 +19,8 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; /** - * Standard support for {@link org.hibernate.cache.spi.access.CollectionDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_WRITE} access type. + * Standard support for {@link CollectionDataAccess} + * using the {@link AccessType#READ_WRITE} access type. * * @author Chris Cranford * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java index 1b2f71ba1d..12ac7ffbd0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java @@ -16,7 +16,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.EntityDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#NONSTRICT_READ_WRITE} access type. + * using the {@link AccessType#NONSTRICT_READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java index a39260fdee..2a61b8f3d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java @@ -18,7 +18,7 @@ import org.jboss.logging.Logger; /** * Standard support for {@link org.hibernate.cache.spi.access.EntityDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_ONLY} access type. + * using the {@link AccessType#READ_ONLY} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java index 093426a416..5d3f2e6017 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java @@ -19,8 +19,8 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.persister.entity.EntityPersister; /** - * Standard support for {@link org.hibernate.cache.spi.access.EntityDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_WRITE} access type. + * Standard support for {@link EntityDataAccess} + * using the {@link AccessType#READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java index 34bcfd8c5f..c749ae88ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#NONSTRICT_READ_WRITE} access type. + * using the {@link AccessType#NONSTRICT_READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java index e0f6980e0d..f115cfbbeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java @@ -16,7 +16,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_ONLY} access type. + * using the {@link AccessType#READ_ONLY} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java index b4f53f4297..eda3f2ffd0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java @@ -18,8 +18,8 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.persister.entity.EntityPersister; /** - * Standard support for {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_WRITE} access type. + * Standard support for {@link NaturalIdDataAccess} + * using the {@link AccessType#READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java index 3880d4ffcc..d3af3f930f 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java @@ -11,17 +11,17 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MappedSuperclass; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java b/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java index 5aad2f6076..8103e31e52 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java @@ -72,11 +72,11 @@ public enum AccessType { * * @return The Hibernate AccessType */ - public static AccessType getAccessStrategy(javax.persistence.AccessType type) { - if ( javax.persistence.AccessType.PROPERTY.equals( type ) ) { + public static AccessType getAccessStrategy(jakarta.persistence.AccessType type) { + if ( jakarta.persistence.AccessType.PROPERTY.equals( type ) ) { return PROPERTY; } - else if ( javax.persistence.AccessType.FIELD.equals( type ) ) { + else if ( jakarta.persistence.AccessType.FIELD.equals( type ) ) { return FIELD; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java index 34b3d531fd..588ead5e82 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -18,58 +18,58 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.SequenceGenerator; -import javax.persistence.SequenceGenerators; -import javax.persistence.SharedCacheMode; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.TableGenerators; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.SequenceGenerators; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.TableGenerators; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; @@ -620,9 +620,9 @@ public final class AnnotationBinder { String table = ""; //might be no @Table annotation on the annotated class String catalog = ""; List uniqueConstraints = new ArrayList<>(); - javax.persistence.Table tabAnn = null; - if ( clazzToProcess.isAnnotationPresent( javax.persistence.Table.class ) ) { - tabAnn = clazzToProcess.getAnnotation( javax.persistence.Table.class ); + jakarta.persistence.Table tabAnn = null; + if ( clazzToProcess.isAnnotationPresent( jakarta.persistence.Table.class ) ) { + tabAnn = clazzToProcess.getAnnotation( jakarta.persistence.Table.class ); table = tabAnn.name(); schema = tabAnn.schema(); catalog = tabAnn.catalog(); @@ -707,11 +707,11 @@ public final class AnnotationBinder { inheritanceStatePerClass ); - javax.persistence.SecondaryTable secTabAnn = clazzToProcess.getAnnotation( - javax.persistence.SecondaryTable.class + jakarta.persistence.SecondaryTable secTabAnn = clazzToProcess.getAnnotation( + jakarta.persistence.SecondaryTable.class ); - javax.persistence.SecondaryTables secTabsAnn = clazzToProcess.getAnnotation( - javax.persistence.SecondaryTables.class + jakarta.persistence.SecondaryTables secTabsAnn = clazzToProcess.getAnnotation( + jakarta.persistence.SecondaryTables.class ); entityBinder.firstLevelSecondaryTablesBinding( secTabAnn, secTabsAnn ); @@ -908,15 +908,15 @@ public final class AnnotationBinder { final boolean isRoot = !inheritanceState.hasParents(); Ejb3DiscriminatorColumn discriminatorColumn = null; - javax.persistence.DiscriminatorColumn discAnn = clazzToProcess.getAnnotation( - javax.persistence.DiscriminatorColumn.class + jakarta.persistence.DiscriminatorColumn discAnn = clazzToProcess.getAnnotation( + jakarta.persistence.DiscriminatorColumn.class ); DiscriminatorType discriminatorType = discAnn != null ? discAnn.discriminatorType() : DiscriminatorType.STRING; - org.hibernate.annotations.DiscriminatorFormula discFormulaAnn = clazzToProcess.getAnnotation( - org.hibernate.annotations.DiscriminatorFormula.class + DiscriminatorFormula discFormulaAnn = clazzToProcess.getAnnotation( + DiscriminatorFormula.class ); if ( isRoot ) { discriminatorColumn = Ejb3DiscriminatorColumn.buildDiscriminatorColumn( @@ -1345,7 +1345,7 @@ public final class AnnotationBinder { if ( !classType.equals( AnnotatedClassType.ENTITY ) ) { throw new AnnotationException( - "Annotated class should have a @javax.persistence.Entity, @javax.persistence.Embeddable or @javax.persistence.EmbeddedSuperclass annotation: " + clazzToProcess + "Annotated class should have a @jakarta.persistence.Entity, @jakarta.persistence.Embeddable or @jakarta.persistence.EmbeddedSuperclass annotation: " + clazzToProcess .getName() ); } @@ -2040,7 +2040,7 @@ public final class AnnotationBinder { collectionBinder.setBatchSize( property.getAnnotation( BatchSize.class ) ); - collectionBinder.setJpaOrderBy( property.getAnnotation( javax.persistence.OrderBy.class ) ); + collectionBinder.setJpaOrderBy( property.getAnnotation( jakarta.persistence.OrderBy.class ) ); collectionBinder.setSqlOrderBy( property.getAnnotation( OrderBy.class ) ); collectionBinder.setNaturalSort( property.getAnnotation( SortNatural.class ) ); @@ -2603,7 +2603,7 @@ public final class AnnotationBinder { final UniqueConstraint[] uniqueConstraints; final JoinColumn[] joins; final JoinColumn[] inverseJoins; - final javax.persistence.Index[] jpaIndexes; + final jakarta.persistence.Index[] jpaIndexes; //JPA 2 has priority @@ -3387,10 +3387,10 @@ public final class AnnotationBinder { propertyHolder.addProperty( prop, columns, inferredData.getDeclaringClass() ); } - private static EnumSet convertToHibernateCascadeType(javax.persistence.CascadeType[] ejbCascades) { + private static EnumSet convertToHibernateCascadeType(jakarta.persistence.CascadeType[] ejbCascades) { EnumSet hibernateCascadeSet = EnumSet.noneOf( CascadeType.class ); if ( ejbCascades != null && ejbCascades.length > 0 ) { - for ( javax.persistence.CascadeType cascade : ejbCascades ) { + for ( jakarta.persistence.CascadeType cascade : ejbCascades ) { switch ( cascade ) { case ALL: hibernateCascadeSet.add( CascadeType.ALL ); @@ -3418,7 +3418,7 @@ public final class AnnotationBinder { } private static String getCascadeStrategy( - javax.persistence.CascadeType[] ejbCascades, + jakarta.persistence.CascadeType[] ejbCascades, Cascade hibernateCascadeAnnotation, boolean orphanRemoval, boolean forcePersist) { @@ -3494,7 +3494,7 @@ public final class AnnotationBinder { public static void bindForeignKeyNameAndDefinition( SimpleValue value, XProperty property, - javax.persistence.ForeignKey fkOverride, + jakarta.persistence.ForeignKey fkOverride, JoinColumn joinColumn, JoinColumns joinColumns, MetadataBuildingContext context) { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java index 44058599a4..9a451dbde8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java @@ -6,13 +6,13 @@ */ package org.hibernate.cfg; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; import org.hibernate.annotations.common.reflection.XAnnotatedElement; /** - * Describes a {@link javax.persistence.Convert} conversion + * Describes a {@link jakarta.persistence.Convert} conversion * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java index c4376ee3d3..f588f3e3fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java @@ -13,8 +13,8 @@ import java.lang.reflect.TypeVariable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; @@ -30,7 +30,7 @@ import org.hibernate.boot.spi.MetadataBuildingContext; * * @deprecated (since 5.3) forces the converter instance to be built too early, * which precludes the ability to resolve them from CDI, etc. See - * {@link org.hibernate.boot.model.convert.spi.ConverterDescriptor} instead + * {@link ConverterDescriptor} instead */ @Deprecated public class AttributeConverterDefinition implements AttributeConverterInfo { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index ac61a55d60..9811c2da4e 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java @@ -7,7 +7,7 @@ package org.hibernate.cfg; import java.util.function.Supplier; -import javax.persistence.GeneratedValue; +import jakarta.persistence.GeneratedValue; import org.hibernate.HibernateException; import org.hibernate.Transaction; @@ -39,7 +39,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /** - * The name of the {@link javax.persistence.spi.PersistenceProvider} implementor + * The name of the {@link jakarta.persistence.spi.PersistenceProvider} implementor *

    * See JPA 2 sections 9.4.3 and 8.2.1.4 */ @@ -115,7 +115,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * enabled as per the rules defined in JPA 2 section 3.1.7. *

    * See JPA 2 sections 9.4.3 and 8.2.1.7 - * @see javax.persistence.SharedCacheMode + * @see jakarta.persistence.SharedCacheMode */ String JPA_SHARED_CACHE_MODE = "javax.persistence.sharedCache.mode"; @@ -125,9 +125,9 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to retrieve requested data * in the shared cache. * - * @see javax.persistence.CacheRetrieveMode + * @see jakarta.persistence.CacheRetrieveMode */ - String JPA_SHARED_CACHE_RETRIEVE_MODE ="javax.persistence.cache.retrieveMode"; + String JPA_SHARED_CACHE_RETRIEVE_MODE ="jakarta.persistence.cache.retrieveMode"; /** * NOTE : Not a valid EMF property... @@ -135,23 +135,23 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to store data loaded from the database * in the shared cache. * - * @see javax.persistence.CacheStoreMode + * @see jakarta.persistence.CacheStoreMode */ - String JPA_SHARED_CACHE_STORE_MODE ="javax.persistence.cache.storeMode"; + String JPA_SHARED_CACHE_STORE_MODE ="jakarta.persistence.cache.storeMode"; /** * Used to indicate what form of automatic validation is in effect as per rules defined * in JPA 2 section 3.6.1.1 *

    * See JPA 2 sections 9.4.3 and 8.2.1.8 - * @see javax.persistence.ValidationMode + * @see jakarta.persistence.ValidationMode */ String JPA_VALIDATION_MODE = "javax.persistence.validation.mode"; /** * Used to pass along any discovered validator factory. */ - String JPA_VALIDATION_FACTORY = "javax.persistence.validation.factory"; + String JPA_VALIDATION_FACTORY = "jakarta.persistence.validation.factory"; /** * Used to coordinate with bean validators @@ -210,7 +210,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * This setting is used to configure Hibernate ORM's access to * the BeanManager (either directly or via {@link ExtendedBeanManager}). */ - String CDI_BEAN_MANAGER = "javax.persistence.bean.manager"; + String CDI_BEAN_MANAGER = "jakarta.persistence.bean.manager"; // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -218,7 +218,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /** - * The name of the {@link javax.persistence.spi.PersistenceProvider} implementor + * The name of the {@link jakarta.persistence.spi.PersistenceProvider} implementor *

    * See JPA 2 sections 9.4.3 and 8.2.1.4 */ @@ -294,7 +294,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * enabled as per the rules defined in JPA 2 section 3.1.7. *

    * See JPA 2 sections 9.4.3 and 8.2.1.7 - * @see javax.persistence.SharedCacheMode + * @see jakarta.persistence.SharedCacheMode */ String JAKARTA_JPA_SHARED_CACHE_MODE = "jakarta.persistence.sharedCache.mode"; @@ -304,7 +304,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to retrieve requested data * in the shared cache. * - * @see javax.persistence.CacheRetrieveMode + * @see jakarta.persistence.CacheRetrieveMode */ String JAKARTA_JPA_SHARED_CACHE_RETRIEVE_MODE ="jakarta.persistence.cache.retrieveMode"; @@ -314,7 +314,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to store data loaded from the database * in the shared cache. * - * @see javax.persistence.CacheStoreMode + * @see jakarta.persistence.CacheStoreMode */ String JAKARTA_JPA_SHARED_CACHE_STORE_MODE ="jakarta.persistence.cache.storeMode"; @@ -323,7 +323,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * in JPA 2 section 3.6.1.1 *

    * See JPA 2 sections 9.4.3 and 8.2.1.8 - * @see javax.persistence.ValidationMode + * @see jakarta.persistence.ValidationMode */ String JAKARTA_JPA_VALIDATION_MODE = "jakarta.persistence.validation.mode"; @@ -602,7 +602,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String DIALECT ="hibernate.dialect"; /** - * Names any additional {@link org.hibernate.engine.jdbc.dialect.spi.DialectResolver} implementations to + * Names any additional {@link DialectResolver} implementations to * register with the standard {@link org.hibernate.engine.jdbc.dialect.spi.DialectFactory}. */ String DIALECT_RESOLVERS = "hibernate.dialect_resolvers"; @@ -718,7 +718,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * A configuration value key used to indicate that it is safe to cache - * {@link javax.transaction.TransactionManager} references. + * {@link jakarta.transaction.TransactionManager} references. * * @since 4.0 */ @@ -726,7 +726,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * A configuration value key used to indicate that it is safe to cache - * {@link javax.transaction.UserTransaction} references. + * {@link jakarta.transaction.UserTransaction} references. * * @since 4.0 */ @@ -753,7 +753,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * Setting used to give the name of the default {@link org.hibernate.annotations.CacheConcurrencyStrategy} - * to use when either {@link javax.persistence.Cacheable @Cacheable} or + * to use when either {@link jakarta.persistence.Cacheable @Cacheable} or * {@link org.hibernate.annotations.Cache @Cache} is used. {@link org.hibernate.annotations.Cache @Cache(strategy="..")} is used to override. * * @see MetadataBuilder#applyAccessType(org.hibernate.cache.spi.access.AccessType) @@ -772,7 +772,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String USE_NEW_ID_GENERATOR_MAPPINGS = "hibernate.id.new_generator_mappings"; /** - * @see org.hibernate.boot.MetadataBuilder#enableImplicitForcingOfDiscriminatorsInSelect(boolean) + * @see MetadataBuilder#enableImplicitForcingOfDiscriminatorsInSelect(boolean) */ String FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT = "hibernate.discriminator.force_in_select"; @@ -831,7 +831,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { *

  • a fully qualified name (String) of a Class that implements Scanner
    • * * - * @see org.hibernate.boot.MetadataBuilder#applyScanner + * @see MetadataBuilder#applyScanner */ String SCANNER = "hibernate.archive.scanner"; @@ -860,7 +860,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { *
  • "hbm" - discover hbm mapping files - hbm.xml files are discovered as mapping files
    • * * - * @see org.hibernate.boot.MetadataBuilder#applyScanOptions + * @see MetadataBuilder#applyScanOptions */ String SCANNER_DISCOVERY = "hibernate.archive.autodetection"; @@ -894,12 +894,12 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * Used to specify the order in which metadata sources should be processed. Value - * is a delimited-list whose elements are defined by {@link org.hibernate.cfg.MetadataSourceType}. + * is a delimited-list whose elements are defined by {@link MetadataSourceType}. *

    * Default is {@code "hbm,class"} which indicates to process {@code hbm.xml} files followed by * annotations (combined with {@code orm.xml} mappings). * - * @see MetadataBuilder#applySourceProcessOrdering(org.hibernate.cfg.MetadataSourceType...) + * @see MetadataBuilder#applySourceProcessOrdering(MetadataSourceType...) */ String ARTIFACT_PROCESSING_ORDER = "hibernate.mapping.precedence"; @@ -1131,7 +1131,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Global setting name for controlling whether Hibernate should try to map * named parameter names specified in a * {@link org.hibernate.procedure.ProcedureCall} or - * {@link javax.persistence.StoredProcedureQuery} to named parameters in + * {@link jakarta.persistence.StoredProcedureQuery} to named parameters in * the JDBC {@link java.sql.CallableStatement}. * * @see SessionFactoryOptions#isUseOfJdbcNamedParametersEnabled() @@ -1479,8 +1479,8 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * Assuming {@link #GLOBALLY_QUOTED_IDENTIFIERS}, this allows such global quoting - * to skip column-definitions as defined by {@link javax.persistence.Column}, - * {@link javax.persistence.JoinColumn}, etc. + * to skip column-definitions as defined by {@link jakarta.persistence.Column}, + * {@link jakarta.persistence.JoinColumn}, etc. *

    * JPA states that column-definitions are subject to global quoting, so by default this setting * is {@code false} for JPA compliance. Set to {@code true} to avoid column-definitions @@ -2000,7 +2000,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** *

    - * This setting is used when you use {@link javax.persistence.ConstraintMode#PROVIDER_DEFAULT} strategy for foreign key mapping. + * This setting is used when you use {@link jakarta.persistence.ConstraintMode#PROVIDER_DEFAULT} strategy for foreign key mapping. * valid value is {@code CONSTRAINT} and {@code NO_CONSTRAINT}. *

    *

    @@ -2258,7 +2258,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String CREATE_EMPTY_COMPOSITES_ENABLED = "hibernate.create_empty_composites.enabled"; /** - * Setting that allows access to the underlying {@link org.hibernate.Transaction}, even + * Setting that allows access to the underlying {@link Transaction}, even * when using a JTA since normal JPA operations prohibit this behavior. *

    * Values are {@code true} grants access, {@code false} does not. @@ -2292,14 +2292,14 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String COLLECTION_JOIN_SUBQUERY = "hibernate.collection_join_subquery"; /** - * Setting that allows to call {@link javax.persistence.EntityManager#refresh(Object)} + * Setting that allows to call {@link jakarta.persistence.EntityManager#refresh(Object)} * or {@link org.hibernate.Session#refresh(Object)} on a detached entity instance when the {@link org.hibernate.Session} is obtained from - * a JPA {@link javax.persistence.EntityManager}). + * a JPA {@link jakarta.persistence.EntityManager}). *

    *

    * Values are: {@code true} permits the refresh, {@code false} does not permit the detached instance refresh and an {@link IllegalArgumentException} is thrown. *

    - * The default value is {@code false} when the Session is bootstrapped via JPA {@link javax.persistence.EntityManagerFactory}, otherwise is {@code true} + * The default value is {@code false} when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory}, otherwise is {@code true} * * @since 5.2 */ @@ -2311,7 +2311,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * The possible values are: * *

    diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java index a8b7e6b993..c6f556213e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java @@ -103,7 +103,7 @@ public final class ImmutableEntityEntry extends AbstractEntityEntry { * * @return The deserialized EntityEntry * - * @throws java.io.IOException If a stream error occurs + * @throws IOException If a stream error occurs * @throws ClassNotFoundException If any of the classes declared in the stream * cannot be found */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java index b3a969a616..413667c650 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.Status; import org.hibernate.persister.entity.EntityPersister; /** - * Factory for the safe approach implementation of {@link org.hibernate.engine.spi.EntityEntry}. + * Factory for the safe approach implementation of {@link EntityEntry}. *

    * Smarter implementations could store less state. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/JoinHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/JoinHelper.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java index 6b1d33f950..6e26a29286 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java @@ -96,7 +96,7 @@ public final class MutableEntityEntry extends AbstractEntityEntry { * * @return The deserialized EntityEntry * - * @throws java.io.IOException If a stream error occurs + * @throws IOException If a stream error occurs * @throws ClassNotFoundException If any of the classes declared in the stream * cannot be found */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java index 1681adb7bf..407202f5e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.Status; import org.hibernate.persister.entity.EntityPersister; /** - * Factory for the safe approach implementation of {@link org.hibernate.engine.spi.EntityEntry}. + * Factory for the safe approach implementation of {@link EntityEntry}. *

    * Smarter implementations could store less state. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index 11d8f2031c..3ded24c63c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -1123,7 +1123,7 @@ public class StatefulPersistenceContext implements PersistenceContext { public void forEachCollectionEntry(BiConsumer action, boolean concurrent) { if ( collectionEntries != null ) { if ( concurrent ) { - for ( Map.Entry entry : IdentityMap.concurrentEntries( collectionEntries ) ) { + for ( Entry entry : IdentityMap.concurrentEntries( collectionEntries ) ) { action.accept( entry.getKey(), entry.getValue() ); } } @@ -1563,7 +1563,7 @@ public class StatefulPersistenceContext implements PersistenceContext { oos.writeBoolean( defaultReadOnly ); oos.writeBoolean( hasNonReadOnlyEntities ); - final Serializer> entityKeySerializer = (entry, stream) -> { + final Serializer> entityKeySerializer = (entry, stream) -> { entry.getKey().serialize( stream ); stream.writeObject( entry.getValue() ); }; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java index 36991a9d7a..4675c41fa5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java @@ -48,7 +48,7 @@ public final class BlobProxy implements Blob, BlobImplementer { * * @param stream The binary stream * @param length The length of the stream - * @see #generateProxy(java.io.InputStream, long) + * @see #generateProxy(InputStream, long) */ private BlobProxy(InputStream stream, long length) { this.binaryStream = new StreamBackedBinaryStream( stream, length ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java index 5f30ce910e..78d5c2f5c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java @@ -47,7 +47,7 @@ public class ClobProxy implements InvocationHandler { * * @param reader The character reader. * @param length The length of the reader stream. - * @see #generateProxy(java.io.Reader, long) + * @see #generateProxy(Reader, long) */ protected ClobProxy(Reader reader, long length) { this.characterStream = new CharacterStreamImpl( reader, length ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java index 38933169e5..4e4bb4e533 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java @@ -17,7 +17,7 @@ import java.sql.SQLException; import org.hibernate.JDBCException; /** - * {@link LobCreator} implementation using contextual creation against the JDBC {@link java.sql.Connection} class's LOB creation + * {@link LobCreator} implementation using contextual creation against the JDBC {@link Connection} class's LOB creation * methods. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java index ec27c80f6d..a60a934712 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java @@ -45,7 +45,7 @@ public class NClobProxy extends ClobProxy { } /** - * Generates a {@link java.sql.NClob} proxy using a character reader of given length. + * Generates a {@link NClob} proxy using a character reader of given length. * * @param reader The character reader * @param length The length of the character reader diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java index 748b2e753b..3d152dfb8d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java @@ -31,7 +31,7 @@ public class SerializableBlobProxy implements InvocationHandler, Serializable { * Builds a serializable {@link Blob} wrapper around the given {@link Blob}. * * @param blob The {@link Blob} to be wrapped. - * @see #generateProxy(java.sql.Blob) + * @see #generateProxy(Blob) */ private SerializableBlobProxy(Blob blob) { this.blob = blob; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java index a52e6cc095..c2b8cbb328 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java @@ -28,10 +28,10 @@ public class SerializableClobProxy implements InvocationHandler, Serializable { private final transient Clob clob; /** - * Builds a serializable {@link java.sql.Clob} wrapper around the given {@link java.sql.Clob}. + * Builds a serializable {@link Clob} wrapper around the given {@link Clob}. * - * @param clob The {@link java.sql.Clob} to be wrapped. - * @see #generateProxy(java.sql.Clob) + * @param clob The {@link Clob} to be wrapped. + * @see #generateProxy(Clob) */ protected SerializableClobProxy(Clob clob) { this.clob = clob; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java index e4a5a41cc8..e7a7755bdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java @@ -33,11 +33,11 @@ public class SerializableNClobProxy extends SerializableClobProxy { } /** - * Builds a serializable {@link java.sql.Clob} wrapper around the given {@link java.sql.Clob}. + * Builds a serializable {@link Clob} wrapper around the given {@link Clob}. * - * @param clob The {@link java.sql.Clob} to be wrapped. + * @param clob The {@link Clob} to be wrapped. * - * @see #generateProxy(java.sql.Clob) + * @see #generateProxy(Clob) */ protected SerializableNClobProxy(Clob clob) { super( clob ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java index f3bbb9f697..1d09ec2077 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java @@ -11,7 +11,7 @@ import java.sql.PreparedStatement; * Conceptually models a batch. *

    * Unlike directly in JDBC, here we add the ability to batch together multiple statements at a time. In the underlying - * JDBC this correlates to multiple {@link java.sql.PreparedStatement} objects (one for each DML string) maintained within the + * JDBC this correlates to multiple {@link PreparedStatement} objects (one for each DML string) maintained within the * batch. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java index 36a3afb747..9f8753d542 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java @@ -21,7 +21,7 @@ import org.hibernate.service.spi.InjectService; import org.hibernate.service.spi.Stoppable; /** - * A {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} that manages connections from an underlying {@link DataSource}. + * A {@link ConnectionProvider} that manages connections from an underlying {@link DataSource}. *

    * The {@link DataSource} to use may be specified by either:

      *
    • injection via {@link #setDataSource}
      • diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java index 0362a5591e..7317d28eba 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java @@ -39,7 +39,7 @@ import static org.hibernate.internal.log.ConnectionPoolingLogger.CONNECTIONS_LOG import static org.hibernate.internal.log.ConnectionPoolingLogger.CONNECTIONS_MESSAGE_LOGGER; /** - * A connection provider that uses the {@link java.sql.DriverManager} directly to open connections and provides + * A connection provider that uses the {@link DriverManager} directly to open connections and provides * a very rudimentary connection pool. *

      * IMPL NOTE : not intended for production use! diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java index e90baeb6e9..df7f6cdf7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java @@ -27,7 +27,7 @@ import org.hibernate.service.spi.Stoppable; * to a single base JNDI context * *

    • - * {@link org.hibernate.cfg.AvailableSettings#DATASOURCE} is a string naming either the {@literal any} + * {@link AvailableSettings#DATASOURCE} is a string naming either the {@literal any} * data source or the base JNDI context. If the latter, {@link #TENANT_IDENTIFIER_TO_USE_FOR_ANY_KEY} must * also be set. *
      • diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java index 8efc9c188e..e27dbde3c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java @@ -41,8 +41,8 @@ public interface JdbcConnectionAccess extends Serializable { * * @return true/false * - * @see org.hibernate.engine.jdbc.connections.spi.ConnectionProvider#supportsAggressiveRelease() - * @see org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider#supportsAggressiveRelease() + * @see ConnectionProvider#supportsAggressiveRelease() + * @see MultiTenantConnectionProvider#supportsAggressiveRelease() */ boolean supportsAggressiveRelease(); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java index 352aed6efc..2571164186 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java @@ -20,7 +20,7 @@ import org.hibernate.service.Service; */ public interface RefCursorSupport extends Service { /** - * Register a parameter capable of returning a {@link java.sql.ResultSet} *by position*. + * Register a parameter capable of returning a {@link ResultSet} *by position*. * * @param statement The callable statement. * @param position The bind position at which to register the output param. @@ -28,7 +28,7 @@ public interface RefCursorSupport extends Service { public void registerRefCursorParameter(CallableStatement statement, int position); /** - * Register a parameter capable of returning a {@link java.sql.ResultSet} *by name*. + * Register a parameter capable of returning a {@link ResultSet} *by name*. * * @param statement The callable statement. * @param name The parameter name (for drivers which support named parameters). @@ -36,8 +36,8 @@ public interface RefCursorSupport extends Service { public void registerRefCursorParameter(CallableStatement statement, String name); /** - * Given a callable statement previously processed by {@link #registerRefCursorParameter(java.sql.CallableStatement, int)}, - * extract the {@link java.sql.ResultSet}. + * Given a callable statement previously processed by {@link #registerRefCursorParameter(CallableStatement, int)}, + * extract the {@link ResultSet}. * * * @param statement The callable statement. @@ -48,8 +48,8 @@ public interface RefCursorSupport extends Service { public ResultSet getResultSet(CallableStatement statement, int position); /** - * Given a callable statement previously processed by {@link #registerRefCursorParameter(java.sql.CallableStatement, String)}, - * extract the {@link java.sql.ResultSet}. + * Given a callable statement previously processed by {@link #registerRefCursorParameter(CallableStatement, String)}, + * extract the {@link ResultSet}. * * @param statement The callable statement. * @param name The parameter name (for drivers which support named parameters). diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java index 349873ecd0..6ca78186ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java @@ -15,7 +15,7 @@ import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; /** - * A helper to centralize conversion of {@link java.sql.SQLException}s to {@link org.hibernate.JDBCException}s. + * A helper to centralize conversion of {@link SQLException}s to {@link JDBCException}s. *

      * Used while querying JDBC metadata during bootstrapping * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java index 1dcd4b2205..6b01740bb7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java @@ -49,7 +49,7 @@ public class DefaultSchemaNameResolver implements SchemaNameResolver { connection.getSchema(); return new SchemaNameResolverJava17Delegate(); } - catch (java.lang.AbstractMethodError e) { + catch (AbstractMethodError e) { log.debugf( "Unable to use Java 1.7 Connection#getSchema" ); return SchemaNameResolverFallbackDelegate.INSTANCE; } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java index cfe43dbd7d..d8ee6ca639 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java @@ -56,7 +56,7 @@ public class JdbcEnvironmentImpl implements JdbcEnvironment { private final NameQualifierSupport nameQualifierSupport; /** - * Constructor form used when the JDBC {@link java.sql.DatabaseMetaData} is not available. + * Constructor form used when the JDBC {@link DatabaseMetaData} is not available. * * @param serviceRegistry The service registry * @param dialect The resolved dialect. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java index edd5d637c6..5e5445edd5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java @@ -26,7 +26,7 @@ import org.hibernate.internal.util.config.ConfigurationHelper; import org.jboss.logging.Logger; /** - * Builds {@link org.hibernate.engine.jdbc.LobCreator} instances based on the capabilities of the environment. + * Builds {@link LobCreator} instances based on the capabilities of the environment. * * @author Steve Ebersole */ @@ -46,11 +46,11 @@ public class LobCreatorBuilderImpl implements LobCreatorBuilder { /** * The public factory method for obtaining the appropriate LOB creator (according to given - * JDBC {@link java.sql.Connection}). + * JDBC {@link Connection}). * * @param dialect The {@link Dialect} in use * @param configValues The map of settings - * @param jdbcConnection A JDBC {@link java.sql.Connection} which can be used to gauge the drivers level of support, + * @param jdbcConnection A JDBC {@link Connection} which can be used to gauge the drivers level of support, * specifically for creating LOB references. */ public static LobCreatorBuilderImpl makeLobCreatorBuilder(Dialect dialect, Map configValues, Connection jdbcConnection) { @@ -71,9 +71,9 @@ public class LobCreatorBuilderImpl implements LobCreatorBuilder { private static final Object[] NO_ARGS = ArrayHelper.EMPTY_OBJECT_ARRAY; /** - * Basically here we are simply checking whether we can call the {@link java.sql.Connection} methods for - * LOB creation added in JDBC 4. We not only check whether the {@link java.sql.Connection} declares these methods, - * but also whether the actual {@link java.sql.Connection} instance implements them (i.e. can be called without simply + * Basically here we are simply checking whether we can call the {@link Connection} methods for + * LOB creation added in JDBC 4. We not only check whether the {@link Connection} declares these methods, + * but also whether the actual {@link Connection} instance implements them (i.e. can be called without simply * throwing an exception). * * @param dialect The {@link Dialect} in use diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java index 3fd7f7d227..fa766226e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java @@ -19,7 +19,7 @@ import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameFormatter; /** * Standard implementation of QualifiedObjectNameFormatter which uses information reported - * by {@link java.sql.DatabaseMetaData} to render qualified names. + * by {@link DatabaseMetaData} to render qualified names. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java index be95c6738f..c7bc074bdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java @@ -55,8 +55,8 @@ public interface IdentifierHelper { /** * Intended only for use in handling quoting requirements for {@code column-definition} - * as defined by {@link javax.persistence.Column#columnDefinition()}, - * {@link javax.persistence.JoinColumn#columnDefinition}, etc. This method should not + * as defined by {@link jakarta.persistence.Column#columnDefinition()}, + * {@link jakarta.persistence.JoinColumn#columnDefinition}, etc. This method should not * be called in any other scenario. *

      * This method is needed to account for that fact that the JPA spec says that {@code column-definition} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java index c9082cbc37..d6ff61ec57 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java @@ -15,7 +15,7 @@ import org.hibernate.sql.ast.SqlAstTranslatorFactory; /** * Initial look at this concept we keep talking about with merging information from {@link java.sql.DatabaseMetaData} - * and {@link org.hibernate.dialect.Dialect} + * and {@link Dialect} * * @author Steve Ebersole */ @@ -47,7 +47,7 @@ public interface JdbcEnvironment extends Service { /** * Get the current database catalog. Typically will come from either - * {@link SchemaNameResolver#resolveSchemaName(java.sql.Connection, org.hibernate.dialect.Dialect)} or + * {@link SchemaNameResolver#resolveSchemaName(java.sql.Connection, Dialect)} or * {@link org.hibernate.cfg.AvailableSettings#DEFAULT_CATALOG}. * * @return The current schema diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java index 752c8ff73a..864ed7de3d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java @@ -9,7 +9,7 @@ package org.hibernate.engine.jdbc.env.spi; import java.sql.DatabaseMetaData; /** - * Enum interpretation of the valid values from {@link java.sql.DatabaseMetaData#getSQLStateType()} + * Enum interpretation of the valid values from {@link DatabaseMetaData#getSQLStateType()} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java index d6e7c8dc3d..a072f85a2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java @@ -12,13 +12,13 @@ import java.sql.SQLException; import org.hibernate.dialect.Dialect; /** - * Contract for resolving the schema of a {@link java.sql.Connection}. + * Contract for resolving the schema of a {@link Connection}. * * @author Steve Ebersole */ public interface SchemaNameResolver { /** - * Given a JDBC {@link java.sql.Connection}, resolve the name of the schema (if one) to which it connects. + * Given a JDBC {@link Connection}, resolve the name of the schema (if one) to which it connects. * * @param connection The JDBC connection * @param dialect The Dialect diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java index 86720f97f8..f69e0bdbe2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java @@ -37,10 +37,10 @@ public class LobCreatorBuilder { private boolean useContextualLobCreation; /** - * The public factory method for obtaining the appropriate (according to given JDBC {@link java.sql.Connection}. + * The public factory method for obtaining the appropriate (according to given JDBC {@link Connection}. * * @param configValues The map of settings - * @param jdbcConnection A JDBC {@link java.sql.Connection} which can be used to gauge the drivers level of support, + * @param jdbcConnection A JDBC {@link Connection} which can be used to gauge the drivers level of support, * specifically for creating LOB references. */ public LobCreatorBuilder(Map configValues, Connection jdbcConnection) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java index 90af28a7a0..07b4b2a5a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java @@ -94,7 +94,7 @@ public interface JdbcCoordinator extends Serializable, TransactionCoordinatorOwn * * @return The {@link Connection} associated with the managed {@link #getLogicalConnection() logical connection} * - * @see org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor#close + * @see LogicalConnectionImplementor#close */ Connection close(); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java index d44bf3d485..ff55966ebb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java @@ -30,7 +30,7 @@ public interface ResultSetReturn { * Extract the ResultSet from the PreparedStatement. *

      * If user passes {@link CallableStatement} reference, this method calls {@link #extract(CallableStatement)} - * internally. Otherwise, generally speaking, {@link java.sql.PreparedStatement#executeQuery()} is called + * internally. Otherwise, generally speaking, {@link PreparedStatement#executeQuery()} is called * * @param statement The PreparedStatement from which to extract the ResultSet * @@ -84,7 +84,7 @@ public interface ResultSetReturn { * * @param statement The PreparedStatement to execute * - * @return The {@link java.sql.PreparedStatement#executeUpdate()} result + * @return The {@link PreparedStatement#executeUpdate()} result */ public int executeUpdate(PreparedStatement statement); @@ -94,7 +94,7 @@ public interface ResultSetReturn { * @param statement The JDBC Statement object to use * @param sql The SQL to execute * - * @return The {@link java.sql.PreparedStatement#executeUpdate(String)} result + * @return The {@link PreparedStatement#executeUpdate(String)} result */ public int executeUpdate(Statement statement, String sql); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java index 7b2a555ca3..296fe17c0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java @@ -50,7 +50,7 @@ public interface StatementPreparer { *

    • {@link PreparedStatement#RETURN_GENERATED_KEYS}
      • *
    • {@link PreparedStatement#NO_GENERATED_KEYS}
      • *
    - * Generated keys are accessed afterwards via {@link java.sql.PreparedStatement#getGeneratedKeys} + * Generated keys are accessed afterwards via {@link PreparedStatement#getGeneratedKeys} * * @param sql The INSERT SQL * @param autoGeneratedKeys The autoGeneratedKeys flag @@ -63,7 +63,7 @@ public interface StatementPreparer { /** * Prepare an INSERT statement, specifying columns which are auto-generated values to be returned. - * Generated keys are accessed afterwards via {@link java.sql.PreparedStatement#getGeneratedKeys} + * Generated keys are accessed afterwards via {@link PreparedStatement#getGeneratedKeys} * * @param sql - the SQL for the statement to be prepared * @param columnNames The name of the columns to be returned in the generated keys result set. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java index d0a4f94e89..1b0208fee2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java @@ -17,7 +17,7 @@ import org.hibernate.internal.util.collections.ArrayHelper; import org.jboss.logging.Logger; /** - * Models type info extracted from {@link java.sql.DatabaseMetaData#getTypeInfo()} + * Models type info extracted from {@link DatabaseMetaData#getTypeInfo()} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java index 004ad43497..8f2863c2f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java @@ -16,27 +16,27 @@ import java.sql.DatabaseMetaData; public enum TypeSearchability { /** * Type is not searchable. - * @see java.sql.DatabaseMetaData#typePredNone + * @see DatabaseMetaData#typePredNone */ NONE, /** * Type is fully searchable - * @see java.sql.DatabaseMetaData#typeSearchable + * @see DatabaseMetaData#typeSearchable */ FULL, /** * Type is valid only in {@code WHERE ... LIKE} - * @see java.sql.DatabaseMetaData#typePredChar + * @see DatabaseMetaData#typePredChar */ CHAR, /** * Type is supported only in {@code WHERE ... LIKE} - * @see java.sql.DatabaseMetaData#typePredBasic + * @see DatabaseMetaData#typePredBasic */ BASIC; /** - * Based on the code retrieved from {@link java.sql.DatabaseMetaData#getTypeInfo()} for the {@code SEARCHABLE} + * Based on the code retrieved from {@link DatabaseMetaData#getTypeInfo()} for the {@code SEARCHABLE} * column, return the appropriate enum. * * @param code The retrieved code value. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/package.html b/hibernate-core/src/main/java/org/hibernate/engine/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java index 54979effdf..2eabcaf88e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java @@ -423,13 +423,13 @@ public class ActionQueue { } /** - * Throws {@link org.hibernate.PropertyValueException} if there are any unresolved entity insert actions that depend + * Throws {@link PropertyValueException} if there are any unresolved entity insert actions that depend * on non-nullable associations with a transient entity. This method should be called on completion of an operation * (after all cascades are completed) that saves an entity. * - * @throws org.hibernate.PropertyValueException if there are any unresolved entity insert actions; - * {@link org.hibernate.PropertyValueException#getEntityName()} and - * {@link org.hibernate.PropertyValueException#getPropertyName()} will return the entity name and property value for + * @throws PropertyValueException if there are any unresolved entity insert actions; + * {@link PropertyValueException#getEntityName()} and + * {@link PropertyValueException#getPropertyName()} will return the entity name and property value for * the first unresolved entity insert action. */ public void checkNoUnresolvedActionsAfterOperation() throws PropertyValueException { @@ -517,7 +517,7 @@ public class ActionQueue { } /** - * Execute any registered {@link org.hibernate.action.spi.BeforeTransactionCompletionProcess} + * Execute any registered {@link BeforeTransactionCompletionProcess} */ public void beforeTransactionCompletion() { if ( !isTransactionCoordinatorShared ) { @@ -589,7 +589,7 @@ public class ActionQueue { } /** - * Perform {@link org.hibernate.action.spi.Executable#execute()} on each element of the list + * Perform {@link Executable#execute()} on each element of the list * * @param list The list of Executable elements to be performed * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java index 586bf1699a..9639c8d80d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java @@ -79,7 +79,7 @@ public class CascadingActions { }; /** - * @see org.hibernate.Session#lock(Object, org.hibernate.LockMode) + * @see org.hibernate.Session#lock(Object, LockMode) */ public static final CascadingAction LOCK = new BaseCascadingAction() { @Override diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java index cf3d72bd03..bd0910659b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java @@ -404,7 +404,7 @@ public final class CollectionEntry implements Serializable { * Session/PersistenceContext for increased performance. * * @param oos The stream to which we should write the serial data. - * @throws java.io.IOException + * @throws IOException */ public void serialize(ObjectOutputStream oos) throws IOException { oos.writeObject( role ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java index 31b43335ac..e0da94d94e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java @@ -106,7 +106,7 @@ public final class CollectionKey implements Serializable { * * @param oos The stream to which we should write the serial data. * - * @throws java.io.IOException + * @throws IOException */ public void serialize(ObjectOutputStream oos) throws IOException { oos.writeObject( role ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java index f416daa71c..68aaad467d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java @@ -132,7 +132,7 @@ public interface EntityEntry { * * @param oos The stream to which we should write the serial data. * - * @throws java.io.IOException If a stream error occurs + * @throws IOException If a stream error occurs */ void serialize(ObjectOutputStream oos) throws IOException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java index 035349979e..a7da29e0d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java @@ -8,14 +8,14 @@ package org.hibernate.engine.spi; /** - * Navigation methods for extra state objects attached to {@link org.hibernate.engine.spi.EntityEntry}. + * Navigation methods for extra state objects attached to {@link EntityEntry}. * * @author Emmanuel Bernard */ public interface EntityEntryExtraState { /** - * Attach additional state to the core state of {@link org.hibernate.engine.spi.EntityEntry} + * Attach additional state to the core state of {@link EntityEntry} *

    * Implementations must delegate to the next state or add it as next state if last in line. */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java index a40e9a7228..e295838f49 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java @@ -12,14 +12,14 @@ import org.hibernate.LockMode; import org.hibernate.persister.entity.EntityPersister; /** - * Contract to build {@link org.hibernate.engine.spi.EntityEntry} + * Contract to build {@link EntityEntry} * * @author Emmanuel Bernard */ public interface EntityEntryFactory extends Serializable { /** - * Creates {@link org.hibernate.engine.spi.EntityEntry}. + * Creates {@link EntityEntry}. */ EntityEntry createEntityEntry( final Status status, diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java index a68510a85a..88e7d3b0a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java @@ -99,7 +99,7 @@ public class ExecutableList im * * @param sorter The Sorter to use; may be {@code null} */ - public ExecutableList(ExecutableList.Sorter sorter) { + public ExecutableList(Sorter sorter) { this( INIT_QUEUE_LIST_SIZE, sorter ); } @@ -109,7 +109,7 @@ public class ExecutableList im * @param initialCapacity The initial capacity for instantiating the internal List * @param sorter The Sorter to use; may be {@code null} */ - public ExecutableList(int initialCapacity, ExecutableList.Sorter sorter) { + public ExecutableList(int initialCapacity, Sorter sorter) { this.sorter = sorter; this.executables = new ArrayList<>( initialCapacity ); this.querySpaces = null; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java index 23f51ee282..bdbf3b6e82 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.Filter; import org.hibernate.UnknownProfileException; @@ -159,7 +159,7 @@ public class LoadQueryInfluencers implements Serializable { return Collections.EMPTY_SET; } else { - return java.util.Collections.unmodifiableSet( enabledFilters.keySet() ); + return Collections.unmodifiableSet( enabledFilters.keySet() ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java index 53ad011e7a..571c38eaff 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java @@ -15,7 +15,7 @@ import org.hibernate.type.Type; * and "uncompiled" mappings (ie. Configuration) that are used by * implementors of Type. * - * @see org.hibernate.type.Type + * @see Type * @see org.hibernate.internal.SessionFactoryImpl * @see org.hibernate.cfg.Configuration * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java index 0cb0b6a9ce..ecbb8cc7d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java @@ -456,7 +456,7 @@ public final class QueryParameters { * * @see QueryParameters#isReadOnlyInitialized() * @see QueryParameters#setReadOnly(boolean) - * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly() + * @see PersistenceContext#isDefaultReadOnly() * * The read-only/modifiable setting has no impact on entities/proxies returned by the * query that existed in the session before the query was executed. @@ -480,7 +480,7 @@ public final class QueryParameters { * @see QueryParameters#isReadOnlyInitialized() * @see QueryParameters#isReadOnly(SharedSessionContractImplementor) * @see QueryParameters#setReadOnly(boolean) - * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly() + * @see PersistenceContext#isDefaultReadOnly() */ public void setReadOnly(boolean readOnly) { this.readOnly = readOnly; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java index 2e5e12b852..22f33ec5cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java @@ -12,7 +12,7 @@ import org.hibernate.SessionBuilder; * Defines the internal contract between the SessionBuilder and other parts of * Hibernate.. * - * @see org.hibernate.SessionBuilder + * @see SessionBuilder * * @author Gail Badner */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java index 4d30dd7317..611fbb7dc5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java @@ -12,15 +12,15 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; import java.util.UUID; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.metamodel.Metamodel; import org.hibernate.CacheMode; import org.hibernate.Filter; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java index ab4563e6ad..e139034a86 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java @@ -12,11 +12,11 @@ import java.util.Map; import java.util.Set; import javax.naming.NamingException; import javax.naming.Reference; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.Query; -import javax.persistence.SynchronizationType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.Query; +import jakarta.persistence.SynchronizationType; import org.hibernate.CustomEntityDirtinessStrategy; import org.hibernate.EntityNameResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java index 2e093c16ee..8eb6dedece 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.CustomEntityDirtinessStrategy; import org.hibernate.EntityNameResolver; @@ -51,7 +51,7 @@ import org.hibernate.type.spi.TypeConfiguration; * Defines the internal contract between the SessionFactory and other parts of * Hibernate such as implementors of Type. * - * @see org.hibernate.SessionFactory + * @see SessionFactory * @see org.hibernate.internal.SessionFactoryImpl * * @author Gavin King @@ -319,7 +319,7 @@ public interface SessionFactoryImplementor /** * Get the names of all persistent classes that implement/extend the given interface/class * - * @deprecated Use {@link Metamodel#getImplementors(java.lang.String)} instead + * @deprecated Use {@link Metamodel#getImplementors(String)} instead */ @Deprecated default String[] getImplementors(String entityName) { @@ -329,7 +329,7 @@ public interface SessionFactoryImplementor /** * Get a class name, using query language imports * - * @deprecated Use {@link Metamodel#getImportedClassName(java.lang.String)} instead + * @deprecated Use {@link Metamodel#getImportedClassName(String)} instead */ @Deprecated default String getImportedClassName(String name) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java index 0d5c3f5e45..1d806c3c6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java @@ -8,9 +8,9 @@ package org.hibernate.engine.spi; import java.util.Map; import java.util.Set; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -23,7 +23,7 @@ import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; /** * Defines the "internal contract" for {@link Session} and other parts of Hibernate such as - * {@link org.hibernate.type.Type}, {@link org.hibernate.persister.entity.EntityPersister} + * {@link org.hibernate.type.Type}, {@link EntityPersister} * and {@link org.hibernate.persister.collection.CollectionPersister} implementations. * * A Session, through this interface and SharedSessionContractImplementor, implements:

      diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java index 3a49952ee7..f67f3109a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java @@ -9,8 +9,8 @@ package org.hibernate.engine.spi; import java.sql.Connection; import java.util.Set; import java.util.UUID; -import javax.persistence.FlushModeType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -42,7 +42,7 @@ import org.hibernate.type.spi.TypeConfiguration; * * A Session, through this interface and SharedSessionContractImplementor, implements:
        *
      • - * {@link org.hibernate.resource.jdbc.spi.JdbcSessionOwner} to drive the behavior of a "JDBC session". + * {@link JdbcSessionOwner} to drive the behavior of a "JDBC session". * Can therefor be used to construct a JdbcCoordinator, which (for now) models a "JDBC session" *
        • *
      • @@ -52,10 +52,10 @@ import org.hibernate.type.spi.TypeConfiguration; * {@link org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder#buildTransactionCoordinator} *
        • *
      • - * {@link org.hibernate.engine.jdbc.LobCreationContext} to act as the context for JDBC LOB instance creation + * {@link LobCreationContext} to act as the context for JDBC LOB instance creation *
        • *
      • - * {@link org.hibernate.type.descriptor.WrapperOptions} to fulfill the behavior needed while + * {@link WrapperOptions} to fulfill the behavior needed while * binding/extracting values to/from JDBC as part of the Type contracts *
        • *
      diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java index 985949bf68..ad372d03a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java @@ -17,7 +17,7 @@ import org.hibernate.type.Type; /** * An ordered pair of a value and its Hibernate type. * - * @see org.hibernate.type.Type + * @see Type * @author Gavin King */ public final class TypedValue implements Serializable { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java index 4d555d996e..ddddedb5af 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.internal; import java.util.LinkedHashSet; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.engine.transaction.spi.SynchronizationRegistry; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java index 2c688c25bb..483b2bd7d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.engine.transaction.internal; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.HibernateException; import org.hibernate.TransactionException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java index f4b7b21d5c..bd5768c1d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java @@ -6,10 +6,10 @@ */ package org.hibernate.engine.transaction.internal.jta; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.TransactionException; @@ -45,7 +45,7 @@ public final class JtaStatusHelper { } /** - * Extract the status code from the current {@link javax.transaction.Transaction} associated with the + * Extract the status code from the current {@link jakarta.transaction.Transaction} associated with the * given {@link TransactionManager} * * @param transactionManager The {@link TransactionManager} from which to extract the status. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java index 04afb3267e..374428b403 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java @@ -7,11 +7,11 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.util.Map; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jndi.spi.JndiService; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java index e4e487739b..35b0e04ef7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java index 5fe7cf7cb7..2b9cd0baa6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java index 882b2815e6..79bcde1215 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java index aa9ba67dde..126d98eb5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.jndi.JndiException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java index 1e46283c4d..85de78a5b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java index 6456f361b7..8fa1ec33ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java index dea02a1deb..3239514a9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java index 12dc3e249a..ab3eadbf09 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for JRun4 AS diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java index ee9b808779..1345c133c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java @@ -19,7 +19,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor; import org.jboss.logging.Logger; /** - * Standard initiator for the standard {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} + * Standard initiator for the standard {@link JtaPlatform} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java index c84c141e90..8a4eb4b81d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; /** * Contract used to centralize {@link Synchronization} handling logic. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java index 6b0045db94..56e4155b4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java @@ -6,12 +6,12 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java index be24e4c726..515412abf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for the OC4J (Oracle) AS. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java index 1918f3b31e..eb739c7c19 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Orion diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java index 1f2329e271..0ae8e16236 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Resin diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java index 1fe80f804b..f0519e10d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for SAP NetWeaver diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java index 45edee243d..91a439b180 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Sun ONE Application Server 7 and above diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java index 42e0f9ced3..a90883f556 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.TransactionSynchronizationRegistry; /** * Provides access to a {@link TransactionSynchronizationRegistry} for use by {@link TransactionSynchronizationRegistry}-based diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java index 194bdcb305..d08bd9600a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java index b10d79387d..77f03988da 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * Provides access to a {@link TransactionManager} for use by {@link TransactionManager}-based diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java index 0e59a7c157..dd7dd6ce66 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java @@ -6,14 +6,14 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; /** * Implementation of the {@link JtaSynchronizationStrategy} contract based on using a - * {@link javax.transaction.TransactionManager} + * {@link jakarta.transaction.TransactionManager} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java index 9b99d03a41..f93386af48 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java @@ -9,14 +9,14 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import javax.transaction.xa.XAResource; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java index 3f46871676..3066a2f03a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java index c673317ddf..8ea76dc57c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java @@ -6,13 +6,13 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java index 8ccf093d0b..443f2e8ed7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Weblogic @@ -16,8 +16,8 @@ import javax.transaction.UserTransaction; * @author Steve Ebersole */ public class WeblogicJtaPlatform extends AbstractJtaPlatform { - public static final String TM_NAME = "javax.transaction.TransactionManager"; - public static final String UT_NAME = "javax.transaction.UserTransaction"; + public static final String TM_NAME = "jakarta.transaction.TransactionManager"; + public static final String UT_NAME = "jakarta.transaction.UserTransaction"; @Override protected TransactionManager locateTransactionManager() { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java index 64e2a80c70..2534b9f666 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java index e8ad3ccfd7..8cd66da0f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java @@ -6,11 +6,11 @@ */ package org.hibernate.engine.transaction.jta.platform.spi; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.service.Service; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java index 3edecb6858..72ad587291 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.spi; import java.io.Serializable; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; /** * Manages a registry of {@link Synchronization Synchronizations}. @@ -34,7 +34,7 @@ public interface SynchronizationRegistry extends Serializable { * Delegate {@link Synchronization#afterCompletion} calls to {@link #registerSynchronization registered} * {@link Synchronization Synchronizations} * - * @param status The transaction status (if known) per {@link javax.transaction.Status} + * @param status The transaction status (if known) per {@link jakarta.transaction.Status} */ void notifySynchronizationsAfterTransactionCompletion(int status); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java index 3f5c748049..bd016877bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java @@ -55,7 +55,7 @@ public class DefaultLoadEventListener implements LoadEventListener { */ public void onLoad( final LoadEvent event, - final LoadEventListener.LoadType loadType) throws HibernateException { + final LoadType loadType) throws HibernateException { final EntityPersister persister = getPersister( event ); @@ -91,7 +91,7 @@ public class DefaultLoadEventListener implements LoadEventListener { private void doOnLoad( final EntityPersister persister, final LoadEvent event, - final LoadEventListener.LoadType loadType) { + final LoadType loadType) { try { final EventSource session = event.getSession(); @@ -120,7 +120,7 @@ public class DefaultLoadEventListener implements LoadEventListener { private void checkIdClass( final EntityPersister persister, final LoadEvent event, - final LoadEventListener.LoadType loadType, + final LoadType loadType, final Class idClass) { // we may have the jpa requirement of allowing find-by-id where id is the "simple pk value" of a // dependent objects parent. This is part of its generally goofy derived identity "feature" @@ -156,7 +156,7 @@ public class DefaultLoadEventListener implements LoadEventListener { private void loadByDerivedIdentitySimplePkValue( LoadEvent event, - LoadEventListener.LoadType options, + LoadType options, EntityPersister dependentPersister, // EmbeddedComponentType dependentIdType, EntityPersister parentPersister) { @@ -186,7 +186,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options) { + final LoadType options) { final EventSource session = event.getSession(); if ( event.getInstanceToLoad() != null ) { @@ -235,7 +235,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options) { + final LoadType options) { final EventSource session = event.getSession(); final SessionFactoryImplementor factory = session.getFactory(); @@ -341,7 +341,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options, + final LoadType options, final PersistenceContext persistenceContext, final Object proxy) { if ( LOG.isTraceEnabled() ) { @@ -392,7 +392,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options, + final LoadType options, final PersistenceContext persistenceContext) { Object existing = persistenceContext.getEntity( keyToLoad ); final boolean traceEnabled = LOG.isTraceEnabled(); @@ -444,7 +444,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options, + final LoadType options, final SessionImplementor source) { SoftLock lock = null; final Object ck; @@ -494,7 +494,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options) { + final LoadType options) { final EventSource session = event.getSession(); final boolean traceEnabled = LOG.isTraceEnabled(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java index 3ae42cdea7..efebf79059 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java @@ -20,7 +20,7 @@ import org.hibernate.internal.util.collections.IdentitySet; import org.hibernate.pretty.MessageHelper; /** - * An {@link org.hibernate.event.spi.EntityCopyObserver} implementation that allows multiple representations of + * An {@link EntityCopyObserver} implementation that allows multiple representations of * the same persistent entity to be merged and provides logging of the entity copies that * are detected. * diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java index 92a26b0e4e..b507701b35 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java @@ -11,7 +11,7 @@ import org.hibernate.event.spi.EntityCopyObserverFactory; import org.hibernate.event.spi.EventSource; /** - * An {@link org.hibernate.event.spi.EntityCopyObserver} implementation that allows multiple representations of + * An {@link EntityCopyObserver} implementation that allows multiple representations of * the same persistent entity to be merged. * * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java b/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java index 169c515394..1f99de3394 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; * the merge operation has cascaded to that entity. * * "Merge entity" and "mergeEntity" method parameter refer to an entity that is (or will be) - * merged via {@link org.hibernate.event.spi.EventSource#merge(Object mergeEntity)}. + * merged via {@link EventSource#merge(Object mergeEntity)}. * * "Managed entity" and "managedEntity" method parameter refer to the managed entity that is * the result of merging an entity. @@ -37,8 +37,8 @@ import org.jboss.logging.Logger; * MergeContext already contains an entry with a different entity as the key, but * with the same (managedEntity) value, this means that multiple entity representations * for the same persistent entity are being merged. If this happens, - * {@link org.hibernate.event.spi.EntityCopyObserver#entityCopyDetected( - * Object managedEntity, Object mergeEntity1, Object mergeEntity2, org.hibernate.event.spi.EventSource)} + * {@link EntityCopyObserver#entityCopyDetected( + * Object managedEntity, Object mergeEntity1, Object mergeEntity2, EventSource)} * will be called. It is up to that method to determine the property course of * action for this situation. * @@ -149,7 +149,7 @@ public class MergeContext implements Map { * Returns an unmodifiable set view of the merge-to-managed entity cross-references contained in this MergeContext. * @return an unmodifiable set view of the merge-to-managed entity cross-references contained in this MergeContext * - * @see Collections#unmodifiableSet(java.util.Set) + * @see Collections#unmodifiableSet(Set) */ public Set entrySet() { return Collections.unmodifiableSet( mergeToManagedEntityXref.entrySet() ); @@ -180,7 +180,7 @@ public class MergeContext implements Map { * Returns an unmodifiable set view of the merge entities contained in this MergeContext * @return an unmodifiable set view of the merge entities contained in this MergeContext * - * @see Collections#unmodifiableSet(java.util.Set) + * @see Collections#unmodifiableSet(Set) */ public Set keySet() { return Collections.unmodifiableSet( mergeToManagedEntityXref.keySet() ); @@ -319,7 +319,7 @@ public class MergeContext implements Map { * Returns an unmodifiable Set view of managed entities contained in this MergeContext. * @return an unmodifiable Set view of managed entities contained in this MergeContext * - * @see Collections#unmodifiableSet(java.util.Set) + * @see Collections#unmodifiableSet(Set) */ public Collection values() { return Collections.unmodifiableSet( managedToMergeEntityXref.keySet() ); @@ -367,7 +367,7 @@ public class MergeContext implements Map { * * @return an unmodifiable map view of the managed-to-merge entity cross-references. * - * @see Collections#unmodifiableMap(java.util.Map) + * @see Collections#unmodifiableMap(Map) */ public Map invertMap() { return Collections.unmodifiableMap( managedToMergeEntityXref ); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/package.html b/hibernate-core/src/main/java/org/hibernate/event/internal/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/package.html b/hibernate-core/src/main/java/org/hibernate/event/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/exception/DataException.java b/hibernate-core/src/main/java/org/hibernate/exception/DataException.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/exception/package.html b/hibernate-core/src/main/java/org/hibernate/exception/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java index 94f4029c64..2835606bd3 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java @@ -19,7 +19,7 @@ import org.hibernate.JDBCException; @FunctionalInterface public interface SQLExceptionConversionDelegate { /** - * Convert the given SQLException into the Hibernate {@link org.hibernate.JDBCException} hierarchy. + * Convert the given SQLException into the Hibernate {@link JDBCException} hierarchy. * * @param sqlException The SQLException to be converted. * @param message An (optional) error message. diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java index 9388863419..4912812fc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java @@ -19,7 +19,7 @@ import org.hibernate.JDBCException; * Implementations must have a constructor which takes a * {@link ViolatedConstraintNameExtractor} parameter. *

      - * Implementations may implement {@link org.hibernate.exception.spi.Configurable} if they need to perform + * Implementations may implement {@link Configurable} if they need to perform * configuration steps prior to first use. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java index e3667ebdeb..74574e218d 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java @@ -74,7 +74,7 @@ public class SQLExceptionConverterFactory { /** * Builds a minimal converter. The instance returned here just always converts to - * {@link org.hibernate.exception.GenericJDBCException}. + * {@link GenericJDBCException}. * * @return The minimal converter. */ diff --git a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java index a134df0032..f89de88f81 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java @@ -7,7 +7,7 @@ package org.hibernate.graph; import java.util.Map; -import javax.persistence.Subgraph; +import jakarta.persistence.Subgraph; import org.hibernate.metamodel.model.domain.PersistentAttribute; @@ -18,7 +18,7 @@ import org.hibernate.metamodel.model.domain.PersistentAttribute; * @author Steve Ebersole * @author Andrea Boriero */ -public interface AttributeNode extends GraphNode, javax.persistence.AttributeNode { +public interface AttributeNode extends GraphNode, jakarta.persistence.AttributeNode { PersistentAttribute getAttributeDescriptor(); Map, SubGraph> getSubGraphs(); diff --git a/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java b/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java index 42112badff..0e07aab858 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java @@ -10,7 +10,7 @@ import org.hibernate.HibernateException; /** * Indicates an illegal attempt to make a {@link Graph} become - * an {@link javax.persistence.EntityGraph} via {@link Graph#makeRootGraph(String, boolean)}. + * an {@link jakarta.persistence.EntityGraph} via {@link Graph#makeRootGraph(String, boolean)}. * Generally this happens because the Graph describes an embeddable, whereas an EntityGraph * by definition is only valid for an entity. * diff --git a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java index f99a806054..87fa9a1932 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java @@ -9,12 +9,12 @@ package org.hibernate.graph; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeNode; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.Subgraph; -import javax.persistence.TypedQuery; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.Subgraph; +import jakarta.persistence.TypedQuery; import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/graph/Graph.java b/hibernate-core/src/main/java/org/hibernate/graph/Graph.java index 3432e92e32..98ca0051dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/Graph.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/Graph.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.model.domain.PersistentAttribute; /** * A container for {@link AttributeNode} references. * - * Acts as a "bridge" between JPA's {@link javax.persistence.EntityGraph} and {@link javax.persistence.Subgraph} + * Acts as a "bridge" between JPA's {@link jakarta.persistence.EntityGraph} and {@link jakarta.persistence.Subgraph} * * @author Strong Liu * @author Steve Ebersole @@ -49,8 +49,8 @@ public interface Graph extends GraphNode { // AttributeNode handling /** - * Ultimately only needed for implementing {@link javax.persistence.EntityGraph#getAttributeNodes()} - * and {@link javax.persistence.Subgraph#getAttributeNodes()} + * Ultimately only needed for implementing {@link jakarta.persistence.EntityGraph#getAttributeNodes()} + * and {@link jakarta.persistence.Subgraph#getAttributeNodes()} */ List> getGraphAttributeNodes(); diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java index ea14ee470f..314eee29b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java @@ -6,10 +6,10 @@ */ package org.hibernate.graph; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Subgraph; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Subgraph; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; @@ -17,11 +17,11 @@ import org.hibernate.graph.spi.GraphImplementor; import org.hibernate.graph.spi.RootGraphImplementor; /** - * Parser for string representations of JPA {@link javax.persistence.EntityGraph} - * ({@link RootGraph}) and {@link javax.persistence.Subgraph} ({@link SubGraph}), + * Parser for string representations of JPA {@link jakarta.persistence.EntityGraph} + * ({@link RootGraph}) and {@link jakarta.persistence.Subgraph} ({@link SubGraph}), * using a simple syntax defined by the `graph.g` Antlr grammar. *

      - * The {@link #parse} methods all create a root {@link javax.persistence.EntityGraph} + * The {@link #parse} methods all create a root {@link jakarta.persistence.EntityGraph} * based on the passed entity class and parse the graph string into that root graph. *

      * The {@link #parseInto} methods parse the graph string into a passed graph, which may be a sub-graph diff --git a/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java index 863b389e55..e410b51da7 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java @@ -7,10 +7,10 @@ package org.hibernate.graph; import java.util.List; -import javax.persistence.AttributeNode; -import javax.persistence.EntityGraph; -import javax.persistence.Subgraph; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.Subgraph; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.metamodel.model.domain.PersistentAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java index 6429139e74..104bad9015 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java @@ -7,7 +7,7 @@ package org.hibernate.graph; import java.util.List; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.metamodel.model.domain.PersistentAttribute; @@ -17,10 +17,10 @@ import org.hibernate.metamodel.model.domain.PersistentAttribute; * @author Steve Ebersole * @author Andrea Boriero */ -public interface SubGraph extends Graph, javax.persistence.Subgraph { +public interface SubGraph extends Graph, jakarta.persistence.Subgraph { @Override @SuppressWarnings("unchecked") - default List> getAttributeNodes() { + default List> getAttributeNodes() { return (List) getAttributeNodeList(); } diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java index 79b418f6f9..e7875512b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.graph.internal; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.cfg.NotYetImplementedException; import org.hibernate.graph.SubGraph; diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java index ed0fc5ce4f..9e6f3dcb98 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java @@ -8,7 +8,7 @@ package org.hibernate.graph.spi; import java.util.Map; import java.util.function.BiConsumer; -import javax.persistence.Subgraph; +import jakarta.persistence.Subgraph; import org.hibernate.graph.AttributeNode; import org.hibernate.graph.SubGraph; diff --git a/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java b/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java index c0555a2a1d..60c6ca180d 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java +++ b/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java @@ -36,7 +36,7 @@ public enum EntityIdentifierNature { * * NOTE : May or may not have a related "lookup identifier class" as indicated by a {@code @IdClass} annotation. * - * @see javax.persistence.IdClass + * @see jakarta.persistence.IdClass */ NON_AGGREGATED_COMPOSITE, @@ -52,7 +52,7 @@ public enum EntityIdentifierNature { * *

    * - * @see javax.persistence.EmbeddedId + * @see jakarta.persistence.EmbeddedId */ AGGREGATED_COMPOSITE } diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java index af035542c7..cfa113856a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java @@ -6,7 +6,7 @@ */ package org.hibernate.id; -import javax.persistence.GeneratedValue; +import jakarta.persistence.GeneratedValue; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java index 69828e51bf..76189427b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java @@ -34,7 +34,7 @@ public final class IdentifierGeneratorHelper { /** * Marker object returned from {@link IdentifierGenerator#generate} to indicate that we should short-circuit any * continued generated id checking. Currently this is only used in the case of the - * {@link org.hibernate.id.ForeignGenerator foreign} generator as a way to signal that we should use the associated + * {@link ForeignGenerator foreign} generator as a way to signal that we should use the associated * entity's id value. */ public static final Serializable SHORT_CIRCUIT_INDICATOR = new Serializable() { diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java index 5b176290b1..74501d8cc9 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java @@ -21,7 +21,7 @@ import org.jboss.logging.Logger; * range in the database. *

    * Note that this optimizer works essentially the same as the - * {@link org.hibernate.id.enhanced.HiLoOptimizer} except that here the bucket ranges are actually + * {@link HiLoOptimizer} except that here the bucket ranges are actually * encoded into the database structures. *

    * Note if you prefer that the database value be interpreted as the bottom end of our current range, diff --git a/hibernate-core/src/main/java/org/hibernate/id/package.html b/hibernate-core/src/main/java/org/hibernate/id/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java index 32f6b2d5e3..4ec0211e39 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java @@ -13,11 +13,11 @@ import java.sql.SQLException; import java.util.List; import java.util.TimeZone; import java.util.UUID; -import javax.persistence.FlushModeType; -import javax.persistence.TransactionRequiredException; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.TransactionRequiredException; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.CacheMode; import org.hibernate.EmptyInterceptor; @@ -565,7 +565,7 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont } @Override - public T execute(final LobCreationContext.Callback callback) { + public T execute(final Callback callback) { return getJdbcCoordinator().coordinateWork( (workExecutor, connection) -> { try { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 8f4a844444..c2592f6963 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -19,8 +19,8 @@ import java.util.ServiceConfigurationError; import java.util.Set; import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; import org.hibernate.HibernateException; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java index 085299a517..c75c66f78c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java @@ -114,7 +114,7 @@ public interface EntityManagerMessageLogger extends CoreMessageLogger { @LogMessage(level = WARN) @Message( id = 15016, - value = "Encountered a deprecated javax.persistence.spi.PersistenceProvider [%s]; [%s] will be used instead." + value = "Encountered a deprecated jakarta.persistence.spi.PersistenceProvider [%s]; [%s] will be used instead." ) void deprecatedPersistenceProvider(String deprecated, String replacement); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java index 33c499e1a6..ff0172ac5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java @@ -8,16 +8,16 @@ package org.hibernate.internal; import java.io.Serializable; import java.sql.SQLException; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityNotFoundException; -import javax.persistence.LockTimeoutException; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; -import javax.persistence.PessimisticLockException; -import javax.persistence.QueryTimeoutException; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.LockTimeoutException; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PessimisticLockException; +import jakarta.persistence.QueryTimeoutException; +import jakarta.persistence.RollbackException; import org.hibernate.HibernateException; import org.hibernate.JDBCException; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java index bbd4ddb951..8138e3609b 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.internal; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.hibernate.TransactionException; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java index 2165401b68..2dcfeeb7b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java @@ -10,9 +10,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.PessimisticLockScope; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index b4b27dc507..a75eb8396e 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -23,13 +23,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; import javax.naming.Reference; import javax.naming.StringRefAddr; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContextType; -import javax.persistence.PersistenceException; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.Query; -import javax.persistence.SynchronizationType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceContextType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.Query; +import jakarta.persistence.SynchronizationType; import org.hibernate.ConnectionAcquisitionMode; import org.hibernate.ConnectionReleaseMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java index 45860bd477..0488422619 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java @@ -190,7 +190,7 @@ public class SessionFactoryRegistry { } /** - * Implementation of {@literal JNDI} {@link javax.naming.event.NamespaceChangeListener} contract to listener for context events + * Implementation of {@literal JNDI} {@link NamespaceChangeListener} contract to listener for context events * and react accordingly if necessary */ private final NamespaceChangeListener listener = new NamespaceChangeListener() { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java index 93f28e3e98..ebfddf180c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java @@ -22,16 +22,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.PersistenceException; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.CacheMode; import org.hibernate.Filter; @@ -153,8 +153,8 @@ import static org.hibernate.cfg.AvailableSettings.JPA_SHARED_CACHE_STORE_MODE; * Concrete implementation of a Session. *

    * Exposes two interfaces:

      - *
    • {@link org.hibernate.Session} to the application
      • - *
    • {@link org.hibernate.engine.spi.SessionImplementor} to other Hibernate components (SPI)
      • + *
    • {@link Session} to the application
      • + *
    • {@link SessionImplementor} to other Hibernate components (SPI)
      • *
    *

    * This class is not thread-safe. @@ -1055,7 +1055,7 @@ public class SessionImpl } try { - final LoadEventListener.LoadType type; + final LoadType type; if ( nullable ) { type = LoadEventListener.INTERNAL_LOAD_NULLABLE; } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java old mode 100755 new mode 100644 index 29542ff0d8..d57a0a6a15 --- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java @@ -9,7 +9,7 @@ package org.hibernate.internal; import java.io.Serializable; import java.sql.Connection; import java.util.Set; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.hibernate.CacheMode; import org.hibernate.EntityMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java index 06e35b1c95..a68da5e809 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java @@ -230,7 +230,7 @@ public interface DeprecationLogger extends BasicLogger { @LogMessage(level = WARN) @Message( id = 90000022, - value = "Hibernate's legacy org.hibernate.Criteria API is deprecated; use the JPA javax.persistence.criteria.CriteriaQuery instead" + value = "Hibernate's legacy org.hibernate.Criteria API is deprecated; use the JPA jakarta.persistence.criteria.CriteriaQuery instead" ) void deprecatedLegacyCriteria(); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java index e05d34fdf9..944aaa6833 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java @@ -19,7 +19,7 @@ import org.jboss.logging.annotations.ValidIdRange; import static org.jboss.logging.Logger.Level.WARN; /** - * Acts as the {@link org.jboss.logging.annotations.MessageLogger} and + * Acts as the {@link MessageLogger} and * {@link org.jboss.logging.annotations.MessageBundle} for messages related to * processing URLs. * @@ -37,9 +37,9 @@ public interface UrlMessageBundle { boolean TRACE_ENABLED = URL_LOGGER.isTraceEnabled(); /** - * Logs a warning about a malformed URL, caused by a {@link java.net.URISyntaxException} + * Logs a warning about a malformed URL, caused by a {@link URISyntaxException} * - * @param jarUrl The URL that lead to the {@link java.net.URISyntaxException} + * @param jarUrl The URL that lead to the {@link URISyntaxException} * @param e The underlying URISyntaxException */ @LogMessage( level = WARN ) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java b/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java index 329e3a17e8..4d6e30f043 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java @@ -83,8 +83,8 @@ public final class ConfigHelper { /** * Open an InputStream to the URL represented by the incoming path. First makes a call - * to {@link #locateConfig(java.lang.String)} in order to find an appropriate URL. - * {@link java.net.URL#openStream()} is then called to obtain the stream. + * to {@link #locateConfig(String)} in order to find an appropriate URL. + * {@link URL#openStream()} is then called to obtain the stream. * * @param path The path representing the config location. * diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java index 32de511ab8..1c9be2d6f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java @@ -6,14 +6,14 @@ */ package org.hibernate.internal.util; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.AssertionFailure; import org.hibernate.LockMode; /** - * Helper to deal with conversions (both directions) between {@link org.hibernate.LockMode} and - * {@link javax.persistence.LockModeType}. + * Helper to deal with conversions (both directions) between {@link LockMode} and + * {@link jakarta.persistence.LockModeType}. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java index c358266274..7811e7bdd1 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java @@ -16,7 +16,7 @@ import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.util.Locale; import java.util.regex.Pattern; -import javax.persistence.Transient; +import jakarta.persistence.Transient; import org.hibernate.AssertionFailure; import org.hibernate.MappingException; @@ -173,7 +173,7 @@ public final class ReflectHelper { * * @throws ClassNotFoundException From {@link Class#forName(String)}. * - * @deprecated Depending on context, either {@link org.hibernate.boot.registry.classloading.spi.ClassLoaderService} + * @deprecated Depending on context, either {@link ClassLoaderService} * or {@link org.hibernate.boot.spi.ClassLoaderAccess} should be preferred */ @Deprecated diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java index a3e4417b4b..60dc5419d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java @@ -272,7 +272,7 @@ public final class SerializationHelper { /** * Deserializes an object from an array of bytes. *

    - * Delegates to {@link #deserialize(java.io.InputStream, ClassLoader)} using a + * Delegates to {@link #deserialize(InputStream, ClassLoader)} using a * {@link ByteArrayInputStream} to wrap the array. * * @param objectData the serialized object, must not be null diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java index f124fef985..ee1a61d1a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java @@ -8,7 +8,7 @@ package org.hibernate.internal.util; /** * Represents a "final" value that is initialized either {@link #ValueHolder(Object) up front} or once at some point - * {@link #ValueHolder(ValueHolder.DeferredInitializer) after} declaration. + * {@link #ValueHolder(DeferredInitializer) after} declaration. * * Note: If a Serializable class has a {@link ValueHolder} property, that property should be declared transient! * diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java index 5d95852b5e..2bd13df5d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java @@ -112,7 +112,7 @@ public final class ArrayHelper { } public static Object[] typecast(Object[] array, Object[] to) { - return java.util.Arrays.asList( array ).toArray( to ); + return Arrays.asList( array ).toArray( to ); } //Arrays.asList doesn't do primitive arrays @@ -330,7 +330,7 @@ public final class ArrayHelper { /** * Compare 2 arrays only at the first level * - * @deprecated Use {@link java.util.Arrays#equals(Object[], Object[])} instead + * @deprecated Use {@link Arrays#equals(Object[], Object[])} instead */ @Deprecated public static boolean isEquals(Object[] o1, Object[] o2) { @@ -355,7 +355,7 @@ public final class ArrayHelper { /** * Compare 2 arrays only at the first level * - * @deprecated Use {@link java.util.Arrays#equals(char[], char[])} instead + * @deprecated Use {@link Arrays#equals(char[], char[])} instead */ @Deprecated public static boolean isEquals(char[] o1, char[] o2) { @@ -380,7 +380,7 @@ public final class ArrayHelper { /** * Compare 2 arrays only at the first level * - * @deprecated Use {@link java.util.Arrays#equals(byte[], byte[])} instead + * @deprecated Use {@link Arrays#equals(byte[], byte[])} instead */ @Deprecated public static boolean isEquals(byte[] b1, byte[] b2) { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java index bd867246a8..ed1b9870ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java @@ -170,7 +170,7 @@ public class BoundedConcurrentHashMap extends AbstractMap final Segment[] segments; transient Set keySet; - transient Set> entrySet; + transient Set> entrySet; transient Collection values; /* ---------------- Small Utilities -------------- */ @@ -2008,7 +2008,7 @@ public class BoundedConcurrentHashMap extends AbstractMap */ @Override public void putAll(Map m) { - for ( Map.Entry e : m.entrySet() ) { + for ( Entry e : m.entrySet() ) { put( e.getKey(), e.getValue() ); } } @@ -2146,8 +2146,8 @@ public class BoundedConcurrentHashMap extends AbstractMap * reflect any modifications subsequent to construction. */ @Override - public Set> entrySet() { - Set> es = entrySet; + public Set> entrySet() { + Set> es = entrySet; return es != null ? es : ( entrySet = new EntrySet() ); } @@ -2271,7 +2271,7 @@ public class BoundedConcurrentHashMap extends AbstractMap * Custom Entry class used by EntryIterator.next(), that relays * setValue changes to the underlying map. */ - final class WriteThroughEntry extends AbstractMap.SimpleEntry { + final class WriteThroughEntry extends SimpleEntry { private static final long serialVersionUID = -7041346694785573824L; @@ -2301,7 +2301,7 @@ public class BoundedConcurrentHashMap extends AbstractMap final class EntryIterator extends HashIterator implements Iterator> { @Override - public Map.Entry next() { + public Entry next() { HashEntry e = super.nextEntry(); return new WriteThroughEntry( e.key, e.value ); } @@ -2366,9 +2366,9 @@ public class BoundedConcurrentHashMap extends AbstractMap } } - final class EntrySet extends AbstractSet> { + final class EntrySet extends AbstractSet> { @Override - public Iterator> iterator() { + public Iterator> iterator() { return new EntryIterator(); } @@ -2377,7 +2377,7 @@ public class BoundedConcurrentHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; V v = BoundedConcurrentHashMap.this.get( e.getKey() ); return v != null && v.equals( e.getValue() ); } @@ -2387,7 +2387,7 @@ public class BoundedConcurrentHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; return BoundedConcurrentHashMap.this.remove( e.getKey(), e.getValue() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java index 986152ab0b..94a9cfd00a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java @@ -235,7 +235,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap boolean identityComparisons; transient Set keySet; - transient Set> entrySet; + transient Set> entrySet; transient Collection values; /* ---------------- Small Utilities -------------- */ @@ -1353,7 +1353,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap */ @Override public void putAll(Map m) { - for ( Map.Entry e : m.entrySet() ) { + for ( Entry e : m.entrySet() ) { put( e.getKey(), e.getValue() ); } } @@ -1512,8 +1512,8 @@ public class ConcurrentReferenceHashMap extends AbstractMap * reflect any modifications subsequent to construction. */ @Override - public Set> entrySet() { - Set> es = entrySet; + public Set> entrySet() { + Set> es = entrySet; return ( es != null ) ? es : ( entrySet = new EntrySet() ); } @@ -1649,7 +1649,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap /* * This class is needed for JDK5 compatibility. */ - static class SimpleEntry implements Entry, java.io.Serializable { + static class SimpleEntry implements Entry, Serializable { private static final long serialVersionUID = -8499721149061103585L; private final K key; @@ -1688,7 +1688,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap return false; } @SuppressWarnings("unchecked") - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; return eq( key, e.getKey() ) && eq( value, e.getValue() ); } @@ -1744,7 +1744,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap extends HashIterator implements Iterator> { @Override - public Map.Entry next() { + public Entry next() { HashEntry e = super.nextEntry(); return new WriteThroughEntry( e.key(), e.value() ); } @@ -1809,9 +1809,9 @@ public class ConcurrentReferenceHashMap extends AbstractMap } } - final class EntrySet extends AbstractSet> { + final class EntrySet extends AbstractSet> { @Override - public Iterator> iterator() { + public Iterator> iterator() { return new EntryIterator(); } @@ -1820,7 +1820,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; V v = ConcurrentReferenceHashMap.this.get( e.getKey() ); return v != null && v.equals( e.getValue() ); } @@ -1830,7 +1830,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; return ConcurrentReferenceHashMap.this.remove( e.getKey(), e.getValue() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java index a27d5ab912..8bec05efe0 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java @@ -24,7 +24,7 @@ public final class IdentityMap implements Map { private final LinkedHashMap,V> map; @SuppressWarnings( {"unchecked"}) - private transient Map.Entry,V>[] entryArray = null; + private transient Entry,V>[] entryArray = null; /** * Return a new instance of this class, with iteration @@ -54,7 +54,7 @@ public final class IdentityMap implements Map { * @param map The map of entries * @return Collection */ - public static Map.Entry[] concurrentEntries(Map map) { + public static Entry[] concurrentEntries(Map map) { return ( (IdentityMap) map ).entryArray(); } @@ -152,9 +152,9 @@ public final class IdentityMap implements Map { } @SuppressWarnings( {"unchecked"}) - public Map.Entry[] entryArray() { + public Entry[] entryArray() { if ( entryArray == null ) { - entryArray = new Map.Entry[ map.size() ]; + entryArray = new Entry[ map.size() ]; final Iterator, V>> itr = map.entrySet().iterator(); int i = 0; while ( itr.hasNext() ) { @@ -191,7 +191,7 @@ public final class IdentityMap implements Map { } - private static final class IdentityMapEntry implements java.util.Map.Entry { + private static final class IdentityMapEntry implements Entry { private final K key; private final V value; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/SingletonIterator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/SingletonIterator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java index 998da7c990..fffe566595 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java @@ -343,7 +343,7 @@ public final class ConfigurationHelper { * The exact behavior here is largely dependant upon what is passed in as * the delimiter. * - * @see #extractPropertyValue(String, java.util.Properties) + * @see #extractPropertyValue(String, Properties) * * @param propertyName The name of the property for which to retrieve value * @param delim The string defining tokens used as both entry and key/value delimiters. @@ -368,7 +368,7 @@ public final class ConfigurationHelper { * The exact behavior here is largely dependant upon what is passed in as * the delimiter. * - * @see #extractPropertyValue(String, java.util.Properties) + * @see #extractPropertyValue(String, Properties) * * @param propertyName The name of the property for which to retrieve value * @param delim The string defining tokens used as both entry and key/value delimiters. @@ -390,7 +390,7 @@ public final class ConfigurationHelper { /** * Get a property value as a string array. * - * @see #extractPropertyValue(String, java.util.Properties) + * @see #extractPropertyValue(String, Properties) * @see #toStringArray(String, String) * * @param propertyName The name of the property for which to retrieve value diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java index 59e9f6c28e..10a529c9ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java @@ -25,7 +25,7 @@ public abstract class AbstractReturningWork implements ReturningWork, Work * @param executor The visitor that executes the work * @param connection The connection on which to perform the work. * - * @return the valued returned by {@link #execute(java.sql.Connection)}. + * @return the valued returned by {@link #execute(Connection)}. * * @throws SQLException Thrown during execution of the underlying JDBC interaction. * @throws org.hibernate.HibernateException Generally indicates a wrapped SQLException. diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java index ef65cd1d12..8a835d2579 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java @@ -24,7 +24,7 @@ public abstract class AbstractWork implements Work, WorkExecutorVisitable * encapsulated by this work instance using the supplied connection. * * Because {@link Work} does not return a value when executed - * (via {@link Work#execute(java.sql.Connection)}, this method + * (via {@link Work#execute(Connection)}, this method * always returns null. * * @param connection The connection on which to perform the work. diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java index 3f5db464b5..f7acef6fc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java @@ -22,7 +22,7 @@ public class WorkExecutor { * using the supplied connection. * * Because {@link Work} does not return a value when executed - * (via {@link Work#execute(java.sql.Connection)}, this method + * (via {@link Work#execute(Connection)}, this method * always returns null. * * @param work The @link ReturningWork} instance encapsulating the discrete work @@ -41,7 +41,7 @@ public class WorkExecutor { /** * Execute the discrete work encapsulated by a {@link ReturningWork} instance * using the supplied connection, returning the result of - * {@link ReturningWork#execute(java.sql.Connection)} + * {@link ReturningWork#execute(Connection)} * * @param work The @link ReturningWork} instance encapsulating the discrete work * @param connection The connection on which to perform the work. diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/package.html b/hibernate-core/src/main/java/org/hibernate/jdbc/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java index cb9acc2bad..02d10e30cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java @@ -262,10 +262,10 @@ public interface AvailableSettings { String SESSION_INTERCEPTOR = "hibernate.ejb.interceptor.session_scoped"; /** - * Query hint (aka {@link javax.persistence.Query#setHint}) for applying + * Query hint (aka {@link jakarta.persistence.Query#setHint}) for applying * an alias specific lock mode (aka {@link org.hibernate.Query#setLockMode}). *

    - * Either {@link org.hibernate.LockMode} or {@link javax.persistence.LockModeType} + * Either {@link org.hibernate.LockMode} or {@link jakarta.persistence.LockModeType} * are accepted. Also the String names of either are accepted as well. null * is additionally accepted as meaning {@link org.hibernate.LockMode#NONE}. *

    diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java old mode 100755 new mode 100644 index bf82f7a02d..3712934b6b --- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java @@ -6,13 +6,13 @@ */ package org.hibernate.jpa; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.query.QueryProducer; /** - * Additional contract for Hibernate implementations of {@link javax.persistence.EntityManager} providing access to various Hibernate + * Additional contract for Hibernate implementations of {@link jakarta.persistence.EntityManager} providing access to various Hibernate * specific functionality. * * @author Gavin King @@ -22,7 +22,7 @@ import org.hibernate.query.QueryProducer; @Deprecated public interface HibernateEntityManager extends EntityManager, QueryProducer { /** - * Retrieve a reference to the Hibernate {@link org.hibernate.Session} used by this {@link javax.persistence.EntityManager}. + * Retrieve a reference to the Hibernate {@link Session} used by this {@link jakarta.persistence.EntityManager}. * * @return The session */ diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java old mode 100755 new mode 100644 index d1416ce7e2..8d9f135221 --- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java @@ -8,16 +8,16 @@ package org.hibernate.jpa; import java.io.Serializable; import java.util.List; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.Metamodel; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.spi.SessionFactoryImplementor; /** - * Contract giving access to the underlying {@link org.hibernate.SessionFactory} from an {@link javax.persistence.EntityManagerFactory} + * Contract giving access to the underlying {@link org.hibernate.SessionFactory} from an {@link jakarta.persistence.EntityManagerFactory} * * @author Gavin King * diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java old mode 100755 new mode 100644 index 2b6a3f8150..1920448361 --- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java @@ -9,12 +9,12 @@ package org.hibernate.jpa; import java.util.Collections; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; -import javax.persistence.spi.LoadState; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.LoadState; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.ProviderUtil; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java index bedd7b4a8e..838956f57d 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java @@ -17,11 +17,11 @@ import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.AttributeConverter; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.SessionFactory; @@ -401,7 +401,7 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil } /** - * Builds the {@link BootstrapServiceRegistry} used to eventually build the {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder}; mainly + * Builds the {@link BootstrapServiceRegistry} used to eventually build the {@link StandardServiceRegistryBuilder}; mainly * used here during instantiation to define class-loading behavior. * * @param integrationSettings Any integration settings passed by the EE container or SE application diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java index 5d8f46b2de..28fed3ac96 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.boot.internal; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java index 1937374529..9962e79632 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java @@ -11,16 +11,16 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; /** * Describes the information gleaned from a {@code } element in a {@code persistence.xml} file * whether parsed directly by Hibernate or passed to us by an EE container as a - * {@link javax.persistence.spi.PersistenceUnitInfo}. + * {@link jakarta.persistence.spi.PersistenceUnitInfo}. * * Easier to consolidate both views into a single contract and extract information through that shared contract. * diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java index 8b139aaf67..c8de2fc784 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java @@ -9,10 +9,10 @@ package org.hibernate.jpa.boot.internal; import java.net.URL; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java index f80feb10e0..9e4a839c04 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -480,6 +480,10 @@ public class PersistenceXmlParser { } } + /** + * Validate the document using the + * @param document + */ private void validate(Document document) { // todo : add ability to disable validation... diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java index 404ecfc60a..49c3922a9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java @@ -8,8 +8,8 @@ package org.hibernate.jpa.boot.spi; import java.net.URL; import java.util.Map; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java index 5c9ad9de57..43a6a152f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.boot.spi; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.hibernate.boot.model.process.spi.ManagedResources; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java index d82081dd8c..97b79f9eab 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java @@ -9,15 +9,15 @@ package org.hibernate.jpa.boot.spi; import java.net.URL; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; /** * Abstraction for dealing with either {@code } information whether that comes from - * an EE container in the form of {@link javax.persistence.spi.PersistenceUnitInfo} or in an SE environment + * an EE container in the form of {@link jakarta.persistence.spi.PersistenceUnitInfo} or in an SE environment * where Hibernate has parsed the {@code persistence.xml} file itself. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java index 4cd136809c..4269287f0c 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java @@ -16,7 +16,7 @@ import org.jboss.logging.Logger; /** * Helper for handling checks to see whether Hibernate is the requested - * {@link javax.persistence.spi.PersistenceProvider} + * {@link jakarta.persistence.spi.PersistenceProvider} * * @author Steve Ebersole */ @@ -26,7 +26,7 @@ public final class ProviderChecker { /** * Does the descriptor and/or integration request Hibernate as the - * {@link javax.persistence.spi.PersistenceProvider}? Note that in the case of no requested provider being named + * {@link jakarta.persistence.spi.PersistenceProvider}? Note that in the case of no requested provider being named * we assume we are the provider (the calls got to us somehow...) * * @param persistenceUnit The {@code } descriptor. diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java index d7fac04bc1..2d6ab1bb26 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java @@ -12,12 +12,12 @@ import java.lang.annotation.Target; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.ExcludeDefaultListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.MappedSuperclass; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PersistenceException; import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.ReflectionManager; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java index dc1fcc3a63..ba255a3846 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java @@ -7,7 +7,7 @@ package org.hibernate.jpa.event.internal; import java.util.HashMap; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.jpa.event.spi.Callback; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java index 0561b8edbc..5eba9ae5b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java @@ -16,7 +16,7 @@ import org.hibernate.service.ServiceRegistry; /** * The intent of this class is to use a lighter implementation * when JPA callbacks are disabled via - * {@link org.hibernate.boot.spi.SessionFactoryOptions#areJPACallbacksEnabled()} + * {@link SessionFactoryOptions#areJPACallbacksEnabled()} */ public final class CallbacksFactory { public static CallbackRegistryImplementor buildCallbackRegistry(SessionFactoryOptions options) { diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java index 99b45cdd8c..40b78a9b04 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java @@ -7,13 +7,13 @@ package org.hibernate.jpa.event.spi; import java.lang.annotation.Annotation; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java index f197c9fddc..793a353084 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.event.spi.jpa; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; /** * @deprecated Use {@link org.hibernate.resource.beans.container.spi.ExtendedBeanManager} instead diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java index f7b84a3318..36f5cf84f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.internal; -import javax.persistence.PersistenceException; -import javax.transaction.SystemException; +import jakarta.persistence.PersistenceException; +import jakarta.transaction.SystemException; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java index bb71b74d4c..da943aab95 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java @@ -7,8 +7,8 @@ package org.hibernate.jpa.internal; import java.io.Serializable; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.spi.LoadState; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.spi.LoadState; import org.hibernate.Hibernate; import org.hibernate.MappingException; @@ -77,13 +77,13 @@ public class PersistenceUnitUtilImpl implements PersistenceUnitUtil, Serializabl } else { // HHH-11426 - best effort to deal with the case of detached entities - log.debug( "javax.persistence.PersistenceUnitUtil.getIdentifier may not be able to read identifier of a detached entity" ); + log.debug( "jakarta.persistence.PersistenceUnitUtil.getIdentifier may not be able to read identifier of a detached entity" ); return getIdentifierFromPersister( entity ); } } else { log.debug( - "javax.persistence.PersistenceUnitUtil.getIdentifier is only intended to work with enhanced entities " + + "jakarta.persistence.PersistenceUnitUtil.getIdentifier is only intended to work with enhanced entities " + "(although Hibernate also adapts this support to its proxies); " + "however the passed entity was not enhanced (nor a proxy).. may not be able to read identifier" ); diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java index a8d630c55c..c4d752c304 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.internal.util; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java index ea78f317db..3c6e64cd4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java @@ -9,8 +9,8 @@ package org.hibernate.jpa.internal.util; import java.util.Locale; import java.util.Map; import java.util.Properties; -import javax.persistence.FlushModeType; -import javax.persistence.PersistenceException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.PersistenceException; import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; @@ -33,8 +33,8 @@ public abstract class ConfigurationHelper { if ( value instanceof FlushMode ) { flushMode = (FlushMode) value; } - else if ( value instanceof javax.persistence.FlushModeType ) { - flushMode = ConfigurationHelper.getFlushMode( (javax.persistence.FlushModeType) value ); + else if ( value instanceof jakarta.persistence.FlushModeType ) { + flushMode = ConfigurationHelper.getFlushMode( (jakarta.persistence.FlushModeType) value ); } else if ( value instanceof String ) { flushMode = ConfigurationHelper.getFlushMode( (String) value ); diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java index f4b2141468..06f526e58a 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java @@ -8,7 +8,7 @@ package org.hibernate.jpa.internal.util; import java.util.Locale; -import javax.persistence.FlushModeType; +import jakarta.persistence.FlushModeType; import org.hibernate.AssertionFailure; import org.hibernate.FlushMode; @@ -17,7 +17,7 @@ import org.hibernate.MappingException; import org.jboss.logging.Logger; /** - * Helper to deal with {@link FlushModeType} <-> {@link org.hibernate.FlushMode} conversions. + * Helper to deal with {@link FlushModeType} <-> {@link FlushMode} conversions. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java index 97b6f11513..4a34b696ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.internal.util; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.LockMode; import org.hibernate.internal.util.LockModeConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java index 621258df6d..d6b911f617 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java @@ -8,8 +8,8 @@ package org.hibernate.jpa.internal.util; import java.util.Map; import java.util.function.Supplier; -import javax.persistence.PersistenceException; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PessimisticLockScope; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java index c77cad2c8b..0c26610efc 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.internal.util; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceUnitTransactionType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java index 9c75850c16..25d99c5e47 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import javax.persistence.spi.LoadState; +import jakarta.persistence.spi.LoadState; import org.hibernate.HibernateException; import org.hibernate.bytecode.enhance.spi.interceptor.AbstractLazyLoadInterceptor; @@ -32,11 +32,11 @@ import org.hibernate.proxy.LazyInitializer; /** * Central delegate for handling calls from:

      - *
    • {@link javax.persistence.PersistenceUtil#isLoaded(Object)}
      • - *
    • {@link javax.persistence.PersistenceUtil#isLoaded(Object, String)}
      • - *
    • {@link javax.persistence.spi.ProviderUtil#isLoaded(Object)}
      • - *
    • {@link javax.persistence.spi.ProviderUtil#isLoadedWithReference(Object, String)}
      • - *
    • {@link javax.persistence.spi.ProviderUtil#isLoadedWithoutReference(Object, String)}li> + *
    • {@link jakarta.persistence.PersistenceUtil#isLoaded(Object)}
      • + *
    • {@link jakarta.persistence.PersistenceUtil#isLoaded(Object, String)}
      • + *
    • {@link jakarta.persistence.spi.ProviderUtil#isLoaded(Object)}
      • + *
    • {@link jakarta.persistence.spi.ProviderUtil#isLoadedWithReference(Object, String)}
      • + *
    • {@link jakarta.persistence.spi.ProviderUtil#isLoadedWithoutReference(Object, String)}li> *
    * * @author Emmanuel Bernard @@ -54,7 +54,7 @@ public final class PersistenceUtilHelper { * Return is defined as follows:
      *
    1. * If the reference is a {@link HibernateProxy}, we return {@link LoadState#LOADED} if - * {@link org.hibernate.proxy.LazyInitializer#isUninitialized()} returns {@code false}; else we return + * {@link LazyInitializer#isUninitialized()} returns {@code false}; else we return * {@link LoadState#NOT_LOADED} *
      2. *
    2. @@ -64,7 +64,7 @@ public final class PersistenceUtilHelper { *
      3. *
    3. * If the reference is a {@link PersistentCollection}, we return {@link LoadState#LOADED} if - * {@link org.hibernate.collection.spi.PersistentCollection#wasInitialized()} returns {@code true}; else + * {@link PersistentCollection#wasInitialized()} returns {@code true}; else * we return {@link LoadState#NOT_LOADED} *
      4. *
    4. diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java index cd803e7504..42a9cfb128 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java @@ -17,9 +17,9 @@ import org.hibernate.Transaction; public interface JpaCompliance { /** * Controls whether Hibernate's handling of JPA's - * {@link javax.persistence.Query} (JPQL, Criteria and native-query) should + * {@link jakarta.persistence.Query} (JPQL, Criteria and native-query) should * strictly follow the JPA spec. This includes both in terms of parsing or - * translating a query as well as calls to the {@link javax.persistence.Query} + * translating a query as well as calls to the {@link jakarta.persistence.Query} * methods throwing spec defined exceptions where as Hibernate might not. * * Deviations result in an exception if enabled @@ -30,7 +30,7 @@ public interface JpaCompliance { /** * Indicates that Hibernate's {@link Transaction} should behave as - * defined by the spec for JPA's {@link javax.persistence.EntityTransaction} + * defined by the spec for JPA's {@link jakarta.persistence.EntityTransaction} * since it extends the JPA one. * * @return {@code true} indicates to behave in the spec-defined way @@ -53,7 +53,7 @@ public interface JpaCompliance { /** * JPA defines specific exceptions on specific methods when called on - * {@link javax.persistence.EntityManager} and {@link javax.persistence.EntityManagerFactory} + * {@link jakarta.persistence.EntityManager} and {@link jakarta.persistence.EntityManagerFactory} * when those objects have been closed. This setting controls * whether the spec defined behavior or Hibernate's behavior will be used. * @@ -65,7 +65,7 @@ public interface JpaCompliance { boolean isJpaClosedComplianceEnabled(); /** - * JPA spec says that an {@link javax.persistence.EntityNotFoundException} + * JPA spec says that an {@link jakarta.persistence.EntityNotFoundException} * should be thrown when accessing an entity Proxy which does not have an associated * table row in the database. * @@ -91,7 +91,7 @@ public interface JpaCompliance { boolean isJpaCacheComplianceEnabled(); /** - * Should the the scope of {@link javax.persistence.TableGenerator#name()} and {@link javax.persistence.SequenceGenerator#name()} be + * Should the the scope of {@link jakarta.persistence.TableGenerator#name()} and {@link jakarta.persistence.SequenceGenerator#name()} be * considered globally or locally defined? * * @return {@code true} indicates the generator name scope is considered global. @@ -99,7 +99,7 @@ public interface JpaCompliance { boolean isGlobalGeneratorScopeEnabled(); /** - * Should we strictly handle {@link javax.persistence.OrderBy} expressions? + * Should we strictly handle {@link jakarta.persistence.OrderBy} expressions? * * JPA says the order-items can only be attribute references whereas Hibernate supports a wide range of items. With * this enabled, Hibernate will throw a compliance error when a non-attribute-reference is used. @@ -107,8 +107,8 @@ public interface JpaCompliance { boolean isJpaOrderByMappingComplianceEnabled(); /** - * JPA says that the id passed to {@link javax.persistence.EntityManager#getReference} and - * {@link javax.persistence.EntityManager#find} should be the exact expected type, allowing + * JPA says that the id passed to {@link jakarta.persistence.EntityManager#getReference} and + * {@link jakarta.persistence.EntityManager#find} should be the exact expected type, allowing * no type coercion. * * Historically, Hibernate behaved the same way. Since 6.0 however, Hibernate has the ability to diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java index c68fe35d73..d802e8a0c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.LinkedHashMap; 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.hibernate.HibernateException; import org.hibernate.transform.BasicTransformerAdapter; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java index 2f341f21a4..6247314c53 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.spi; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * Represents the value currently bound to a particular (bindable) parameter. diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java index 66f377ce14..e0c77bbade 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java @@ -6,14 +6,14 @@ */ package org.hibernate.jpa.spi; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.Query; -import javax.persistence.TemporalType; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; /** - * Hibernate specific extension to the JPA {@link javax.persistence.Parameter} contract as known to the - * {@link javax.persistence.Query} and {@link javax.persistence.StoredProcedureQuery} implementations. Used to track + * Hibernate specific extension to the JPA {@link jakarta.persistence.Parameter} contract as known to the + * {@link jakarta.persistence.Query} and {@link jakarta.persistence.StoredProcedureQuery} implementations. Used to track * information known about the parameter. *

      * For parameter information as known to JPA criteria queries, see {@link org.hibernate.query.criteria.internal.expression.ParameterExpressionImpl} diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java index 89ca0d223b..580a7e3ef9 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java @@ -9,8 +9,8 @@ package org.hibernate.loader.ast.internal; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/package.html b/hibernate-core/src/main/java/org/hibernate/loader/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java b/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java index 237caa3908..7ad72ef3c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java +++ b/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.io.Reader; /** - * Exposes a {@link java.io.Reader} as an {@link java.io.InputStream}. + * Exposes a {@link Reader} as an {@link java.io.InputStream}. * * @deprecated Should not be used anymore. */ diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java b/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java index 172681c513..b0a0d7c7ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java @@ -9,9 +9,9 @@ package org.hibernate.mapping; import java.util.Map; import java.util.Properties; import java.util.function.Function; -import javax.persistence.AttributeConverter; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; import org.hibernate.MappingException; import org.hibernate.boot.model.TypeDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java index 92e2b76932..2fcfdac45e 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java @@ -73,8 +73,8 @@ public abstract class Collection implements Fetchable, Value, Filterable { private Class collectionPersisterClass; private String typeName; private Properties typeParameters; - private final java.util.List filters = new ArrayList(); - private final java.util.List manyToManyFilters = new ArrayList(); + private final List filters = new ArrayList(); + private final List manyToManyFilters = new ArrayList(); private final java.util.Set synchronizedTables = new HashSet<>(); private String customSQLInsert; @@ -598,7 +598,7 @@ public abstract class Collection implements Fetchable, Value, Filterable { ); } - public java.util.List getFilters() { + public List getFilters() { return filters; } @@ -620,7 +620,7 @@ public abstract class Collection implements Fetchable, Value, Filterable { ); } - public java.util.List getManyToManyFilters() { + public List getManyToManyFilters() { return manyToManyFilters; } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java index c79e6bc285..ca13781847 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java @@ -200,7 +200,7 @@ public class Column implements Selectable, Serializable, Cloneable { } public int getSqlTypeCode(Mapping mapping) throws MappingException { - org.hibernate.type.Type type = getValue().getType(); + Type type = getValue().getType(); try { int sqlTypeCode = type.getSqlTypeCodes( mapping )[getTypeIndex()]; if ( getSqlTypeCode() != null && getSqlTypeCode() != sqlTypeCode ) { diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java index e5ac3af591..51c286a04e 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java @@ -54,7 +54,7 @@ public class Component extends SimpleValue implements MetaAttributable { private boolean isKey; private String roleName; - private java.util.Map tuplizerImpls; + private Map tuplizerImpls; // cache the status of the type private volatile Type type; @@ -226,7 +226,7 @@ public class Component extends SimpleValue implements MetaAttributable { } @Override - public java.util.Map getMetaAttributes() { + public Map getMetaAttributes() { return metaAttributes; } @@ -236,7 +236,7 @@ public class Component extends SimpleValue implements MetaAttributable { } @Override - public void setMetaAttributes(java.util.Map metas) { + public void setMetaAttributes(Map metas) { this.metaAttributes = metas; } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java index 959e63a49b..bf7216d98c 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java @@ -101,7 +101,7 @@ public class OneToOne extends ToOne { return getConstraintColumns(); } - public java.util.List getConstraintColumns() { + public List getConstraintColumns() { ArrayList list = new ArrayList(); Iterator iter = identifier.getColumnIterator(); while ( iter.hasNext() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java index 8a3bad44b4..e1761b45aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java @@ -71,7 +71,7 @@ public abstract class PersistentClass implements AttributeContainer, Serializabl private java.util.List joins = new ArrayList<>(); private final java.util.List subclassJoins = new ArrayList<>(); private final java.util.List filters = new ArrayList<>(); - protected final java.util.Set synchronizedTables = new HashSet<>(); + protected final Set synchronizedTables = new HashSet<>(); private String loaderName; private Boolean isAbstract; private boolean hasSubselectLoadableCollections; @@ -879,7 +879,7 @@ public abstract class PersistentClass implements AttributeContainer, Serializabl this.loaderName = loaderName == null ? null : loaderName.intern(); } - public abstract java.util.Set getSynchronizedTables(); + public abstract Set getSynchronizedTables(); public void addSynchronizedTable(String table) { synchronizedTables.add( table ); @@ -1014,7 +1014,7 @@ public abstract class PersistentClass implements AttributeContainer, Serializabl if ( tuplizerImpls == null ) { return null; } - return java.util.Collections.unmodifiableMap( tuplizerImpls ); + return Collections.unmodifiableMap( tuplizerImpls ); } private Boolean hasNaturalId; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java index 420f4a3b2f..eeff6dda6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java @@ -334,7 +334,7 @@ public class RootClass extends PersistentClass implements TableOwner { } @Override - public java.util.Set getSynchronizedTables() { + public Set getSynchronizedTables() { return synchronizedTables; } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java index 9eb65ccff1..b2efa6955d 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java @@ -16,7 +16,7 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Properties; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.FetchMode; import org.hibernate.MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java index 046dac71c4..10a387ee73 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java @@ -126,7 +126,7 @@ public class Table implements RelationalModel, Serializable, ContributableDataba /** * @deprecated Should use {@link QualifiedObjectNameFormatter#format} on QualifiedObjectNameFormatter - * obtained from {@link org.hibernate.engine.jdbc.env.spi.JdbcEnvironment} + * obtained from {@link JdbcEnvironment} */ @Deprecated public String getQualifiedName(Dialect dialect, String defaultCatalog, String defaultSchema) { @@ -145,7 +145,7 @@ public class Table implements RelationalModel, Serializable, ContributableDataba /** * @deprecated Should use {@link QualifiedObjectNameFormatter#format} on QualifiedObjectNameFormatter - * obtained from {@link org.hibernate.engine.jdbc.env.spi.JdbcEnvironment} + * obtained from {@link JdbcEnvironment} */ @Deprecated public static String qualify(String catalog, String schema, String table) { diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java index 00093f5b52..1563fd63c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java @@ -7,7 +7,7 @@ package org.hibernate.mapping; /** - * Additional, optional contract as part pf the {@link org.hibernate.mapping.PersistentClass} + * Additional, optional contract as part pf the {@link PersistentClass} * hierarchy used to differentiate entity bindings for entities that map to their own table * (root, union-subclass, joined-subclass) versus those that do not (discriminator-subclass). * diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java index dba76f6f49..0da7000c94 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java @@ -19,7 +19,7 @@ import org.hibernate.internal.util.StringHelper; * @author Brett Meyer */ public class UniqueKey extends Constraint { - private java.util.Map columnOrderMap = new HashMap<>(); + private Map columnOrderMap = new HashMap<>(); @Override public String sqlConstraintString( diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/package.html b/hibernate-core/src/main/java/org/hibernate/mapping/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java index 0a5aa592ed..0efc1a14ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel; -import javax.persistence.metamodel.Attribute.PersistentAttributeType; +import jakarta.persistence.metamodel.Attribute.PersistentAttributeType; public enum AttributeClassification { BASIC( PersistentAttributeType.BASIC ), diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java index e065ba3556..c5db0222a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel; -import javax.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.PluralAttribute; /** * Classifications of the plurality. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java index fb24eabde8..179a6865d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java @@ -24,7 +24,7 @@ public enum ValueClassification { */ ANY, /** - * An {@link javax.persistence.Embeddable} value + * An {@link jakarta.persistence.Embeddable} value */ EMBEDDABLE, /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java old mode 100755 new mode 100644 index 470ae85473..369286e673 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java @@ -11,10 +11,10 @@ import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.util.Iterator; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Type; import org.hibernate.AssertionFailure; import org.hibernate.internal.EntityManagerMessageLogger; @@ -216,8 +216,8 @@ public class AttributeFactory { } case ENTITY: { final org.hibernate.type.Type type = typeContext.getHibernateValue().getType(); - if ( type instanceof org.hibernate.type.EntityType ) { - final org.hibernate.type.EntityType entityType = (EntityType) type; + if ( type instanceof EntityType ) { + final EntityType entityType = (EntityType) type; return context.locateEntityType( entityType.getAssociatedEntityName() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java old mode 100755 new mode 100644 index 27096d43e1..65b837e29e --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java @@ -16,10 +16,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; import org.hibernate.AssertionFailure; import org.hibernate.Internal; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java index 3f0fa81f2f..966b05e4c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java @@ -23,9 +23,9 @@ import org.hibernate.sql.results.graph.FetchableContainer; /** * An embedded (embeddable-valued) model part. * - * @see javax.persistence.Embedded - * @see javax.persistence.EmbeddedId - * @see javax.persistence.Embeddable + * @see jakarta.persistence.Embedded + * @see jakarta.persistence.EmbeddedId + * @see jakarta.persistence.Embeddable * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java index d2530fef5e..7ea0d04d02 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java @@ -25,7 +25,7 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor; * an attribute, an entity identifier, collection elements, etc * * @see DomainResultProducer - * @see javax.persistence.metamodel.Bindable + * @see jakarta.persistence.metamodel.Bindable * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java index 92475f9a33..34f048f4c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java @@ -33,7 +33,7 @@ public interface SelectableMappings { * * The return is the number of selectables we directly contain * - * @see SelectableConsumer#accept(int, org.hibernate.metamodel.mapping.SelectableMapping) + * @see SelectableConsumer#accept(int, SelectableMapping) */ int forEachSelectable(int offset, SelectableConsumer consumer); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java index 4dd51cfaac..13516ed6c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java @@ -26,7 +26,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResultCreationState; /** - * Support for {@link javax.persistence.EmbeddedId} + * Support for {@link jakarta.persistence.EmbeddedId} * * @author Andrea Boriero */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java index 51c407676a..620a1a184b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java @@ -718,7 +718,7 @@ public class MappingModelCreationHelper { ); collectionMappingType = new CollectionMappingTypeImpl( - jtdRegistry.getDescriptor( java.util.List.class ), + jtdRegistry.getDescriptor( List.class ), StandardListSemantics.INSTANCE ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java index ee49a41424..50c4e54839 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java @@ -27,7 +27,7 @@ import org.hibernate.type.ComponentType; /** * A "non-aggregated" composite identifier. *

      - * This is an identifier mapped using JPA's {@link javax.persistence.MapsId} feature. + * This is an identifier mapped using JPA's {@link jakarta.persistence.MapsId} feature. * * @author Steve Ebersole * @apiNote Technically a MapsId id does not have to be composite; we still handle that this class however diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java index d37f8cbd8d..1f33aadcfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java @@ -26,7 +26,7 @@ import org.antlr.v4.runtime.misc.ParseCancellationException; * with an order set or map. * * @author Steve Ebersole - * @see javax.persistence.OrderBy + * @see jakarta.persistence.OrderBy * @see org.hibernate.annotations.OrderBy */ public class OrderByFragmentTranslator { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java index 82e8d478b0..558d461114 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java @@ -25,7 +25,7 @@ import org.hibernate.sql.ast.tree.select.SortSpecification; /** * Represents a column-reference used in an order-by fragment * - * @apiNote This is Hibernate-specific feature. For {@link javax.persistence.OrderBy} (JPA) + * @apiNote This is Hibernate-specific feature. For {@link jakarta.persistence.OrderBy} (JPA) * all path references are expected to be domain paths (attributes). * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java index f969630100..0c224f25b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java @@ -8,7 +8,7 @@ /** * Support for set and map ordering * - * @see javax.persistence.OrderBy + * @see jakarta.persistence.OrderBy * @see org.hibernate.annotations.OrderBy */ package org.hibernate.metamodel.mapping.ordering; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java index 8478ae790c..e7e9b65d00 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.convert; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java index a6d54149b4..ef58daf6db 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.convert.internal; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.annotations.Immutable; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java index de7a01f30d..4091e727b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java @@ -23,7 +23,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; /** * BasicValueConverter handling the conversion of an enum based on - * JPA {@link javax.persistence.EnumType#STRING} strategy (storing the name) + * JPA {@link jakarta.persistence.EnumType#STRING} strategy (storing the name) * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java index 4af913d08e..5e2778ca24 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java @@ -23,7 +23,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; /** * BasicValueConverter handling the conversion of an enum based on - * JPA {@link javax.persistence.EnumType#ORDINAL} strategy (storing the ordinal) + * JPA {@link jakarta.persistence.EnumType#ORDINAL} strategy (storing the ordinal) * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java index 33dd460758..86f1251f2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java @@ -14,7 +14,7 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor; * * Conversions might be defined by: * - * * a custom JPA {@link javax.persistence.AttributeConverter}, + * * a custom JPA {@link jakarta.persistence.AttributeConverter}, * * implicitly, based on the Java type (e.g., enums) * * etc * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java index d63c5e7ca8..b59c268fc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.convert.spi; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java index 2f2cd9401e..5f625e0d70 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java @@ -11,9 +11,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.Bindable; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.model.domain.internal.AttributeContainer; @@ -310,9 +310,9 @@ public abstract class AbstractIdentifiableType @SuppressWarnings({"rawtypes", "unchecked"}) private class InFlightAccessImpl extends AbstractManagedType.InFlightAccessImpl { - private final AbstractManagedType.InFlightAccess managedTypeAccess; + private final InFlightAccess managedTypeAccess; - private InFlightAccessImpl(AttributeContainer.InFlightAccess managedTypeAccess) { + private InFlightAccessImpl(InFlightAccess managedTypeAccess) { this.managedTypeAccess = managedTypeAccess; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java index 9c6ae86b86..b188977a6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java @@ -18,14 +18,14 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.graph.internal.SubGraphImpl; import org.hibernate.graph.spi.SubGraphImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java index 4ff72bf68f..3d3abcd185 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java index 97ccaecc7a..b7b3bbf49c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Collection; -import javax.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.CollectionAttribute; /** * Hibernate extension to the JPA {@link CollectionAttribute} descriptor diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java index 7ae8188a2c..0f42e55077 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Objects; -import javax.persistence.metamodel.BasicType; +import jakarta.persistence.metamodel.BasicType; import org.hibernate.HibernateException; import org.hibernate.query.sqm.SqmExpressable; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java index 34719000e1..db606bb47c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EmbeddableType; import org.hibernate.metamodel.spi.ManagedTypeRepresentationStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java index 4a88adebb8..bf983832af 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; /** - * Hibernate extension to the JPA {@link javax.persistence.metamodel.EntityType} contract. + * Hibernate extension to the JPA {@link jakarta.persistence.metamodel.EntityType} contract. * * @deprecated (since 6.0) Use {@link EmbeddableDomainType} instead. Originally intended * to describe the actual usage of an embeddable (the embedded) because it was intended diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java index 7ac9bf8c37..8247b3a709 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java index 5d2a0c3f34..cb1313a6a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java @@ -8,8 +8,8 @@ package org.hibernate.metamodel.model.domain; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java index c60f390971..d4c236f6be 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java @@ -10,9 +10,9 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.Incubating; import org.hibernate.graph.spi.RootGraphImplementor; @@ -22,13 +22,13 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * Hibernate extension to the JPA {@link javax.persistence.metamodel.Metamodel} contract + * Hibernate extension to the JPA {@link jakarta.persistence.metamodel.Metamodel} contract * * @author Steve Ebersole * @see MappingMetamodel */ @Incubating -public interface JpaMetamodel extends javax.persistence.metamodel.Metamodel { +public interface JpaMetamodel extends jakarta.persistence.metamodel.Metamodel { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Context diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java index 4e5cc2c220..b05bf3a349 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.List; -import javax.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ListAttribute; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java index af15f18ecb..3bbd61b7c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.function.Consumer; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.graph.spi.SubGraphImplementor; import org.hibernate.metamodel.RepresentationMode; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java index 46dd4928eb..da8ce362f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Map; -import javax.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.MapAttribute; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java index 42af6a07d4..ab8244efa6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.MappedSuperclassType; +import jakarta.persistence.metamodel.MappedSuperclassType; /** * Extension of the JPA {@link MappedSuperclassType} contract diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java index 0dca52b856..a3c73d4991 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.metamodel.AttributeClassification; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java index 992beb82fa..0bd157516f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.PluralAttribute; import org.hibernate.metamodel.CollectionClassification; import org.hibernate.query.NotIndexedCollectionException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java index 216880e03d..e2fd78b345 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Set; -import javax.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SetAttribute; /** * Hibernate extension to the JPA {@link SetAttribute} descriptor diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java index c9480d2cbd..1b23e35fe7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java @@ -11,5 +11,5 @@ package org.hibernate.metamodel.model.domain; * * @author Steve Ebersole */ -public interface SimpleDomainType extends DomainType, javax.persistence.metamodel.Type { +public interface SimpleDomainType extends DomainType, jakarta.persistence.metamodel.Type { } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java index ce8f719577..b839ce6f07 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.query.sqm.SqmJoinable; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java index 4ba4e94651..cbc762e2bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java @@ -13,7 +13,7 @@ import java.io.ObjectStreamException; import java.io.Serializable; import java.lang.reflect.Member; import java.lang.reflect.Method; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.ReflectHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java index a53f324156..dafb4b6382 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java @@ -13,7 +13,7 @@ import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.tree.domain.SqmAnyValuedSimplePath; import org.hibernate.query.sqm.tree.domain.SqmPath; -import static javax.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE; +import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java index cf7953df76..32044dda04 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java @@ -26,7 +26,7 @@ public interface AttributeContainer { /** * Callback used when we have a singular id attribute of some form - either a simple id - * or an aggregated composite id ({@link javax.persistence.EmbeddedId}) + * or an aggregated composite id ({@link jakarta.persistence.EmbeddedId}) */ default void applyIdAttribute(SingularPersistentAttribute idAttribute) { throw new UnsupportedOperationException( diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java index 54bc47f428..e231ae4e6c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java @@ -20,7 +20,7 @@ import org.hibernate.metamodel.spi.ManagedTypeRepresentationStrategy; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; /** - * Standard Hibernate implementation of JPA's {@link javax.persistence.metamodel.EmbeddableType} + * Standard Hibernate implementation of JPA's {@link jakarta.persistence.metamodel.EmbeddableType} * contract * * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java index 75d09bccb2..159112e6b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java @@ -8,7 +8,7 @@ package org.hibernate.metamodel.model.domain.internal; import java.io.ObjectStreamException; import java.io.Serializable; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.graph.internal.SubGraphImpl; import org.hibernate.graph.spi.SubGraphImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java index a66dc2b88e..345535d3d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java @@ -17,14 +17,14 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.stream.Stream; -import javax.persistence.EntityGraph; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedSubgraph; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedSubgraph; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.SessionFactory; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; @@ -346,7 +346,7 @@ public class JpaMetamodelImpl implements JpaMetamodel, Serializable { } @SuppressWarnings("unchecked") - private void applyNamedEntityGraphs(java.util.Collection namedEntityGraphs) { + private void applyNamedEntityGraphs(Collection namedEntityGraphs) { for ( NamedEntityGraphDefinition definition : namedEntityGraphs ) { log.debugf( "Applying named entity graph [name=%s, entity-name=%s, jpa-entity-name=%s]", diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java old mode 100755 new mode 100644 index 83434d3870..d6a3aba07a --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -17,10 +17,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityGraph; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; @@ -75,7 +75,7 @@ import org.hibernate.type.spi.TypeConfiguration; import static org.hibernate.metamodel.internal.JpaStaticMetaModelPopulationSetting.determineJpaMetaModelPopulationSetting; /** - * Hibernate implementation of the JPA {@link javax.persistence.metamodel.Metamodel} contract. + * Hibernate implementation of the JPA {@link jakarta.persistence.metamodel.Metamodel} contract. * * Really more of the mapping model then the domain model, though it does have reference to the `JpaMetamodel` * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java index d8a7cd71ed..9aa58fc216 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java @@ -130,11 +130,11 @@ public class PluralAttributeBuilder { private static SimpleDomainType determineListIndexOrMapKeyType( PluralAttributeMetadata attributeMetadata, MetadataContext metadataContext) { - if ( java.util.Map.class.isAssignableFrom( attributeMetadata.getJavaType() ) ) { + if ( Map.class.isAssignableFrom( attributeMetadata.getJavaType() ) ) { return determineSimpleType( attributeMetadata.getMapKeyValueContext(), metadataContext ); } - if ( java.util.List.class.isAssignableFrom( attributeMetadata.getJavaType() ) + if ( List.class.isAssignableFrom( attributeMetadata.getJavaType() ) || attributeMetadata.getJavaType().isArray() ) { return metadataContext.getTypeConfiguration().getBasicTypeRegistry().getRegisteredType( Integer.class ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java index 94be9f7c21..3266114a5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java @@ -8,6 +8,6 @@ /** * Hibernate extensions to and implementations of the JPA metamodel * - * @see javax.persistence.metamodel + * @see jakarta.persistence.metamodel */ package org.hibernate.metamodel.model.domain; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java index b8a1afd351..a20c666271 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java @@ -10,7 +10,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.EntityNameResolver; import org.hibernate.MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/package.html b/hibernate-core/src/main/java/org/hibernate/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java b/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java index 33ee2a49cc..45aed22049 100644 --- a/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java @@ -25,7 +25,7 @@ public interface ParameterBinder { * @param position The position from which to start binding value(s). * * @return The number of sql bind positions "eaten" by this bind operation. - * @throws java.sql.SQLException Indicates problems performing the JDBC bind operation. + * @throws SQLException Indicates problems performing the JDBC bind operation. */ int bind(PreparedStatement statement, QueryParameters qp, SharedSessionContractImplementor session, int position) throws SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java index 7975b5ed8d..d3d9e2352d 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java @@ -66,7 +66,7 @@ import org.hibernate.type.Type; *

    * * @see QueryableCollection - * @see org.hibernate.collection.spi.PersistentCollection + * @see PersistentCollection * @author Gavin King */ public interface CollectionPersister extends CollectionDefinition { diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/package.html b/hibernate-core/src/main/java/org/hibernate/persister/collection/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index 8c3f26c92b..a0e2362d75 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -2351,7 +2351,7 @@ public abstract class AbstractEntityPersister } public Type getResolutionType() { - return new DiscriminatorType( (org.hibernate.type.BasicType) getDiscriminatorType(), AbstractEntityPersister.this ); + return new DiscriminatorType( (BasicType) getDiscriminatorType(), AbstractEntityPersister.this ); } }; } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java index baf18f6689..cb91a415f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java @@ -39,10 +39,10 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; * @author Steve Ebersole */ public class DiscriminatorType extends AbstractType implements org.hibernate.type.DiscriminatorType, BasicType, ValueExtractor, ValueBinder { - private final org.hibernate.type.BasicType underlyingType; + private final BasicType underlyingType; private final Loadable persister; - public DiscriminatorType(org.hibernate.type.BasicType underlyingType, Loadable persister) { + public DiscriminatorType(BasicType underlyingType, Loadable persister) { this.underlyingType = (BasicType) underlyingType; this.persister = persister; } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java index 5d1cc2c588..3d316694bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java @@ -64,10 +64,10 @@ import org.hibernate.type.VersionType; * to be handled by the persister * *
  • - * {@link org.hibernate.cache.spi.access.EntityDataAccess} - the second level caching strategy for this entity + * {@link EntityDataAccess} - the second level caching strategy for this entity *
    • *
  • - * {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - the second level caching strategy for the natural-id + * {@link NaturalIdDataAccess} - the second level caching strategy for the natural-id * defined for this entity, if one *
    • *
  • @@ -107,7 +107,7 @@ public interface EntityPersister * Called only once per {@link org.hibernate.SessionFactory} lifecycle, * after all entity persisters have been instantiated. * - * @throws org.hibernate.MappingException Indicates an issue in the metadata. + * @throws MappingException Indicates an issue in the metadata. */ void postInstantiate() throws MappingException; @@ -300,7 +300,7 @@ public interface EntityPersister * @param propertyName The name of the property for which to retrieve * the type. * @return The type. - * @throws org.hibernate.MappingException Typically indicates an unknown + * @throws MappingException Typically indicates an unknown * property name. */ Type getPropertyType(String propertyName) throws MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/package.html b/hibernate-core/src/main/java/org/hibernate/persister/entity/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/persister/package.html b/hibernate-core/src/main/java/org/hibernate/persister/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/pretty/package.html b/hibernate-core/src/main/java/org/hibernate/pretty/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java index 3bf2141482..fbcc3fa328 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java @@ -7,8 +7,8 @@ package org.hibernate.procedure; import java.util.List; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.MappingException; import org.hibernate.SynchronizeableQuery; @@ -100,7 +100,7 @@ public interface ProcedureCall ProcedureParameter registerParameter(int position, Class type, ParameterMode mode); /** - * Chained form of {@link #registerParameter(int, Class, javax.persistence.ParameterMode)} + * Chained form of {@link #registerParameter(int, Class, jakarta.persistence.ParameterMode)} * * @param position The position * @param type The Java type of the parameter @@ -139,7 +139,7 @@ public interface ProcedureCall throws NamedParametersNotSupportedException; /** - * Chained form of {@link #registerParameter(String, Class, javax.persistence.ParameterMode)} + * Chained form of {@link #registerParameter(String, Class, jakarta.persistence.ParameterMode)} * * @param parameterName The parameter name * @param type The Java type of the parameter diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java index 4ceb5f866f..5a39ebda1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java @@ -10,7 +10,7 @@ import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Outputs; /** - * Specialization of the {@link org.hibernate.result.Outputs} contract providing access to the stored procedure's registered + * Specialization of the {@link Outputs} contract providing access to the stored procedure's registered * output parameters. * * @author Steve Ebersole @@ -26,7 +26,7 @@ public interface ProcedureOutputs extends Outputs { * * @return The output value. * - * @see ProcedureCall#registerParameter(String, Class, javax.persistence.ParameterMode) + * @see ProcedureCall#registerParameter(String, Class, jakarta.persistence.ParameterMode) */ T getOutputParameterValue(ProcedureParameter parameter); @@ -40,7 +40,7 @@ public interface ProcedureOutputs extends Outputs { * @throws ParameterStrategyException If the ProcedureCall is defined using positional parameters * @throws NoSuchParameterException If no parameter with that name exists * - * @see ProcedureCall#registerParameter(String, Class, javax.persistence.ParameterMode) + * @see ProcedureCall#registerParameter(String, Class, jakarta.persistence.ParameterMode) */ Object getOutputParameterValue(String name); @@ -54,7 +54,7 @@ public interface ProcedureOutputs extends Outputs { * @throws ParameterStrategyException If the ProcedureCall is defined using named parameters * @throws NoSuchParameterException If no parameter with that position exists * - * @see ProcedureCall#registerParameter(int, Class, javax.persistence.ParameterMode) + * @see ProcedureCall#registerParameter(int, Class, jakarta.persistence.ParameterMode) */ Object getOutputParameterValue(int position); } diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java index 5338d87532..62227663c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java @@ -7,7 +7,7 @@ package org.hibernate.procedure.internal; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableOutputParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java index b72258de35..cedf3f0b10 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java @@ -9,7 +9,7 @@ package org.hibernate.procedure.internal; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index 05c9852ac4..2b492cf264 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java @@ -15,15 +15,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Stream; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.PersistenceException; -import javax.persistence.TemporalType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -65,7 +65,7 @@ import org.hibernate.result.spi.ResultContext; import org.hibernate.sql.results.NoMoreOutputsException; /** - * Standard implementation of {@link org.hibernate.procedure.ProcedureCall} + * Standard implementation of {@link ProcedureCall} * * @author Steve Ebersole */ @@ -645,7 +645,7 @@ public class ProcedureCallImpl @Override protected int doExecuteUpdate() { if ( ! getSession().isTransactionInProgress() ) { - throw new TransactionRequiredException( "javax.persistence.Query.executeUpdate requires active transaction" ); + throw new TransactionRequiredException( "jakarta.persistence.Query.executeUpdate requires active transaction" ); } // the expectation is that there is just one Output, of type UpdateCountOutput @@ -835,12 +835,12 @@ public class ProcedureCallImpl @Override public ProcedureCallImplementor setLockMode(LockModeType lockMode) { - throw new IllegalStateException( "javax.persistence.Query.setLockMode not valid on javax.persistence.StoredProcedureQuery" ); + throw new IllegalStateException( "jakarta.persistence.Query.setLockMode not valid on jakarta.persistence.StoredProcedureQuery" ); } @Override public LockModeType getLockMode() { - throw new IllegalStateException( "javax.persistence.Query.getHibernateFlushMode not valid on javax.persistence.StoredProcedureQuery" ); + throw new IllegalStateException( "jakarta.persistence.Query.getHibernateFlushMode not valid on jakarta.persistence.StoredProcedureQuery" ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java index 60dc47011b..3b3a508b53 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java @@ -9,7 +9,7 @@ package org.hibernate.procedure.internal; import java.sql.CallableStatement; import java.sql.SQLException; import java.util.Objects; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java index 28831c017e..18557fbc49 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.procedure.spi.NamedCallableQueryMemento; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java index 091e4cdf53..0025a86e61 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java @@ -8,7 +8,7 @@ package org.hibernate.procedure.internal; import java.sql.CallableStatement; import java.util.function.Consumer; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.QueryException; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java index 5882773460..7e13844013 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java @@ -9,10 +9,10 @@ package org.hibernate.procedure.spi; import java.util.Calendar; import java.util.Date; import java.util.List; -import javax.persistence.FlushModeType; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.TemporalType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.TemporalType; import org.hibernate.procedure.ProcedureCall; import org.hibernate.query.spi.QueryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java index 23077d7b82..7ec1add1ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java @@ -10,8 +10,8 @@ import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.persistence.Access; -import javax.persistence.AccessType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; import org.hibernate.PropertyNotFoundException; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.property.access.spi.Getter; diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java index d3f7114e7b..fdf2d2395b 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java @@ -114,7 +114,7 @@ public interface LazyInitializer { * @throws org.hibernate.TransientObjectException if the proxy is detached (getSession() == null) * @throws org.hibernate.SessionException if the proxy is associated with a session that is closed * - * @see org.hibernate.proxy.LazyInitializer#isReadOnlySettingAvailable() + * @see LazyInitializer#isReadOnlySettingAvailable() * @see org.hibernate.Session#isReadOnly(Object entityOrProxy) */ boolean isReadOnly(); diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java index 10dcb51cf4..00a4d3b4d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java @@ -37,7 +37,7 @@ public interface ProxyFactory { * @param setIdentifierMethod Reference to the identifier setter method; * invocation on this method should not force initialization * @param componentIdType For composite identifier types, a reference to - * the {@link org.hibernate.type.CompositeType type} of the identifier + * the {@link CompositeType type} of the identifier * property; again accessing the id should generally not cause * initialization - but need to bear in mind * mappings. diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/package.html b/hibernate-core/src/main/java/org/hibernate/proxy/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java b/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java index 040c7e9531..2f09cdd7f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java +++ b/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java @@ -6,7 +6,7 @@ */ package org.hibernate.query; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java index a60826df62..d16d18d23a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java @@ -14,12 +14,12 @@ import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.Map; -import javax.persistence.AttributeConverter; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -70,7 +70,7 @@ public interface NativeQuery extends Query, SynchronizeableQuery { * detect the underlying type. *

    * Functions like {@code } in {@code hbm.xml} or - * {@link javax.persistence.ColumnResult} in annotations + * {@link jakarta.persistence.ColumnResult} in annotations * * @param columnAlias The column alias in the result-set to be processed * as a scalar result @@ -83,7 +83,7 @@ public interface NativeQuery extends Query, SynchronizeableQuery { * Declare a scalar query result. *

    * Functions like {@code } in {@code hbm.xml} or - * {@link javax.persistence.ColumnResult} in annotations + * {@link jakarta.persistence.ColumnResult} in annotations * * @param columnAlias The column alias in the result-set to be processed * as a scalar result @@ -214,7 +214,7 @@ public interface NativeQuery extends Query, SynchronizeableQuery { RootReturn addRoot(String tableAlias, String entityName); /** - * Add a new root return mapping, returning a {@link org.hibernate.query.NativeQuery.RootReturn} to allow further definition. + * Add a new root return mapping, returning a {@link RootReturn} to allow further definition. * * @param tableAlias The SQL table alias to map to this entity * @param entityType The java type of the entity. diff --git a/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java b/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java index 6566dd8514..b11710b2d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java @@ -8,7 +8,7 @@ package org.hibernate.query; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.AllowableParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/Query.java b/hibernate-core/src/main/java/org/hibernate/query/Query.java index 79e93e4011..dd342e033d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/Query.java +++ b/hibernate-core/src/main/java/org/hibernate/query/Query.java @@ -17,11 +17,11 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -155,7 +155,7 @@ public interface Query extends TypedQuery, CommonQueryContract { * *

    * - * You should call {@link java.util.stream.Stream#close()} after processing the stream + * You should call {@link Stream#close()} after processing the stream * so that the underlying resources are deallocated right away. * * @return The results Stream @@ -187,7 +187,7 @@ public interface Query extends TypedQuery, CommonQueryContract { /** * Add a DB query hint to the SQL. These differ from JPA's - * {@link javax.persistence.QueryHint} and {@link #getHints()}, which is + * {@link jakarta.persistence.QueryHint} and {@link #getHints()}, which is * specific to the JPA implementation and ignores DB vendor-specific hints. * Instead, these are intended solely for the vendor-specific hints, such * as Oracle's optimizers. Multiple query hints are supported; the Dialect @@ -409,7 +409,7 @@ public interface Query extends TypedQuery, CommonQueryContract { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // covariant overrides - javax.persistence.Query/TypedQuery + // covariant overrides - jakarta.persistence.Query/TypedQuery @Override Query setMaxResults(int maxResult); diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java b/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java index 4ec580a3c6..71664a2dec 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.model.domain.AllowableParameterType; * @author Steve Ebersole */ @Incubating -public interface QueryParameter extends javax.persistence.Parameter { +public interface QueryParameter extends jakarta.persistence.Parameter { /** * Does this parameter allow multi-valued (collection, array, etc) binding? *

    diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java index a6816b02b7..42fe9f69bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java @@ -6,9 +6,9 @@ */ package org.hibernate.query; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; /** * Contract for things that can produce Query instances. Expected implementors include @@ -40,7 +40,7 @@ public interface QueryProducer { * * @return The Query instance for manipulation and execution * - * @see javax.persistence.EntityManager#createQuery(String) + * @see jakarta.persistence.EntityManager#createQuery(String) */ Query createQuery(String queryString); @@ -51,7 +51,7 @@ public interface QueryProducer { * @param resultClass The type of the query result * @return The Query instance for manipulation and execution * - * @see javax.persistence.EntityManager#createQuery(String,Class) + * @see jakarta.persistence.EntityManager#createQuery(String,Class) */ Query createQuery(String queryString, Class resultClass); @@ -67,7 +67,7 @@ public interface QueryProducer { * defined with the given name or if the query string is * found to be invalid * - * @see javax.persistence.EntityManager#createNamedQuery(String) + * @see jakarta.persistence.EntityManager#createNamedQuery(String) */ Query createNamedQuery(String name); @@ -85,7 +85,7 @@ public interface QueryProducer { * found to be invalid or if the query result is found to * not be assignable to the specified type * - * @see javax.persistence.EntityManager#createNamedQuery(String,Class) + * @see jakarta.persistence.EntityManager#createNamedQuery(String,Class) */ Query createNamedQuery(String name, Class resultClass); @@ -96,7 +96,7 @@ public interface QueryProducer { * * @return The NativeQuery instance for manipulation and execution * - * @see javax.persistence.EntityManager#createNativeQuery(String) + * @see jakarta.persistence.EntityManager#createNativeQuery(String) */ NativeQuery createNativeQuery(String sqlString); @@ -109,7 +109,7 @@ public interface QueryProducer { * * @return The NativeQuery instance for manipulation and execution * - * @see javax.persistence.EntityManager#createNativeQuery(String,Class) + * @see jakarta.persistence.EntityManager#createNativeQuery(String,Class) */ NativeQuery createNativeQuery(String sqlString, Class resultClass); @@ -122,8 +122,8 @@ public interface QueryProducer { * * @return The NativeQuery instance for manipulation and execution * - * @see javax.persistence.EntityManager#createNativeQuery(String,Class) - * @see javax.persistence.SqlResultSetMapping + * @see jakarta.persistence.EntityManager#createNativeQuery(String,Class) + * @see jakarta.persistence.SqlResultSetMapping */ NativeQuery createNativeQuery(String sqlString, String resultSetMappingName); diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java b/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java index 903989beed..95aca8f881 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java @@ -9,7 +9,7 @@ package org.hibernate.query; import org.hibernate.HibernateException; /** - * Indicates a problem with requested typed-Query result-type (e.g., JPA's {@link javax.persistence.TypedQuery}) + * Indicates a problem with requested typed-Query result-type (e.g., JPA's {@link jakarta.persistence.TypedQuery}) * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java b/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java index 8ea31e1b88..bfc5e0869d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java @@ -28,7 +28,7 @@ import org.hibernate.dialect.Dialect; * second argument (date, time, or timestamp), and * according to capabilities of the database platform. * - * @see org.hibernate.dialect.Dialect#extractPattern(TemporalUnit) + * @see Dialect#extractPattern(TemporalUnit) * * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java index 3af01b773e..6f7ac162dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java @@ -17,7 +17,7 @@ import org.hibernate.sql.results.internal.RowTransformerTupleTransformerAdapter; * contract, which is the thing actually used to process the results internally. * * Note that {@link JpaTupleTransformer} is a special sub-type applications may use - * to transform the row into a JPA {@link javax.persistence.Tuple}. JpaTupleTransformer is + * to transform the row into a JPA {@link jakarta.persistence.Tuple}. JpaTupleTransformer is * deprecated as it is much more appropriate (and simpler) to simply specify the Query * return type as Tuple * diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java index 1fa9426a7c..b38449c003 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java @@ -15,20 +15,20 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Tuple; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortOrder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java index 772bd5be01..52cc06aee5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Expression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java index 04cf0a01af..50daef4393 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; /** * Specialization of {@link JpaJoin} for {@link java.util.Collection} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java index bc095d80f3..43fe87d982 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.CompoundSelection; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java index 2806634d78..ae63d3ea57 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CommonAbstractCriteria; +import jakarta.persistence.criteria.CommonAbstractCriteria; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java index 186210023b..0cb6e1d313 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaDelete; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java index 20ec5168f4..ca36c5d05e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java @@ -8,13 +8,13 @@ package org.hibernate.query.criteria; import java.util.List; import java.util.Set; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Selection; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.query.FetchClauseType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java index 66d399d273..54d7e50b56 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaUpdate; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java index 0fc5b373ac..cb608307cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java @@ -9,7 +9,7 @@ package org.hibernate.query.criteria; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; /** * API extension to the JPA {@link Expression} contract diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java index fefe8a53e9..13b6a130d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java @@ -7,10 +7,10 @@ package org.hibernate.query.criteria; import java.util.Set; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.JoinType; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java index e29f9bd147..438d4d864c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java @@ -7,11 +7,11 @@ package org.hibernate.query.criteria; import java.util.Set; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.FetchParent; -import javax.persistence.criteria.JoinType; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.FetchParent; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java index 6395d5dd38..d2e279d35b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.From; +import jakarta.persistence.criteria.From; /** * API extension to the JPA {@link From} contract diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java index c9e91df792..fd208f7041 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java index b4ec93fed4..3e58809eb4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java @@ -6,10 +6,10 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; import org.hibernate.metamodel.model.domain.PersistentAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java index 5770e180a7..14d539a0cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.Predicate; /** * Specialization of {@link JpaJoin} for {@link java.util.List} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java index e938fff8c8..c0afcf2eca 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Predicate; /** * Specialization of {@link JpaJoin} for {@link java.util.Map} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java index f7bde0a763..ed7fa2af2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Order; +import jakarta.persistence.criteria.Order; import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortOrder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java index 2c3339b83e..d2a4dd7d60 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.ParameterExpression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java index 3fbc91e7af..3d8d5c5abd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java @@ -8,11 +8,11 @@ package org.hibernate.query.criteria; import java.util.Collection; import java.util.Map; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.NavigablePath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java index e901a3228f..120fe04bd7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.ManagedType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java index 9a9738168e..87d4becbad 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Predicate; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java index 25aae3d96f..70f77c1fa9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java @@ -8,15 +8,15 @@ package org.hibernate.query.criteria; import java.util.List; import java.util.Set; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.hibernate.query.FetchClauseType; /** * Models a {@code SELECT} query. Used as a delegate in - * implementing {@link javax.persistence.criteria.CriteriaQuery} - * and {@link javax.persistence.criteria.Subquery}. + * implementing {@link jakarta.persistence.criteria.CriteriaQuery} + * and {@link jakarta.persistence.criteria.Subquery}. * * @apiNote Internally (HQL and SQM) Hibernate supports ordering and limiting * for both root- and sub- criteria even though JPA only defines support for diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java index cbce71b10d..d7b838946a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CommonAbstractCriteria; +import jakarta.persistence.criteria.CommonAbstractCriteria; /** * Common contract for the forms of criteria that are "queryable" - can be diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java index fee437f5f6..549721ba40 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.Root; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.sqm.tree.SqmJoinType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java index a8d28241d2..25f46eb33e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Expression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java index cf9073b1fa..3bcfacee40 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java @@ -7,10 +7,10 @@ package org.hibernate.query.criteria; import java.util.List; -import javax.persistence.criteria.AbstractQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.AbstractQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.metamodel.EntityType; /** * Commonality between a JPA {@link JpaCriteriaQuery} and {@link JpaSubQuery}, diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java index 7eeaaf243d..fbaf95deb9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java @@ -7,7 +7,7 @@ package org.hibernate.query.criteria; import java.util.List; -import javax.persistence.criteria.Selection; +import jakarta.persistence.criteria.Selection; /** * API extension to the JPA {@link Selection} contract diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java index f31b8d85ee..35f015f409 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.SetJoin; /** * Specialization of {@link JpaJoin} for {@link java.util.Set} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java index e65802b18f..f997d2b7a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Expression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java index 208203d061..b24475b594 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java @@ -8,11 +8,11 @@ package org.hibernate.query.criteria; import java.util.List; import java.util.Set; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.hibernate.query.sqm.tree.domain.SqmSetJoin; import org.hibernate.query.sqm.tree.from.SqmCrossJoin; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java index ae9a15db30..47d7167a3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.TupleElement; +import jakarta.persistence.TupleElement; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java index 0caa18ea5b..7c813ed866 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java @@ -12,7 +12,7 @@ import java.math.BigInteger; import java.util.Collection; import java.util.List; import java.util.function.Function; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java index 81c7551137..1d68b3b9ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java @@ -11,7 +11,7 @@ import java.time.OffsetDateTime; import java.time.OffsetTime; import java.time.ZonedDateTime; import java.util.Calendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.model.domain.AllowableParameterType; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java index 1be7c063cd..d96eb7fe21 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java @@ -7,8 +7,8 @@ package org.hibernate.query.internal; import java.util.Map; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java index f04537e17e..ba5d6c4214 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.QueryException; import org.hibernate.internal.util.StringHelper; @@ -209,7 +209,7 @@ public class ParameterMetadataImpl implements ParameterMetadataImplementor { return (QueryParameterImplementor) param; } - throw new IllegalArgumentException( "Could not resolve javax.persistence.Parameter to org.hibernate.query.QueryParameter" ); + throw new IllegalArgumentException( "Could not resolve jakarta.persistence.Parameter to org.hibernate.query.QueryParameter" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java index cafb8efe1e..cf2d75b3d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java @@ -9,8 +9,8 @@ package org.hibernate.query.internal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.FlushMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java index 757a56c40a..c68c3cccd6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java @@ -9,7 +9,7 @@ package org.hibernate.query.internal; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java index b562e1ba97..4fe037f7e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java @@ -7,7 +7,7 @@ package org.hibernate.query.internal; import java.util.function.Consumer; -import javax.persistence.ColumnResult; +import jakarta.persistence.ColumnResult; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.named.ResultMementoBasic; diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java index 70898e97c6..79054a0d42 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java +++ b/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java @@ -18,7 +18,7 @@ import org.hibernate.query.results.ResultSetMapping; * queries. * * These can be defined in a number of ways:

      - *
    • {@link javax.persistence.SqlResultSetMapping}
      • + *
    • {@link jakarta.persistence.SqlResultSetMapping}
      • *
    • JPA Class-based mapping
      • *
    • Hibernate's legacy XML-defined mapping
      • *
    diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java index be1abb84e8..5b6c7040bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.procedure; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.Incubating; import org.hibernate.query.QueryParameter; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java b/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java index 3817d4eae1..6b72ddae55 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java @@ -7,9 +7,9 @@ package org.hibernate.query.results; import java.util.Locale; -import javax.persistence.AttributeConverter; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.LockMode; import org.hibernate.NotYetImplementedFor6Exception; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java index 4f3241c394..5b6ca9bbcf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java @@ -16,12 +16,12 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer; /** * Acts as the {@link JdbcValuesMappingProducer} for {@link org.hibernate.query.NativeQuery} - * or {@link org.hibernate.procedure.ProcedureCall} / {@link javax.persistence.StoredProcedureQuery} + * or {@link org.hibernate.procedure.ProcedureCall} / {@link jakarta.persistence.StoredProcedureQuery} * instances. * * Can be defined
      *
    • - * statically via {@link javax.persistence.SqlResultSetMapping} or `hbm.xml` mapping + * statically via {@link jakarta.persistence.SqlResultSetMapping} or `hbm.xml` mapping *
      • *
    • * dynamically via Hibernate-specific APIs:
        diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java index b95a17ffd9..d9e7dd34f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedStandard.java @@ -24,7 +24,7 @@ import static org.hibernate.query.results.ResultsHelper.impl; /** * ResultBuilder for scalar results defined via:
          - *
        • JPA {@link javax.persistence.ColumnResult}
          • + *
        • JPA {@link jakarta.persistence.ColumnResult}
          • *
        • `` as part of a `` stanza in `hbm.xml`
          • *
        * diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java index 323574da46..0c1539f178 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderInstantiation.java @@ -22,7 +22,7 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; /** - * ResultBuilder for dynamic instantiation results ({@link javax.persistence.ConstructorResult} + * ResultBuilder for dynamic instantiation results ({@link jakarta.persistence.ConstructorResult} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/package-info.java index 8177efd2d7..566ab830f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/package-info.java @@ -7,7 +7,7 @@ /** * Support for immutable result/fetch builder graph nodes built from static sources - * such as JPA's {@link javax.persistence.SqlResultSetMapping} or `hbm.xml` mapping + * such as JPA's {@link jakarta.persistence.SqlResultSetMapping} or `hbm.xml` mapping * ``. * * The differentiation from {@link org.hibernate.query.results.dynamic} is that here diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java index 713c010d57..5f2a20077b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java @@ -7,7 +7,7 @@ package org.hibernate.query.results.dynamic; import java.util.function.BiFunction; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.BasicValuedMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/results/package-info.java index e142e35407..959666ff63 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/package-info.java @@ -7,7 +7,7 @@ /** * Support for defining result-set mappings used in {@link org.hibernate.query.NativeQuery} - * and {@link org.hibernate.procedure.ProcedureCall} / {@link javax.persistence.StoredProcedureQuery}. + * and {@link org.hibernate.procedure.ProcedureCall} / {@link jakarta.persistence.StoredProcedureQuery}. * These result-set mappings are used to map the values in the JDBC {@link java.sql.ResultSet} * into the query result graph. * diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java index 7c5de64cd3..39926fcbcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java @@ -24,14 +24,14 @@ import java.util.Spliterator; import java.util.Spliterators; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java index 05c8c4b1a4..b5b5b29198 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/DelegatingQueryOptions.java @@ -7,8 +7,8 @@ package org.hibernate.query.spi; import java.util.List; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java index 551f811924..38e52a33b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/MutableQueryOptions.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.spi; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java index f3125aa355..de34b09dda 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/ParameterMetadataImplementor.java @@ -8,7 +8,7 @@ package org.hibernate.query.spi; import java.util.function.Consumer; import java.util.function.Predicate; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.query.ParameterMetadata; import org.hibernate.query.QueryParameter; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java index b17f58d8ee..7cb775c07b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java @@ -8,8 +8,8 @@ package org.hibernate.query.spi; import java.sql.Statement; import java.util.List; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -46,7 +46,7 @@ public interface QueryOptions { Boolean isReadOnly(); /** - * JPA {@link javax.persistence.EntityGraph} explicitly applied to the + * JPA {@link jakarta.persistence.EntityGraph} explicitly applied to the * query. */ AppliedGraph getAppliedGraph(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java index 421fecfd16..872746dcd1 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java @@ -8,8 +8,8 @@ package org.hibernate.query.spi; import java.util.Collections; import java.util.List; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java index 9c5c8c070e..08a12fe3b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java @@ -7,7 +7,7 @@ package org.hibernate.query.spi; import java.util.Collection; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.Incubating; import org.hibernate.metamodel.mapping.MappingModelExpressable; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java index 6746b9759c..60361505b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java @@ -9,7 +9,7 @@ package org.hibernate.query.spi; import java.util.Calendar; import java.util.Collection; import java.util.Date; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.mapping.ConvertibleModelPart; import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java index c270c41041..a1a247d0c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java @@ -80,7 +80,7 @@ public interface QueryParameterBindings { /** * Generate a "memento" for these parameter bindings that can be used - * in creating a {@link org.hibernate.cache.spi.QueryKey} + * in creating a {@link QueryKey} * @param persistenceContext */ default QueryKey.ParameterBindingsMemento generateQueryKeyMemento(SharedSessionContractImplementor persistenceContext) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java index 60f3d3aa7b..8b3b69426c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterListBinding.java @@ -7,7 +7,7 @@ package org.hibernate.query.spi; import java.util.Collection; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.AllowableParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java index b254ac7cfd..90cfa37243 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java @@ -21,15 +21,15 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.function.Supplier; -import javax.persistence.AttributeConverter; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.PersistenceException; -import javax.persistence.TemporalType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java index 4e91597e78..786cbf1631 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java @@ -8,7 +8,7 @@ package org.hibernate.query.sql.spi; import java.util.Set; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMapping; import org.hibernate.boot.query.NamedNativeQueryDefinition; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java index fdd4584d96..465b354242 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeQueryImplementor.java @@ -14,12 +14,12 @@ import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.Map; -import javax.persistence.AttributeConverter; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java index bece06c097..b09b8d2269 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java @@ -16,18 +16,18 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Tuple; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortOrder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java index d8caaa0ea5..b64634ba2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java @@ -7,7 +7,7 @@ package org.hibernate.query.sqm; import java.util.Locale; -import javax.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.Bindable; import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.query.hql.spi.SqmCreationState; @@ -18,7 +18,7 @@ import org.hibernate.query.sqm.tree.domain.SqmPath; * Represents parts of the application's domain model that can be used * to create {@link SqmPath} nodes. * - * @apiNote Parallel to JPA's {@link javax.persistence.metamodel.Bindable} but + * @apiNote Parallel to JPA's {@link jakarta.persistence.metamodel.Bindable} but * broader mainly to support Hibernate ANY-mappings * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java index a47b2ba732..1cb12b2f8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java @@ -11,9 +11,9 @@ import java.util.Collections; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; -import javax.persistence.criteria.CompoundSelection; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; +import jakarta.persistence.criteria.CompoundSelection; import org.hibernate.ScrollMode; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; @@ -56,7 +56,7 @@ import org.hibernate.sql.results.spi.RowTransformer; /** * Standard Hibernate implementation of SelectQueryPlan for SQM-backed * {@link org.hibernate.query.Query} implementations, which means - * HQL/JPQL or {@link javax.persistence.criteria.CriteriaQuery} + * HQL/JPQL or {@link jakarta.persistence.criteria.CriteriaQuery} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java index a4ed8fdb16..182a1f0d28 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java @@ -15,10 +15,10 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.PersistenceException; -import javax.persistence.Tuple; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Tuple; import org.hibernate.HibernateException; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java index ee662b9c29..0b94767a84 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java @@ -23,19 +23,19 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import javax.persistence.Tuple; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.SessionFactory; @@ -136,7 +136,7 @@ import static java.util.Arrays.asList; import static org.hibernate.query.internal.QueryHelper.highestPrecedenceType; /** - * Acts as a JPA {@link javax.persistence.criteria.CriteriaBuilder} by + * Acts as a JPA {@link jakarta.persistence.criteria.CriteriaBuilder} by * using SQM nodes as the JPA Criteria nodes * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java index ae34ed2219..2c59cda46a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmMappingModelHelper.java @@ -7,7 +7,7 @@ package org.hibernate.query.sqm.internal; import java.util.function.Function; -import javax.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.Bindable; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java index a2ed654964..b1deeceda0 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java @@ -21,7 +21,7 @@ * == Criteria * * The SQM tree implements the JPA Criteria contracts. Hibernate's implementation of the - * JPA {@link javax.persistence.criteria.CriteriaBuilder} contract + * JPA {@link jakarta.persistence.criteria.CriteriaBuilder} contract * ({@link org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder}) returns SQM nodes * that are arranged into an SQM tree via the normal JPA Criteria building approach * diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java index 003302ef0e..aad7412aba 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java @@ -22,7 +22,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.Internal; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java index ca4566060a..766ab46098 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java @@ -6,10 +6,10 @@ */ package org.hibernate.query.sqm.tree; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.criteria.JpaCriteriaBase; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java index 4fe4ce17fa..64484a4d82 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/SqmJoinType.java @@ -24,17 +24,17 @@ public enum SqmJoinType { /** * Represents an inner join. */ - INNER( "inner", SqlAstJoinType.INNER, javax.persistence.criteria.JoinType.INNER ), + INNER( "inner", SqlAstJoinType.INNER, jakarta.persistence.criteria.JoinType.INNER ), /** * Represents a left outer join. */ - LEFT( "left outer", SqlAstJoinType.LEFT, javax.persistence.criteria.JoinType.LEFT ), + LEFT( "left outer", SqlAstJoinType.LEFT, jakarta.persistence.criteria.JoinType.LEFT ), /** * Represents a right outer join. */ - RIGHT( "right outer", SqlAstJoinType.RIGHT, javax.persistence.criteria.JoinType.RIGHT ), + RIGHT( "right outer", SqlAstJoinType.RIGHT, jakarta.persistence.criteria.JoinType.RIGHT ), /** * Represents a cross join (aka a cartesian product). @@ -48,12 +48,12 @@ public enum SqmJoinType { private final String text; private final SqlAstJoinType correspondingSqlAstJoinType; - private final javax.persistence.criteria.JoinType correspondingJpaJoinType; + private final jakarta.persistence.criteria.JoinType correspondingJpaJoinType; SqmJoinType( String text, SqlAstJoinType correspondingSqlAstJoinType, - javax.persistence.criteria.JoinType correspondingJpaJoinType) { + jakarta.persistence.criteria.JoinType correspondingJpaJoinType) { this.text = text; this.correspondingSqlAstJoinType = correspondingSqlAstJoinType; this.correspondingJpaJoinType = correspondingJpaJoinType; @@ -72,12 +72,12 @@ public enum SqmJoinType { return correspondingSqlAstJoinType; } - public javax.persistence.criteria.JoinType getCorrespondingJpaJoinType() { + public jakarta.persistence.criteria.JoinType getCorrespondingJpaJoinType() { return correspondingJpaJoinType; } @SuppressWarnings("DuplicateBranchesInSwitch") - public static SqmJoinType from(javax.persistence.criteria.JoinType jpaJoinType) { + public static SqmJoinType from(jakarta.persistence.criteria.JoinType jpaJoinType) { switch ( jpaJoinType ) { case INNER: { return INNER; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java index d19d77c741..b8772eef79 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.sqm.tree.delete; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.hibernate.query.criteria.JpaCriteriaDelete; import org.hibernate.query.sqm.NodeBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java index d330430de0..75f5b7a232 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.sqm.tree.domain; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; import org.hibernate.metamodel.model.domain.PersistentAttribute; import org.hibernate.query.criteria.JpaExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java index c555bb26fa..a2793f8494 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java @@ -13,15 +13,15 @@ import java.util.Locale; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.model.domain.BagPersistentAttribute; import org.hibernate.metamodel.model.domain.EntityDomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java index 1734440414..a7cf74ae10 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java @@ -12,9 +12,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping; import org.hibernate.metamodel.model.domain.PersistentAttribute; @@ -194,7 +194,7 @@ public abstract class AbstractSqmPath extends AbstractSqmExpression implem @Override @SuppressWarnings("unchecked") - public > SqmPath get(MapAttribute map) { + public > SqmPath get(MapAttribute map) { return resolvePath( (PersistentAttribute) map ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java index 0e56083ccd..e15badcb03 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPluralJoin.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.sqm.tree.domain; -import javax.persistence.criteria.PluralJoin; +import jakarta.persistence.criteria.PluralJoin; import org.hibernate.metamodel.model.domain.PluralPersistentAttribute; import org.hibernate.query.criteria.JpaJoin; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java index dd7fef2a1d..6c1bfea13e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.sqm.tree.domain; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.NavigablePath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java index ff8a2f10e7..7a0b7cf489 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java @@ -7,8 +7,8 @@ package org.hibernate.query.sqm.tree.domain; import java.util.Collection; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.hibernate.metamodel.model.domain.BagPersistentAttribute; import org.hibernate.metamodel.model.domain.EntityDomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java index 34249fb0d8..c0fc839c59 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java @@ -7,8 +7,8 @@ package org.hibernate.query.sqm.tree.domain; import java.util.List; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.ListPersistentAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java index f426323b29..0ed6060e35 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java @@ -11,8 +11,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.hibernate.query.criteria.JpaSelection; import org.hibernate.query.sqm.NodeBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java index ccc62ecc8c..08435e55ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java @@ -7,9 +7,9 @@ package org.hibernate.query.sqm.tree.domain; import java.util.Map; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.MapPersistentAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java index 6e784e7618..eca093bdf0 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java @@ -11,9 +11,9 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.NavigablePath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java index e0e8452b76..9ccc289fac 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java @@ -15,13 +15,13 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.graph.spi.SubGraphImplementor; import org.hibernate.metamodel.RepresentationMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java index 64313199eb..e18193828c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java @@ -7,9 +7,9 @@ package org.hibernate.query.sqm.tree.domain; import java.util.Set; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.SetPersistentAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java index 844f072a9d..e08bf4d3ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java @@ -9,7 +9,7 @@ package org.hibernate.query.sqm.tree.expression; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaSelection; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java index 1d5ff085e6..d2736ce6f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java @@ -17,7 +17,7 @@ import org.hibernate.query.sqm.SqmExpressable; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; /** - * {@link JpaParameterExpression} created via JPA {@link javax.persistence.criteria.CriteriaBuilder}. + * {@link JpaParameterExpression} created via JPA {@link jakarta.persistence.criteria.CriteriaBuilder}. * * Each occurence of a JpaParameterExpression results in a unique SqmParameter * diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java index aab9fcf8d7..a2b63a734b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java @@ -8,7 +8,7 @@ package org.hibernate.query.sqm.tree.expression; import java.util.ArrayList; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaSearchedCase; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java index 6764736d43..b6cd1c8f7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java @@ -9,7 +9,7 @@ package org.hibernate.query.sqm.tree.expression; import java.util.ArrayList; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaSimpleCase; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java index 0df31942c2..d2c347828c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java @@ -14,7 +14,7 @@ import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressable; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java index f158ec86b1..78de8dd349 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; import java.util.function.Consumer; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.annotations.Remove; import org.hibernate.metamodel.model.domain.AllowableFunctionReturnType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java index b4a111783f..d1ba16ee39 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java @@ -12,7 +12,7 @@ import java.math.BigInteger; import java.util.Collection; import java.util.List; import java.util.Locale; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.QueryException; import org.hibernate.query.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java index d341cb9b00..4c4b63ebbe 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java @@ -16,7 +16,7 @@ import org.hibernate.query.sqm.tree.select.SqmSelectableNode; import org.hibernate.sql.ast.tree.expression.JdbcParameter; /** - * Acts as the per-use wrapper for a JpaCriteriaParameter ({@link javax.persistence.criteria.CriteriaBuilder#parameter}). + * Acts as the per-use wrapper for a JpaCriteriaParameter ({@link jakarta.persistence.criteria.CriteriaBuilder#parameter}). * * JpaCriteriaParameter is the "domain query parameter" ({@link org.hibernate.query.QueryParameter} * while SqmJpaCriteriaParameterWrapper is the {@link SqmParameter} diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java index ebc2fe2b35..ca2961172c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFrom.java @@ -8,16 +8,16 @@ package org.hibernate.query.sqm.tree.from; import java.util.List; import java.util.function.Consumer; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.SetJoin; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.query.criteria.JpaFrom; import org.hibernate.query.hql.spi.SqmCreationState; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java index 2ca96f460b..06f3fd1ba2 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmJoin.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.sqm.tree.from; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.query.sqm.tree.SqmJoinType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java index 0afead45ab..17afe0bf0d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/AbstractSqmPredicate.java @@ -8,7 +8,7 @@ package org.hibernate.query.sqm.tree.predicate; import java.util.Collections; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.tree.expression.AbstractSqmExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmAndPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmAndPredicate.java index c86ad5390c..4e25a7c97f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmAndPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmAndPredicate.java @@ -8,7 +8,7 @@ package org.hibernate.query.sqm.tree.predicate; import java.util.Arrays; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java index 2d24b141c0..5eabc927a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmBooleanExpressionPredicate.java @@ -8,7 +8,7 @@ package org.hibernate.query.sqm.tree.predicate; import java.util.Collections; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java index 666fa18c48..72fb5e50d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmGroupedPredicate.java @@ -8,7 +8,7 @@ package org.hibernate.query.sqm.tree.predicate; import java.util.Collections; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java index eb9a66e7cc..c8c6bc982c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.query.criteria.JpaExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java index 085025ebd1..3cd9e4ce2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.sqm.tree.predicate; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.internal.QueryHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java index 9614e506f6..052dd0223b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmNegatedPredicate.java @@ -8,7 +8,7 @@ package org.hibernate.query.sqm.tree.predicate; import java.util.Collections; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmOrPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmOrPredicate.java index a2a3fb7d2f..fb2f012d6a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmOrPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmOrPredicate.java @@ -8,7 +8,7 @@ package org.hibernate.query.sqm.tree.predicate; import java.util.Arrays; import java.util.List; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java index 924540656d..92f505ead1 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java @@ -12,10 +12,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.criteria.JpaSelection; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java index 761da1f55c..af6d3ec90b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java @@ -9,7 +9,7 @@ package org.hibernate.query.sqm.tree.select; import java.util.List; import java.util.function.Consumer; -import javax.persistence.criteria.Selection; +import jakarta.persistence.criteria.Selection; import org.hibernate.query.criteria.JpaCompoundSelection; import org.hibernate.query.criteria.JpaSelection; @@ -27,10 +27,10 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor; * JPA Criteria API. * * @see org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder#tuple(Selection[]) - * @see javax.persistence.criteria.CriteriaBuilder#tuple(javax.persistence.criteria.Selection[]) + * @see jakarta.persistence.criteria.CriteriaBuilder#tuple(jakarta.persistence.criteria.Selection[]) * * @see org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder#array(Selection[]) - * @see javax.persistence.criteria.CriteriaBuilder#array(javax.persistence.criteria.Selection[]) + * @see jakarta.persistence.criteria.CriteriaBuilder#array(jakarta.persistence.criteria.Selection[]) * * @see org.hibernate.query.sqm.tree.expression.SqmTuple * diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java index d10c045d5c..9c86673c02 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java @@ -11,8 +11,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.hibernate.query.FetchClauseType; import org.hibernate.query.criteria.JpaExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java index aa691d81bc..9955f75495 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java @@ -10,12 +10,12 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Tuple; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Selection; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Selection; import org.hibernate.query.FetchClauseType; import org.hibernate.query.criteria.JpaCriteriaQuery; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java index 3b01a971ed..7b601cf58b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java @@ -7,7 +7,7 @@ package org.hibernate.query.sqm.tree.select; import java.util.function.Consumer; -import javax.persistence.criteria.Selection; +import jakarta.persistence.criteria.Selection; import org.hibernate.query.criteria.JpaSelection; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java index 18b8cef45a..7ddff2cb99 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java @@ -12,17 +12,17 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.criteria.AbstractQuery; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.PluralJoin; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.AbstractQuery; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.PluralJoin; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.SetJoin; import org.hibernate.query.criteria.JpaSelection; import org.hibernate.query.criteria.JpaSubQuery; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java index bd60960907..2fbfe2e83c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java @@ -7,10 +7,10 @@ package org.hibernate.query.sqm.tree.update; import java.util.List; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.query.criteria.JpaCriteriaUpdate; import org.hibernate.query.sqm.NodeBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java index dae03cdd13..7ed909c300 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBasedBeanContainer.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.beans.container.internal; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.resource.beans.container.spi.BeanContainer; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java index a9f0133a02..7188ef73df 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerBuilder.java @@ -22,7 +22,7 @@ import org.hibernate.service.ServiceRegistry; /** * Helper class for helping deal with the reflection calls relating to CDI - * in terms of building CDI-based {@link org.hibernate.resource.beans.container.spi.BeanContainer} + * in terms of building CDI-based {@link BeanContainer} * instance * * We need to to avoid statically linking CDI classed into the ClassLoader which diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java index 1b165abd73..d7f1603a0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerDelayedAccessImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.beans.container.internal; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.resource.beans.container.spi.AbstractCdiBeanContainer; import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java index 84356a03c9..b7dd1078e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.beans.container.internal; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.resource.beans.container.spi.AbstractCdiBeanContainer; import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java index 8d9a6b5c16..904d88e3b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerImmediateAccessImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.beans.container.internal; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.resource.beans.container.spi.AbstractCdiBeanContainer; import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java index df4290ea97..de52a84cd5 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/ContainerManagedLifecycleStrategy.java @@ -6,9 +6,9 @@ */ package org.hibernate.resource.beans.container.internal; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.resource.beans.container.spi.BeanContainer; import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java index 318470e954..e29dfc5269 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java @@ -7,11 +7,11 @@ package org.hibernate.resource.beans.container.internal; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionTarget; import org.hibernate.resource.beans.container.spi.BeanContainer; import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java index 84cacc192e..0b1b4def7e 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/NamedBeanQualifier.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.beans.container.internal; -import javax.inject.Named; +import jakarta.inject.Named; /** * Used to locate named CDI beans. @@ -14,7 +14,7 @@ import javax.inject.Named; * @author Yoann Rodière * @author Steve Ebersole */ -public class NamedBeanQualifier extends javax.enterprise.util.AnnotationLiteral implements Named { +public class NamedBeanQualifier extends jakarta.enterprise.util.AnnotationLiteral implements Named { private final String name; NamedBeanQualifier(String name) { diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java index 4c7b6d71cd..325e5d2705 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/spi/ExtendedBeanManager.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.beans.container.spi; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; /** * This contract and the nested LifecycleListener contract represent the changes diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java index 1e6760e8f7..b531e81992 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/spi/ManagedBeanRegistryInitiator.java @@ -24,7 +24,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor; /** * Hibernate's standard initializer for the ManagedBeanRegistry service. * - * Produces a {@link org.hibernate.resource.beans.internal.ManagedBeanRegistryImpl} + * Produces a {@link ManagedBeanRegistryImpl} * * @author Steve Ebersole */ @@ -130,7 +130,7 @@ public class ManagedBeanRegistryInitiator implements StandardServiceInitiator * Implementation note: Second parameter has been introduced to prevent - * multiple registrations of the same statement in case {@link java.sql.ResultSet#getStatement()} - * does not return original {@link java.sql.Statement} object. + * multiple registrations of the same statement in case {@link ResultSet#getStatement()} + * does not return original {@link Statement} object. * * @param resultSet The result set to register. - * @param statement Statement from which {@link java.sql.ResultSet} has been generated. + * @param statement Statement from which {@link ResultSet} has been generated. */ void register(ResultSet resultSet, Statement statement); @@ -59,7 +59,7 @@ public interface ResourceRegistry { * Release a previously registered result set. * * @param resultSet The result set to release. - * @param statement Statement from which {@link java.sql.ResultSet} has been generated. + * @param statement Statement from which {@link ResultSet} has been generated. */ void release(ResultSet resultSet, Statement statement); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java index 39274044ba..3e1ace8f3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java @@ -75,7 +75,7 @@ public interface LogicalConnectionImplementor extends LogicalConnection { * * @param oos The stream to write out state to * - * @throws java.io.IOException Problem accessing stream + * @throws IOException Problem accessing stream */ void serialize(ObjectOutputStream oos) throws IOException; } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java index 5b76a43e21..6b1ad8f873 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java @@ -9,8 +9,8 @@ package org.hibernate.resource.transaction.backend.jdbc.internal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.RollbackException; -import javax.transaction.Status; +import jakarta.persistence.RollbackException; +import jakarta.transaction.Status; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.transaction.spi.IsolationDelegate; @@ -31,11 +31,11 @@ import static org.hibernate.internal.CoreLogging.messageLogger; /** * An implementation of TransactionCoordinator based on managing a transaction through the JDBC Connection - * via {@link org.hibernate.resource.transaction.backend.jdbc.spi.JdbcResourceTransaction} + * via {@link JdbcResourceTransaction} * * @author Steve Ebersole * - * @see org.hibernate.resource.transaction.backend.jdbc.spi.JdbcResourceTransaction + * @see JdbcResourceTransaction */ public class JdbcResourceLocalTransactionCoordinatorImpl implements TransactionCoordinator { private static final CoreMessageLogger log = messageLogger( JdbcResourceLocalTransactionCoordinatorImpl.class ); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java index 88cd7eb316..b6f170b9d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java @@ -8,9 +8,9 @@ package org.hibernate.resource.transaction.backend.jta.internal; import java.sql.Connection; import java.sql.SQLException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import org.hibernate.HibernateException; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java index 2fba3356f7..73bba9b9ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java @@ -6,10 +6,10 @@ */ package org.hibernate.resource.transaction.backend.jta.internal; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import java.sql.Connection; import java.sql.SQLException; import java.util.concurrent.Callable; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java index 1913c7771e..47a19966b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java @@ -11,8 +11,8 @@ import org.hibernate.resource.transaction.spi.TransactionStatus; /** * Adapter for abstracting the physical means of interacting with JTA transactions. *

        - * JTA transactions can concretely be interacted with through {@link javax.transaction.UserTransaction} - * or {@link javax.transaction.Transaction} depending on environment and situation. This adapter hides + * JTA transactions can concretely be interacted with through {@link jakarta.transaction.UserTransaction} + * or {@link jakarta.transaction.Transaction} depending on environment and situation. This adapter hides * this difference. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java index 2d9f6a3c2c..b5f0b9dd3a 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java @@ -6,8 +6,8 @@ */ package org.hibernate.resource.transaction.backend.jta.internal; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java index 0930341f54..ea8363dc0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java @@ -6,8 +6,8 @@ */ package org.hibernate.resource.transaction.backend.jta.internal; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java index 3617c3f183..946ce317a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java @@ -9,9 +9,9 @@ package org.hibernate.resource.transaction.backend.jta.internal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.transaction.Status; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.HibernateException; import org.hibernate.boot.spi.SessionFactoryOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java index 3342ddc023..7f53d5bef8 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.transaction.backend.jta.internal; -import javax.transaction.Status; +import jakarta.transaction.Status; import org.hibernate.TransactionException; import org.hibernate.resource.transaction.spi.TransactionStatus; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java index 756fb19acd..dd6f52c342 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java @@ -12,8 +12,8 @@ import org.hibernate.engine.spi.SessionImplementor; /** * A pluggable strategy for defining any actions to be performed during - * {@link javax.transaction.Synchronization#afterCompletion} processing from the the - * {@link javax.transaction.Synchronization} registered by Hibernate with the underlying JTA platform. + * {@link jakarta.transaction.Synchronization#afterCompletion} processing from the the + * {@link jakarta.transaction.Synchronization} registered by Hibernate with the underlying JTA platform. * * @author Steve Ebersole * diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java index e6507edd6e..069af54763 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java @@ -7,19 +7,19 @@ package org.hibernate.resource.transaction.backend.jta.internal.synchronization; import java.io.Serializable; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.hibernate.engine.spi.SessionImplementor; /** - * A pluggable strategy for defining how the {@link javax.transaction.Synchronization} registered by Hibernate handles + * A pluggable strategy for defining how the {@link jakarta.transaction.Synchronization} registered by Hibernate handles * exceptions. * * @author Steve Ebersole */ public interface ExceptionMapper extends Serializable { /** - * Map a JTA {@link javax.transaction.SystemException} to the appropriate runtime-based exception. + * Map a JTA {@link jakarta.transaction.SystemException} to the appropriate runtime-based exception. * * @param message The message to use for the returned exception * @param systemException The causal exception diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java index 1db6e6b0b6..5a1628f1fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java @@ -11,7 +11,7 @@ import java.io.Serializable; import org.hibernate.engine.spi.SessionImplementor; /** - * A pluggable strategy for defining how the {@link javax.transaction.Synchronization} registered by Hibernate determines + * A pluggable strategy for defining how the {@link jakarta.transaction.Synchronization} registered by Hibernate determines * whether to perform a managed flush. An exceptions from either this delegate or the subsequent flush are routed * through the sister strategy {@link ExceptionMapper}. * diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java index 821c7cc8ff..faad6ac55e 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java @@ -6,14 +6,14 @@ */ package org.hibernate.resource.transaction.backend.jta.internal.synchronization; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.jboss.logging.Logger; import static org.hibernate.internal.CoreLogging.logger; /** - * The JTA {@link javax.transaction.Synchronization} Hibernate registers when needed for JTA callbacks. + * The JTA {@link jakarta.transaction.Synchronization} Hibernate registers when needed for JTA callbacks. *

        * Note that we split the notion of the registered Synchronization and the processing of the Synchronization callbacks * mainly to account for "separation of concerns", but also so that the transaction engine does not have to hold diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java index 1139a85b7f..3813beee41 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java @@ -6,7 +6,7 @@ */ package org.hibernate.resource.transaction.backend.jta.internal.synchronization; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; /** * Manages funneling JTA Synchronization callbacks back into the Hibernate transaction engine. diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java index a554e0f5dd..91086f5cdf 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java @@ -11,7 +11,7 @@ import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; /** - * Manages callbacks from the {@link javax.transaction.Synchronization} registered by Hibernate. + * Manages callbacks from the {@link jakarta.transaction.Synchronization} registered by Hibernate. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java index 7813655df5..17cd2ce9c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java @@ -12,7 +12,7 @@ package org.hibernate.resource.transaction.backend.jta.internal.synchronization; *

        * That's a mouthful :) The way it works is like this...

          *
        • - * Hibernate will register a JTA {@link javax.transaction.Synchronization} implementation + * Hibernate will register a JTA {@link jakarta.transaction.Synchronization} implementation * ({@link RegisteredSynchronization}) which allows * it to listen for completion of the JTA transaction. *
          • @@ -44,7 +44,7 @@ public interface SynchronizationCallbackTarget { /** * Callback of before-completion. * - * @see javax.transaction.Synchronization#beforeCompletion + * @see jakarta.transaction.Synchronization#beforeCompletion */ void beforeCompletion(); @@ -53,7 +53,7 @@ public interface SynchronizationCallbackTarget { * * @param successful Was the transaction successful? * - * @see javax.transaction.Synchronization#afterCompletion + * @see jakarta.transaction.Synchronization#afterCompletion */ void afterCompletion(boolean successful, boolean delayed); } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java index 87b1755874..3653667618 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java @@ -6,7 +6,7 @@ */ /** - * Internal implementation details for reacting to JTA transaction completion via {@link javax.transaction.Synchronization} + * Internal implementation details for reacting to JTA transaction completion via {@link jakarta.transaction.Synchronization} * callbacks */ package org.hibernate.resource.transaction.backend.jta.internal.synchronization; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java index cf457cdf06..fa762803a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java @@ -7,7 +7,7 @@ package org.hibernate.resource.transaction.internal; import java.util.LinkedHashSet; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java index cc48c5e20a..b5c28791ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java @@ -27,8 +27,8 @@ * This is the physical underlying transaction that ultimately controls the database transaction. This * can be:
            *
          • - * a JTA transaction, as expressed by {@link javax.transaction.UserTransaction} or - * {@link javax.transaction.Transaction}) + * a JTA transaction, as expressed by {@link jakarta.transaction.UserTransaction} or + * {@link jakarta.transaction.Transaction}) *
            • *
          • * a "JDBC transaction", as expressed through the JDBC {@link java.sql.Connection} object diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java index bc2eecfdde..7a95c90748 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistry.java @@ -7,7 +7,7 @@ package org.hibernate.resource.transaction.spi; import java.io.Serializable; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.resource.transaction.NullSynchronizationException; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java index 2c02d4c20a..5d3c51b11f 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java @@ -13,15 +13,15 @@ package org.hibernate.resource.transaction.spi; */ public interface SynchronizationRegistryImplementor extends SynchronizationRegistry { /** - * Delegates the {@link javax.transaction.Synchronization#beforeCompletion} call to each registered Synchronization + * Delegates the {@link jakarta.transaction.Synchronization#beforeCompletion} call to each registered Synchronization */ void notifySynchronizationsBeforeTransactionCompletion(); /** - * Delegates the {@link javax.transaction.Synchronization#afterCompletion} call to each registered Synchronization. Will also + * Delegates the {@link jakarta.transaction.Synchronization#afterCompletion} call to each registered Synchronization. Will also * clear the registered Synchronizations after all have been notified. * - * @param status The transaction status, per {@link javax.transaction.Status} constants + * @param status The transaction status, per {@link jakarta.transaction.Status} constants */ void notifySynchronizationsAfterTransactionCompletion(int status); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java index eae2b7a1c8..3e4810caa5 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java @@ -40,7 +40,7 @@ public interface TransactionCoordinator { /** * Indicates an explicit request to join a transaction. This is mainly intended to handle the JPA requirement - * around {@link javax.persistence.EntityManager#joinTransaction()}, and generally speaking only has an impact in + * around {@link jakarta.persistence.EntityManager#joinTransaction()}, and generally speaking only has an impact in * JTA environments */ void explicitJoin(); diff --git a/hibernate-core/src/main/java/org/hibernate/secure/internal/StandardJaccServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/secure/internal/StandardJaccServiceImpl.java index 959314938a..3cb1aa3f51 100644 --- a/hibernate-core/src/main/java/org/hibernate/secure/internal/StandardJaccServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/secure/internal/StandardJaccServiceImpl.java @@ -15,11 +15,11 @@ import java.security.ProtectionDomain; import java.util.Map; import java.util.Set; import javax.security.auth.Subject; -import javax.security.jacc.EJBMethodPermission; -import javax.security.jacc.PolicyConfiguration; -import javax.security.jacc.PolicyConfigurationFactory; -import javax.security.jacc.PolicyContext; -import javax.security.jacc.PolicyContextException; +import jakarta.security.jacc.EJBMethodPermission; +import jakarta.security.jacc.PolicyConfiguration; +import jakarta.security.jacc.PolicyConfigurationFactory; +import jakarta.security.jacc.PolicyContext; +import jakarta.security.jacc.PolicyContextException; import org.hibernate.HibernateException; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/DerbyCaseFragment.java b/hibernate-core/src/main/java/org/hibernate/sql/DerbyCaseFragment.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java index 1ecfabea41..28e66305dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstNodeRenderingMode.java @@ -9,7 +9,7 @@ package org.hibernate.sql.ast; import org.hibernate.sql.ast.tree.SqlAstNode; /** - * The rendering mode to use for {@link org.hibernate.sql.ast.tree.SqlAstNode}. + * The rendering mode to use for {@link SqlAstNode}. * * Some functions/contexts require the use of literals/expressions rather than parameters * like for example the `char` function in Derby which requires the length as literal. @@ -29,19 +29,19 @@ public enum SqlAstNodeRenderingMode { /** * Render parameters as literals. - * All parameters within the {@link org.hibernate.sql.ast.tree.SqlAstNode} are rendered as literals. + * All parameters within the {@link SqlAstNode} are rendered as literals. */ INLINE_PARAMETERS, /** * Render all nested parameters as literals. - * All parameters within the {@link org.hibernate.sql.ast.tree.SqlAstNode} are rendered as literals. + * All parameters within the {@link SqlAstNode} are rendered as literals. */ INLINE_ALL_PARAMETERS, /** * Don't render plain parameters. Render it as literal or as expression. - * If the {@link org.hibernate.sql.ast.tree.SqlAstNode} to render is a parameter, + * If the {@link SqlAstNode} to render is a parameter, * it will be rendered either as literal or wrapped into a semantically equivalent expression * such that it doesn't appear as plain parameter. */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java index 3e301f0e4e..26649f4d4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java @@ -244,7 +244,7 @@ public abstract class AbstractSqlAstTranslator implemen /** * A lazy session implementation that is needed for rendering literals. - * Usually, only the {@link org.hibernate.type.descriptor.WrapperOptions} interface is needed, + * Usually, only the {@link WrapperOptions} interface is needed, * but for creating LOBs, it might be to have a full blown session. */ private static class LazySessionWrapperOptions extends AbstractDelegatingWrapperOptions { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java index 86ff9d2db9..7bf4a1f67b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelectionProducer.java @@ -18,7 +18,7 @@ public interface SqlSelectionProducer { * Create a SqlSelection for the given JDBC ResultSet position * * @param jdbcPosition The index position used to read values from JDBC - * @param valuesArrayPosition The position in our {@linkplain RowProcessingState#getJdbcValue(org.hibernate.sql.ast.spi.SqlSelection) "current JDBC values array"} + * @param valuesArrayPosition The position in our {@linkplain RowProcessingState#getJdbcValue(SqlSelection) "current JDBC values array"} * @param javaTypeDescriptor The descriptor for the Java type to read the value as * @param typeConfiguration The associated TypeConfiguration */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java index eb08fabd8e..1c739115a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTableGroup.java @@ -20,7 +20,7 @@ import org.hibernate.sql.ast.tree.from.TableReferenceJoin; /** * Wraps a {@link TableReference} representing the CTE and adapts it to - * {@link org.hibernate.sql.ast.tree.from.TableGroup} for use in SQL AST + * {@link TableGroup} for use in SQL AST * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/package.html b/hibernate-core/src/main/java/org/hibernate/sql/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java index 3036858790..5d34684120 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerJpaTupleImpl.java @@ -7,7 +7,7 @@ package org.hibernate.sql.results.internal; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; import org.hibernate.sql.results.spi.RowTransformer; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java index 74426d1b8d..2d14d135d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java @@ -8,7 +8,7 @@ package org.hibernate.sql.results.internal; import java.util.Map; import java.util.Objects; -import javax.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.PluralAttribute; import org.hibernate.engine.FetchStyle; import org.hibernate.engine.FetchTiming; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java index 07ac64f935..ee7994aea7 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleElementImpl.java @@ -7,7 +7,7 @@ package org.hibernate.sql.results.internal; -import javax.persistence.TupleElement; +import jakarta.persistence.TupleElement; /** * Implementation of the JPA TupleElement contract diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java index 09307f41fc..d8c3f7decb 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java @@ -7,7 +7,7 @@ package org.hibernate.sql.results.internal; import java.util.List; -import javax.persistence.TupleElement; +import jakarta.persistence.TupleElement; import org.hibernate.query.JpaTuple; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java index ec11784ff6..0bed72c6bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.TupleElement; +import jakarta.persistence.TupleElement; /** * Metadata about the tuple structure. diff --git a/hibernate-core/src/main/java/org/hibernate/stat/CacheRegionStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/CacheRegionStatistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/CollectionStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/CollectionStatistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/EntityStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/EntityStatistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/QueryStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/QueryStatistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/SecondLevelCacheStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/SecondLevelCacheStatistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/SessionStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/SessionStatistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/Statistics.java b/hibernate-core/src/main/java/org/hibernate/stat/Statistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/CategorizedStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/CategorizedStatistics.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java index 8b02ed2704..8a49d50cf5 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java @@ -28,7 +28,7 @@ import org.hibernate.stat.spi.StatisticsImplementor; import static org.hibernate.internal.CoreLogging.messageLogger; /** - * Implementation of {@link org.hibernate.stat.Statistics} based on the {@link java.util.concurrent} package. + * Implementation of {@link Statistics} based on the {@link java.util.concurrent} package. * * @author Alex Snaps * @author Sanne Grinovero diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java index 4ebe7a9cd4..c1733af0eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatsNamedContainer.java @@ -56,7 +56,7 @@ public final class StatsNamedContainer { } /** - * Similar semantics as you'd get by invoking {@link java.util.concurrent.ConcurrentMap#computeIfAbsent(Object, Function)}, + * Similar semantics as you'd get by invoking {@link ConcurrentMap#computeIfAbsent(Object, Function)}, * but we check for the key existence first. * This is technically a redundant check, but it has been shown to perform better when the key existing is very likely, * as in our case. diff --git a/hibernate-core/src/main/java/org/hibernate/stat/package.html b/hibernate-core/src/main/java/org/hibernate/stat/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/package.html b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java index e293ba215f..a3f1a36087 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java @@ -18,14 +18,14 @@ public enum JdbcMetadaAccessStrategy { /** * The {@link org.hibernate.tool.schema.spi.SchemaMigrator} and {@link org.hibernate.tool.schema.spi.SchemaValidator} * execute one {@link java.sql.DatabaseMetaData#getTables(String, String, String, String[])} call for each - * {@link javax.persistence.Entity} in order to determine if a corresponding database table exists. + * {@link jakarta.persistence.Entity} in order to determine if a corresponding database table exists. */ INDIVIDUALLY( "individually" ), /** * The {@link org.hibernate.tool.schema.spi.SchemaMigrator} and {@link org.hibernate.tool.schema.spi.SchemaValidator} * execute a single {@link java.sql.DatabaseMetaData#getTables(String, String, String, String[])} call - * to retrieve all the database table in order to determine all the {@link javax.persistence.Entity} have a mapped database tables. + * to retrieve all the database table in order to determine all the {@link jakarta.persistence.Entity} have a mapped database tables. *

            * This strategy is the default one and it may require {@link AvailableSettings#DEFAULT_CATALOG} and/or * {@link AvailableSettings#DEFAULT_SCHEMA} values to be provided. diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java index 59d0f6657e..99421892d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/SequenceInformationExtractor.java @@ -22,7 +22,7 @@ public interface SequenceInformationExtractor { * * @return The extracted information about existing sequences. * - * @throws java.sql.SQLException Don't bother handling SQLExceptions (unless you want to), we will deal with them in the + * @throws SQLException Don't bother handling SQLExceptions (unless you want to), we will deal with them in the * caller. */ public Iterable extractMetadata(ExtractionContext extractionContext) throws SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java index 52e2eb3da4..046b23d783 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaMigratorImpl.java @@ -26,7 +26,7 @@ import org.hibernate.tool.schema.spi.SchemaFilter; * @author Andrea Boriero * * This implementation executes a single {@link java.sql.DatabaseMetaData#getTables(String, String, String, String[])} call - * to retrieve all the database table in order to determine if all the {@link javax.persistence.Entity} have a mapped database tables. + * to retrieve all the database table in order to determine if all the {@link jakarta.persistence.Entity} have a mapped database tables. */ public class GroupedSchemaMigratorImpl extends AbstractSchemaMigrator { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java index c46a1312f6..2716c1780e 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/GroupedSchemaValidatorImpl.java @@ -20,7 +20,7 @@ import org.hibernate.tool.schema.spi.SchemaFilter; * @author Andrea Boriero * * This implementation executes a single {@link java.sql.DatabaseMetaData#getTables(String, String, String, String[])} call - * to retrieve all the database table in order to determine if all the {@link javax.persistence.Entity} have a mapped database tables. + * to retrieve all the database table in order to determine if all the {@link jakarta.persistence.Entity} have a mapped database tables. */ public class GroupedSchemaValidatorImpl extends AbstractSchemaValidator { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java index 0dac43c869..16f75c21f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaMigratorImpl.java @@ -26,7 +26,7 @@ import org.hibernate.tool.schema.spi.SchemaFilter; * @author Andrea Boriero * * This implementation executes one {@link java.sql.DatabaseMetaData#getTables(String, String, String, String[])} call - * for each {@link javax.persistence.Entity} in order to determine if a corresponding database table exists. + * for each {@link jakarta.persistence.Entity} in order to determine if a corresponding database table exists. */ public class IndividuallySchemaMigratorImpl extends AbstractSchemaMigrator { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java index 0be96c45a2..b7be9d2afb 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndividuallySchemaValidatorImpl.java @@ -20,7 +20,7 @@ import org.hibernate.tool.schema.spi.SchemaFilter; * @author Andrea Boriero * * This implementation executes one {@link java.sql.DatabaseMetaData#getTables(String, String, String, String[])} call - * for each {@link javax.persistence.Entity} in order to determine if a corresponding database table exists. + * for each {@link jakarta.persistence.Entity} in order to determine if a corresponding database table exists. */ public class IndividuallySchemaValidatorImpl extends AbstractSchemaValidator { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java index 5f2d8fabd2..d9b781a347 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessConnectionProviderImpl.java @@ -8,7 +8,7 @@ package org.hibernate.tool.schema.internal.exec; import java.sql.Connection; import java.sql.SQLException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java index 26ddd022f3..e9d6ad716e 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/JdbcConnectionAccessProvidedConnectionImpl.java @@ -8,7 +8,7 @@ package org.hibernate.tool.schema.internal.exec; import java.sql.Connection; import java.sql.SQLException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java index 4e9f79df71..4abf3c5312 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaFilterProvider.java @@ -9,7 +9,7 @@ package org.hibernate.tool.schema.spi; import org.hibernate.Incubating; /** - * Used to specify the {@link org.hibernate.tool.schema.spi.SchemaFilter}s to be used by create, drop, migrate and validate + * Used to specify the {@link SchemaFilter}s to be used by create, drop, migrate and validate * operations on the database schema. These filters can be used to limit the scope of operations to specific namespaces, * tables and sequences. * diff --git a/hibernate-core/src/main/java/org/hibernate/transform/package.html b/hibernate-core/src/main/java/org/hibernate/transform/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/DynamicMapInstantiator.java b/hibernate-core/src/main/java/org/hibernate/tuple/DynamicMapInstantiator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java index 1efd0706fc..1b4d02e23c 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/NonIdentifierAttribute.java @@ -25,7 +25,7 @@ public interface NonIdentifierAttribute extends Attribute, AttributeDefinition { public boolean isNullable(); /** - * @deprecated Use {@link org.hibernate.tuple.NonIdentifierAttribute#isDirtyCheckable()} instead + * @deprecated Use {@link NonIdentifierAttribute#isDirtyCheckable()} instead */ @Deprecated public boolean isDirtyCheckable(boolean hasUninitializedProperties); diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java b/hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java b/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java index 035867d6fe..cd63f58280 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/StandardProperty.java @@ -15,7 +15,7 @@ import org.hibernate.type.Type; * * @author Steve Ebersole * - * @deprecated Use one of the {@link org.hibernate.tuple.Attribute}-based impls instead. + * @deprecated Use one of the {@link Attribute}-based impls instead. */ @Deprecated public class StandardProperty extends AbstractNonIdentifierAttribute implements NonIdentifierAttribute { diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java b/hibernate-core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java index 7671c8ac83..afeec96d72 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java @@ -96,7 +96,7 @@ public class ComponentTuplizerFactory implements Serializable { * * @return The instantiated tuplizer * - * @throws HibernateException if the {@link java.lang.reflect.Constructor#newInstance} call fails. + * @throws HibernateException if the {@link Constructor#newInstance} call fails. */ public ComponentTuplizer constructTuplizer(Class tuplizerClass, Component metadata) { Constructor constructor = getProperConstructor( tuplizerClass ); diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/package.html b/hibernate-core/src/main/java/org/hibernate/tuple/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/type/AdaptedImmutableType.java b/hibernate-core/src/main/java/org/hibernate/type/AdaptedImmutableType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/type/BagType.java b/hibernate-core/src/main/java/org/hibernate/type/BagType.java index d162d48c9d..92ee8160ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BagType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BagType.java @@ -30,7 +30,7 @@ public class BagType extends CollectionType { @Override public Class getReturnedClass() { - return java.util.Collection.class; + return Collection.class; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/type/BigIntegerType.java b/hibernate-core/src/main/java/org/hibernate/type/BigIntegerType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/type/BinaryType.java b/hibernate-core/src/main/java/org/hibernate/type/BinaryType.java index 34dd529d2a..c05c6c2f37 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BinaryType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BinaryType.java @@ -19,7 +19,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between a {@link java.sql.Types#VARBINARY VARBINARY} and {@code byte[]} + * A type that maps between a {@link Types#VARBINARY VARBINARY} and {@code byte[]} * * Implementation of the {@link VersionType} interface should be considered deprecated. * For binary entity versions/timestamps, {@link RowVersionType} should be used instead. diff --git a/hibernate-core/src/main/java/org/hibernate/type/BooleanType.java b/hibernate-core/src/main/java/org/hibernate/type/BooleanType.java index 2a12ae24cb..ff17b39b75 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BooleanType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BooleanType.java @@ -17,7 +17,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptorIndicators; /** - * A type that maps between {@link java.sql.Types#BOOLEAN BOOLEAN} and {@link Boolean} + * A type that maps between {@link Types#BOOLEAN BOOLEAN} and {@link Boolean} * * @author Gavin King * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/CalendarDateType.java b/hibernate-core/src/main/java/org/hibernate/type/CalendarDateType.java index 7947b018ef..3e726dfe9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CalendarDateType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CalendarDateType.java @@ -8,7 +8,7 @@ package org.hibernate.type; import java.util.Calendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/CalendarTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/CalendarTimeType.java index 6b8c986e71..06a763cb56 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CalendarTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CalendarTimeType.java @@ -8,7 +8,7 @@ package org.hibernate.type; import java.util.Calendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; @@ -19,8 +19,8 @@ import org.hibernate.type.spi.TypeConfiguration; /** * A type mapping {@link java.sql.Types#TIME TIME} and {@link Calendar}. *

            - * For example, a Calendar attribute annotated with {@link javax.persistence.Temporal} and specifying - * {@link javax.persistence.TemporalType#TIME} + * For example, a Calendar attribute annotated with {@link jakarta.persistence.Temporal} and specifying + * {@link jakarta.persistence.TemporalType#TIME} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/CalendarType.java b/hibernate-core/src/main/java/org/hibernate/type/CalendarType.java index ad46108bec..24f843deeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CalendarType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CalendarType.java @@ -10,7 +10,7 @@ import java.util.Calendar; import java.util.Comparator; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/CharArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/CharArrayType.java index 5c645919e7..cf24d13381 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CharArrayType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CharArrayType.java @@ -16,7 +16,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#VARCHAR VARCHAR} and {@code char[]} + * A type that maps between {@link Types#VARCHAR VARCHAR} and {@code char[]} * * @author Emmanuel Bernard * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayClobType.java b/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayClobType.java index 4ba3712ca8..1cd4508123 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayClobType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayClobType.java @@ -17,7 +17,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#CLOB CLOB} and {@link Character Character[]} + * A type that maps between {@link Types#CLOB CLOB} and {@link Character Character[]} *

            * Essentially a {@link MaterializedClobType} but represented as a Character[] in Java rather than String. * diff --git a/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayNClobType.java b/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayNClobType.java index c73b6beb38..4bff9d3d25 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayNClobType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayNClobType.java @@ -17,9 +17,9 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#NCLOB NCLOB} and {@link Character Character[]} + * A type that maps between {@link Types#NCLOB NCLOB} and {@link Character Character[]} *

            - * Essentially a {@link org.hibernate.type.MaterializedNClobType} but represented as a Character[] in Java rather than String. + * Essentially a {@link MaterializedNClobType} but represented as a Character[] in Java rather than String. * * @author Emmanuel Bernard * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayType.java index a524fc60fc..fb1f0f1ef4 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CharacterArrayType.java @@ -16,7 +16,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#VARCHAR VARCHAR} and {@link Character Character[]} + * A type that maps between {@link Types#VARCHAR VARCHAR} and {@link Character Character[]} * * @author Emmanuel Bernard * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/CharacterType.java b/hibernate-core/src/main/java/org/hibernate/type/CharacterType.java index 6626829f6d..100b24abf2 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CharacterType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CharacterType.java @@ -19,7 +19,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#CHAR CHAR(1)} and {@link Character} + * A type that maps between {@link Types#CHAR CHAR(1)} and {@link Character} * * @author Gavin King * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/ClobType.java b/hibernate-core/src/main/java/org/hibernate/type/ClobType.java index 6f1c809363..9a36615f19 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/ClobType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/ClobType.java @@ -17,7 +17,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#CLOB CLOB} and {@link Clob} + * A type that maps between {@link Types#CLOB CLOB} and {@link Clob} * * @author Gavin King * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java index 9dd310ca32..2c2921ab17 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java @@ -304,7 +304,7 @@ public abstract class CollectionType extends AbstractType implements Association * * @param session The session from which the request is originating. * @return True if the collection owner is versioned; false otherwise. - * @throws org.hibernate.MappingException Indicates our persister could not be located. + * @throws MappingException Indicates our persister could not be located. */ private boolean isOwnerVersioned(SharedSessionContractImplementor session) throws MappingException { return getPersister( session ).getOwnerEntityPersister().isVersioned(); @@ -571,12 +571,12 @@ public abstract class CollectionType extends AbstractType implements Association Object owner, Map copyCache, SharedSessionContractImplementor session) { - java.util.Collection result = ( java.util.Collection ) target; + Collection result = ( Collection ) target; result.clear(); // copy elements into newly empty target collection Type elemType = getElementType( session.getFactory() ); - Iterator iter = ( (java.util.Collection) original ).iterator(); + Iterator iter = ( (Collection) original ).iterator(); while ( iter.hasNext() ) { result.add( elemType.replace( iter.next(), null, session, owner, copyCache ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java old mode 100755 new mode 100644 index cb2f4f52e1..789587082d --- a/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java @@ -22,8 +22,8 @@ import org.hibernate.usertype.UserCollectionType; /** * A custom type for mapping user-written classes that implement PersistentCollection * - * @see org.hibernate.collection.spi.PersistentCollection - * @see org.hibernate.usertype.UserCollectionType + * @see PersistentCollection + * @see UserCollectionType * @author Gavin King */ public class CustomCollectionType extends CollectionType { diff --git a/hibernate-core/src/main/java/org/hibernate/type/DateType.java b/hibernate-core/src/main/java/org/hibernate/type/DateType.java index bbaec83ba9..689919f468 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/DateType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/DateType.java @@ -8,7 +8,7 @@ package org.hibernate.type; import java.util.Date; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/type/EmbeddedComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/EmbeddedComponentType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java index f120c60533..2e24f1173e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java @@ -654,7 +654,7 @@ public abstract class EntityType extends AbstractType implements AssociationType * * @return The resolved identifier (i.e., loaded entity). * - * @throws org.hibernate.HibernateException Indicates problems performing the load. + * @throws HibernateException Indicates problems performing the load. */ protected final Object resolveIdentifier(Object id, SharedSessionContractImplementor session, Boolean overridingEager) throws HibernateException { diff --git a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java index d8cd1bc237..36fbaffda5 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java @@ -14,8 +14,8 @@ import java.sql.SQLException; import java.sql.Types; import java.util.Locale; import java.util.Properties; -import javax.persistence.Enumerated; -import javax.persistence.MapKeyEnumerated; +import jakarta.persistence.Enumerated; +import jakarta.persistence.MapKeyEnumerated; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; @@ -123,14 +123,14 @@ public class EnumType> final Long columnLength = reader.getColumnLengths()[0]; final boolean isOrdinal; - final javax.persistence.EnumType enumType = getEnumType( reader ); + final jakarta.persistence.EnumType enumType = getEnumType( reader ); if ( enumType == null ) { isOrdinal = true; } - else if ( javax.persistence.EnumType.ORDINAL.equals( enumType ) ) { + else if ( jakarta.persistence.EnumType.ORDINAL.equals( enumType ) ) { isOrdinal = true; } - else if ( javax.persistence.EnumType.STRING.equals( enumType ) ) { + else if ( jakarta.persistence.EnumType.STRING.equals( enumType ) ) { isOrdinal = false; } else { @@ -200,7 +200,7 @@ public class EnumType> return enumJavaDescriptor.getRecommendedJdbcType( indicators ).getJdbcRecommendedJavaTypeMapping( typeConfiguration ); } - private javax.persistence.EnumType getEnumType(ParameterType reader) { + private jakarta.persistence.EnumType getEnumType(ParameterType reader) { if ( reader == null ) { return null; } @@ -240,7 +240,7 @@ public class EnumType> final LocalJdbcTypeDescriptorIndicators localIndicators = new LocalJdbcTypeDescriptorIndicators( // use ORDINAL as default for hbm.xml mappings - javax.persistence.EnumType.ORDINAL, + jakarta.persistence.EnumType.ORDINAL, // Is there a reasonable value here? Limits the // number of enums that can be stored: // 1 = 10 @@ -445,11 +445,11 @@ public class EnumType> } private class LocalJdbcTypeDescriptorIndicators implements JdbcTypeDescriptorIndicators { - private final javax.persistence.EnumType enumType; + private final jakarta.persistence.EnumType enumType; private final Long columnLength; private final ParameterType reader; - public LocalJdbcTypeDescriptorIndicators(javax.persistence.EnumType enumType, Long columnLength, ParameterType reader) { + public LocalJdbcTypeDescriptorIndicators(jakarta.persistence.EnumType enumType, Long columnLength, ParameterType reader) { this.enumType = enumType; this.columnLength = columnLength; this.reader = reader; @@ -461,7 +461,7 @@ public class EnumType> } @Override - public javax.persistence.EnumType getEnumeratedType() { + public jakarta.persistence.EnumType getEnumeratedType() { if ( enumType != null ) { return enumType; } diff --git a/hibernate-core/src/main/java/org/hibernate/type/InstantType.java b/hibernate-core/src/main/java/org/hibernate/type/InstantType.java index a95efcbaeb..839ccc79db 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/InstantType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/InstantType.java @@ -10,7 +10,7 @@ import java.time.Instant; import java.time.format.DateTimeFormatter; import java.util.Comparator; import java.util.Locale; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java index 703a2a9807..688ca4bb86 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java @@ -8,7 +8,7 @@ package org.hibernate.type; import java.time.LocalDateTime; import java.util.Comparator; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java b/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java index a93fd904a3..6837469db4 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java @@ -7,7 +7,7 @@ package org.hibernate.type; import java.time.LocalDate; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java index 0c05df7db9..f0d75f02c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java @@ -7,7 +7,7 @@ package org.hibernate.type; import java.time.LocalTime; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.type.descriptor.java.LocalTimeJavaDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/MapType.java b/hibernate-core/src/main/java/org/hibernate/type/MapType.java index 4ef28f3804..bb47706aba 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/MapType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/MapType.java @@ -39,12 +39,12 @@ public class MapType extends CollectionType { @Override public Iterator getElementsIterator(Object collection) { - return ( (java.util.Map) collection ).values().iterator(); + return ( (Map) collection ).values().iterator(); } @Override public PersistentCollection wrap(SharedSessionContractImplementor session, Object collection) { - return new PersistentMap( session, (java.util.Map) collection ); + return new PersistentMap( session, (Map) collection ); } @Override @@ -59,11 +59,11 @@ public class MapType extends CollectionType { final Object original, final Object target, final Object owner, - final java.util.Map copyCache, + final Map copyCache, final SharedSessionContractImplementor session) throws HibernateException { CollectionPersister cp = session.getFactory().getMetamodel().collectionPersister( getRole() ); - java.util.Map result = (java.util.Map) target; + Map result = (Map) target; result.clear(); for ( Object o : ( (Map) original ).entrySet() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/type/MaterializedClobType.java b/hibernate-core/src/main/java/org/hibernate/type/MaterializedClobType.java index 32a23604cf..21ce9a3ece 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/MaterializedClobType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/MaterializedClobType.java @@ -16,7 +16,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#CLOB CLOB} and {@link String} + * A type that maps between {@link Types#CLOB CLOB} and {@link String} * * @author Gavin King * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/type/NClobType.java b/hibernate-core/src/main/java/org/hibernate/type/NClobType.java index 6f17b3cdb6..18193d488b 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/NClobType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/NClobType.java @@ -12,7 +12,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.type.descriptor.java.NClobTypeDescriptor; /** - * A type that maps between {@link java.sql.Types#NCLOB NCLOB} and {@link java.sql.NClob} + * A type that maps between {@link java.sql.Types#NCLOB NCLOB} and {@link NClob} * * @author Gavin King * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java b/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java index c0c9321591..f387458ca6 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java @@ -6,8 +6,8 @@ */ package org.hibernate.type; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * Handles conversion to/from Boolean as `0` (false) or `1` (true) diff --git a/hibernate-core/src/main/java/org/hibernate/type/OffsetDateTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/OffsetDateTimeType.java index c3e2a6f121..bb9b670cc9 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/OffsetDateTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/OffsetDateTimeType.java @@ -9,7 +9,7 @@ package org.hibernate.type; import java.time.OffsetDateTime; import java.util.Comparator; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java index f3f88cda43..d4c7dbd1f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java @@ -7,7 +7,7 @@ package org.hibernate.type; import java.time.OffsetTime; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java b/hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java b/hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/type/PostgresUUIDType.java b/hibernate-core/src/main/java/org/hibernate/type/PostgresUUIDType.java index d67666d5ce..ce6acf5e58 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/PostgresUUIDType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/PostgresUUIDType.java @@ -57,8 +57,8 @@ public class PostgresUUIDType extends AbstractSingleColumnStandardBasicType extends LiteralType, AdjustableBasicType { /** * Retrieve the primitive counterpart to the wrapper type identified by - * {@link org.hibernate.type.Type#getReturnedClass()}. + * {@link Type#getReturnedClass()}. * * @return The primitive Java type. */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/SingleColumnType.java b/hibernate-core/src/main/java/org/hibernate/type/SingleColumnType.java index 78119299ee..e6d65972f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/SingleColumnType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/SingleColumnType.java @@ -35,8 +35,8 @@ public interface SingleColumnType extends Type { * * @return The extracted value. * - * @throws org.hibernate.HibernateException Generally some form of mismatch error. - * @throws java.sql.SQLException Indicates problem making the JDBC call(s). + * @throws HibernateException Generally some form of mismatch error. + * @throws SQLException Indicates problem making the JDBC call(s). */ T nullSafeGet(ResultSet rs, String name, SharedSessionContractImplementor session) throws HibernateException, SQLException; @@ -49,8 +49,8 @@ public interface SingleColumnType extends Type { * * @return The extracted value. * - * @throws org.hibernate.HibernateException Generally some form of mismatch error. - * @throws java.sql.SQLException Indicates problem making the JDBC call(s). + * @throws HibernateException Generally some form of mismatch error. + * @throws SQLException Indicates problem making the JDBC call(s). */ Object get(ResultSet rs, String name, SharedSessionContractImplementor session) throws HibernateException, SQLException; @@ -64,8 +64,8 @@ public interface SingleColumnType extends Type { * @param index The position or index at which to bind the param value. * @param session The session from which the request originates * - * @throws org.hibernate.HibernateException Generally some form of mismatch error. - * @throws java.sql.SQLException Indicates problem making the JDBC call(s). + * @throws HibernateException Generally some form of mismatch error. + * @throws SQLException Indicates problem making the JDBC call(s). */ void set(PreparedStatement st, T value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException; } diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java index 3f5a82a5c4..cd56f6fc6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java +++ b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java @@ -123,14 +123,14 @@ public final class StandardBasicTypes { public static final DoubleType DOUBLE = DoubleType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.math.BigInteger} to JDBC {@link java.sql.Types#NUMERIC NUMERIC}. + * The standard Hibernate type for mapping {@link BigInteger} to JDBC {@link java.sql.Types#NUMERIC NUMERIC}. * * @see BigIntegerType */ public static final BigIntegerType BIG_INTEGER = BigIntegerType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.math.BigDecimal} to JDBC {@link java.sql.Types#NUMERIC NUMERIC}. + * The standard Hibernate type for mapping {@link BigDecimal} to JDBC {@link java.sql.Types#NUMERIC NUMERIC}. * * @see BigDecimalType */ @@ -198,7 +198,7 @@ public final class StandardBasicTypes { public static final NTextType NTEXT = NTextType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.sql.Clob} to JDBC {@link java.sql.Types#CLOB CLOB}. + * The standard Hibernate type for mapping {@link Clob} to JDBC {@link java.sql.Types#CLOB CLOB}. * * @see ClobType * @see #MATERIALIZED_CLOB @@ -206,7 +206,7 @@ public final class StandardBasicTypes { public static final ClobType CLOB = ClobType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.sql.NClob} to JDBC {@link java.sql.Types#NCLOB NCLOB}. + * The standard Hibernate type for mapping {@link NClob} to JDBC {@link java.sql.Types#NCLOB NCLOB}. * * @see NClobType * @see #MATERIALIZED_NCLOB @@ -306,7 +306,7 @@ public final class StandardBasicTypes { public static final ZonedDateTimeType ZONED_DATE_TIME = ZonedDateTimeType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.time.Instant} to JDBC + * The standard Hibernate type for mapping {@link Instant} to JDBC * {@link java.sql.Types#TIME TIME}. * * @see TimeType @@ -314,7 +314,7 @@ public final class StandardBasicTypes { public static final InstantType INSTANT = InstantType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Date} ({@link java.sql.Time}) to JDBC + * The standard Hibernate type for mapping {@link Date} ({@link java.sql.Time}) to JDBC * {@link java.sql.Types#TIMESTAMP TIMESTAMP}. * * @see TimeType @@ -322,7 +322,7 @@ public final class StandardBasicTypes { public static final TimeType TIME = TimeType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Date} ({@link java.sql.Date}) to JDBC + * The standard Hibernate type for mapping {@link Date} ({@link java.sql.Date}) to JDBC * {@link java.sql.Types#DATE DATE}. * * @see TimeType @@ -330,7 +330,7 @@ public final class StandardBasicTypes { public static final DateType DATE = DateType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Date} ({@link java.sql.Timestamp}) to JDBC + * The standard Hibernate type for mapping {@link Date} ({@link java.sql.Timestamp}) to JDBC * {@link java.sql.Types#TIMESTAMP TIMESTAMP}. * * @see TimeType @@ -338,7 +338,7 @@ public final class StandardBasicTypes { public static final TimestampType TIMESTAMP = TimestampType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Calendar} to JDBC + * The standard Hibernate type for mapping {@link Calendar} to JDBC * {@link java.sql.Types#TIMESTAMP TIMESTAMP}. * * @see CalendarType @@ -346,7 +346,7 @@ public final class StandardBasicTypes { public static final CalendarType CALENDAR = CalendarType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Calendar} to JDBC + * The standard Hibernate type for mapping {@link Calendar} to JDBC * {@link java.sql.Types#DATE DATE}. * * @see CalendarDateType @@ -354,7 +354,7 @@ public final class StandardBasicTypes { public static final CalendarDateType CALENDAR_DATE = CalendarDateType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Calendar} to JDBC + * The standard Hibernate type for mapping {@link Calendar} to JDBC * {@link java.sql.Types#TIME TIME}. */ public static final CalendarTimeType CALENDAR_TIME = CalendarTimeType.INSTANCE; @@ -387,7 +387,7 @@ public final class StandardBasicTypes { public static final ImageType IMAGE = ImageType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.sql.Blob} to JDBC {@link java.sql.Types#BLOB BLOB}. + * The standard Hibernate type for mapping {@link Blob} to JDBC {@link java.sql.Types#BLOB BLOB}. * * @see BlobType * @see #MATERIALIZED_BLOB @@ -404,7 +404,7 @@ public final class StandardBasicTypes { public static final MaterializedBlobType MATERIALIZED_BLOB = MaterializedBlobType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.io.Serializable} to JDBC {@link java.sql.Types#VARBINARY VARBINARY}. + * The standard Hibernate type for mapping {@link Serializable} to JDBC {@link java.sql.Types#VARBINARY VARBINARY}. *

            * See especially the discussion wrt {@link ClassLoader} determination on {@link SerializableType} * @@ -427,28 +427,28 @@ public final class StandardBasicTypes { public static final ClassType CLASS = ClassType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Locale} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. + * The standard Hibernate type for mapping {@link Locale} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. * * @see LocaleType */ public static final LocaleType LOCALE = LocaleType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.Currency} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. + * The standard Hibernate type for mapping {@link Currency} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. * * @see CurrencyType */ public static final CurrencyType CURRENCY = CurrencyType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.time.ZoneOffset} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. + * The standard Hibernate type for mapping {@link ZoneOffset} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. * * @see ZoneOffsetType */ public static final ZoneOffsetType ZONE_OFFSET = ZoneOffsetType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.TimeZone} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. + * The standard Hibernate type for mapping {@link TimeZone} to JDBC {@link java.sql.Types#VARCHAR VARCHAR}. * * @see TimeZoneType */ @@ -466,14 +466,14 @@ public final class StandardBasicTypes { // UUID mappings /** - * The standard Hibernate type for mapping {@link java.util.UUID} to JDBC {@link java.sql.Types#BINARY BINARY}. + * The standard Hibernate type for mapping {@link UUID} to JDBC {@link java.sql.Types#BINARY BINARY}. * * @see UUIDBinaryType */ public static final UUIDBinaryType UUID_BINARY = UUIDBinaryType.INSTANCE; /** - * The standard Hibernate type for mapping {@link java.util.UUID} to JDBC {@link java.sql.Types#CHAR CHAR}. + * The standard Hibernate type for mapping {@link UUID} to JDBC {@link java.sql.Types#CHAR CHAR}. * * @see UUIDCharType */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/StringType.java b/hibernate-core/src/main/java/org/hibernate/type/StringType.java index 315081ed6e..850835901e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/StringType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/StringType.java @@ -17,7 +17,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#VARCHAR VARCHAR} and {@link String} + * A type that maps between {@link Types#VARCHAR VARCHAR} and {@link String} * * @author Gavin King * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/TimeType.java b/hibernate-core/src/main/java/org/hibernate/type/TimeType.java index 5f713882ef..135df844e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/TimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/TimeType.java @@ -8,7 +8,7 @@ package org.hibernate.type; import java.sql.Time; import java.util.Date; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; @@ -39,7 +39,7 @@ public class TimeType public String[] getRegistrationKeys() { return new String[] { getName(), - java.sql.Time.class.getName() + Time.class.getName() }; } diff --git a/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java b/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java index 0a6a284b46..337f20b382 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java @@ -9,7 +9,7 @@ package org.hibernate.type; import java.sql.Timestamp; import java.util.Comparator; import java.util.Date; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.QueryException; @@ -20,7 +20,7 @@ import org.hibernate.type.descriptor.jdbc.TimestampTypeDescriptor; import org.hibernate.type.spi.TypeConfiguration; /** - * A type that maps between {@link java.sql.Types#TIMESTAMP TIMESTAMP} and {@link java.sql.Timestamp} + * A type that maps between {@link java.sql.Types#TIMESTAMP TIMESTAMP} and {@link Timestamp} * * @author Gavin King * @author Steve Ebersole @@ -42,7 +42,7 @@ public class TimestampType @Override public String[] getRegistrationKeys() { - return new String[] { getName(), Timestamp.class.getName(), java.util.Date.class.getName() }; + return new String[] { getName(), Timestamp.class.getName(), Date.class.getName() }; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java b/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java index 3baa57b01d..dbe9c0f11f 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/TrueFalseConverter.java @@ -6,8 +6,8 @@ */ package org.hibernate.type; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * Handles conversion to/from Boolean as `T` or `F` diff --git a/hibernate-core/src/main/java/org/hibernate/type/UUIDCharType.java b/hibernate-core/src/main/java/org/hibernate/type/UUIDCharType.java index d0b458b0fb..5316524d6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/UUIDCharType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/UUIDCharType.java @@ -13,7 +13,7 @@ import org.hibernate.type.descriptor.java.UUIDTypeDescriptor; import org.hibernate.type.descriptor.jdbc.VarcharTypeDescriptor; /** - * A type mapping {@link java.sql.Types#CHAR} (or {@link java.sql.Types#VARCHAR}) and {@link java.util.UUID} + * A type mapping {@link java.sql.Types#CHAR} (or {@link java.sql.Types#VARCHAR}) and {@link UUID} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/WrapperBinaryType.java b/hibernate-core/src/main/java/org/hibernate/type/WrapperBinaryType.java index e542e46ff7..6909459787 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/WrapperBinaryType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/WrapperBinaryType.java @@ -15,7 +15,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * A type mapping {@link java.sql.Types#VARBINARY VARBINARY} and {@link Byte Byte[]} + * A type mapping {@link Types#VARBINARY VARBINARY} and {@link Byte Byte[]} * * @author Emmanuel Bernard * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java b/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java index d06b737b1a..d7f0d3a627 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/YesNoConverter.java @@ -6,8 +6,8 @@ */ package org.hibernate.type; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * Handles conversion to/from Boolean as `Y` or `N` diff --git a/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java index 6c8b4f2ce9..3d39dd6921 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java @@ -8,7 +8,7 @@ package org.hibernate.type; import java.time.ZonedDateTime; import java.util.Comparator; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.QueryException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterJdbcTypeDescriptorAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterJdbcTypeDescriptorAdapter.java index 556343e142..c5a6d00276 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterJdbcTypeDescriptorAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterJdbcTypeDescriptorAdapter.java @@ -10,8 +10,8 @@ import java.sql.CallableStatement; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import javax.persistence.AttributeConverter; -import javax.persistence.PersistenceException; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.PersistenceException; import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; import org.hibernate.type.descriptor.ValueBinder; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterTypeAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterTypeAdapter.java index 28c6d49fc3..5103a4380a 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterTypeAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterTypeAdapter.java @@ -10,7 +10,7 @@ import java.sql.CallableStatement; import java.sql.PreparedStatement; import java.sql.SQLException; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/ConvertedValueExtractor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/ConvertedValueExtractor.java index 9cc7c3205b..a1d06a1b1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/ConvertedValueExtractor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/ConvertedValueExtractor.java @@ -9,8 +9,8 @@ package org.hibernate.type.descriptor.converter; import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; -import javax.persistence.AttributeConverter; -import javax.persistence.PersistenceException; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.PersistenceException; import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; import org.hibernate.type.descriptor.ValueExtractor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java index 3b938047f6..18fff52c02 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java @@ -6,7 +6,7 @@ */ /** - * Support for handling JPA {@link javax.persistence.AttributeConverter} instances as part of the + * Support for handling JPA {@link jakarta.persistence.AttributeConverter} instances as part of the * Hibernate {@link org.hibernate.type.Type} system. */ package org.hibernate.type.descriptor.converter; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassTypeDescriptor.java index 98a2d5415c..6ff95983ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassTypeDescriptor.java @@ -18,7 +18,7 @@ import org.hibernate.internal.util.compare.ComparableComparator; * * @apiNote This abstract descriptor implements BasicJavaDescriptor * because we currently only categorize "basic" JavaTypeDescriptors, - * as in the {@link javax.persistence.metamodel.Type.PersistenceType#BASIC} + * as in the {@link jakarta.persistence.metamodel.Type.PersistenceType#BASIC} * sense * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalTypeDescriptor.java index f458abeb7e..c2f0ba7775 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalTypeDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.type.descriptor.java; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.type.spi.TypeConfiguration; @@ -52,19 +52,19 @@ public abstract class AbstractTemporalTypeDescriptor extends AbstractClassTyp protected TemporalJavaTypeDescriptor forTimestampPrecision(TypeConfiguration typeConfiguration) { throw new UnsupportedOperationException( - toString() + " as `javax.persistence.TemporalType.TIMESTAMP` not supported" + toString() + " as `jakarta.persistence.TemporalType.TIMESTAMP` not supported" ); } protected TemporalJavaTypeDescriptor forDatePrecision(TypeConfiguration typeConfiguration) { throw new UnsupportedOperationException( - toString() + " as `javax.persistence.TemporalType.DATE` not supported" + toString() + " as `jakarta.persistence.TemporalType.DATE` not supported" ); } protected TemporalJavaTypeDescriptor forTimePrecision(TypeConfiguration typeConfiguration) { throw new UnsupportedOperationException( - toString() + " as `javax.persistence.TemporalType.TIME` not supported" + toString() + " as `jakarta.persistence.TemporalType.TIME` not supported" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTypeDescriptor.java index 9f97f1319f..cae53460d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTypeDescriptor.java @@ -19,7 +19,7 @@ import org.hibernate.internal.util.compare.ComparableComparator; * * @apiNote This abstract descriptor implements BasicJavaDescriptor * because we currently only categorize "basic" JavaTypeDescriptors, - * as in the {@link javax.persistence.metamodel.Type.PersistenceType#BASIC} + * as in the {@link jakarta.persistence.metamodel.Type.PersistenceType#BASIC} * sense * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateTypeDescriptor.java index f006af5824..a0f84f9be3 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateTypeDescriptor.java @@ -11,7 +11,7 @@ import java.util.Comparator; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.internal.util.compare.CalendarComparator; @@ -21,7 +21,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptorIndicators; import org.hibernate.type.spi.TypeConfiguration; /** - * Descriptor for {@link java.util.Calendar} handling, but just for the date (month, day, year) portion. + * Descriptor for {@link Calendar} handling, but just for the date (month, day, year) portion. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java index 203d71421d..53906cab6a 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java @@ -11,7 +11,7 @@ import java.util.Comparator; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.internal.util.compare.CalendarComparator; @@ -22,7 +22,7 @@ import org.hibernate.type.descriptor.jdbc.TimeTypeDescriptor; import org.hibernate.type.spi.TypeConfiguration; /** - * Descriptor for {@link java.util.Calendar} handling, but just for the time portion. + * Descriptor for {@link Calendar} handling, but just for the time portion. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java index 947e5f50ef..ebd0e3078e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java @@ -10,7 +10,7 @@ import java.util.Calendar; import java.util.Comparator; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.internal.util.compare.CalendarComparator; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java index f99e82949d..0cb8bec336 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java @@ -276,7 +276,7 @@ public final class DataHelper { * * @param value The Clob value * - * @return The appropriate buffer size ({@link java.sql.Clob#length()} by default. + * @return The appropriate buffer size ({@link Clob#length()} by default. * * @throws SQLException */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateTypeDescriptor.java index 63928f44b0..0ddc216286 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateTypeDescriptor.java @@ -12,7 +12,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; @@ -103,7 +103,7 @@ public class DateTypeDescriptor extends AbstractTemporalTypeDescriptor { @Override public int extractHashCode(Date value) { - Calendar calendar = java.util.Calendar.getInstance(); + Calendar calendar = Calendar.getInstance(); calendar.setTime( value ); return CalendarTypeDescriptor.INSTANCE.extractHashCode( calendar ); } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaTypeDescriptor.java index db6bd9113a..b2d36e043b 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaTypeDescriptor.java @@ -7,7 +7,7 @@ package org.hibernate.type.descriptor.java; import java.sql.Types; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaDescriptor.java index 964a43d58b..e34745eadd 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaDescriptor.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; @@ -96,7 +96,7 @@ public class InstantJavaDescriptor extends AbstractTemporalTypeDescriptor public static final DateTimeFormatter LITERAL_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE; /** - * Alias for {@link java.time.format.DateTimeFormatter#ISO_LOCAL_DATE}. + * Alias for {@link DateTimeFormatter#ISO_LOCAL_DATE}. * * Intended for use with logging * diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java index 6569c78f55..5a4ce079c0 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeTypeDescriptor.java @@ -14,7 +14,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; @@ -38,7 +38,7 @@ public class JdbcTimeTypeDescriptor extends AbstractTemporalTypeDescriptor public static final DateTimeFormatter LITERAL_FORMATTER = DateTimeFormatter.ISO_LOCAL_TIME; /** - * Alias for {@link java.time.format.DateTimeFormatter#ISO_LOCAL_TIME}. + * Alias for {@link DateTimeFormatter#ISO_LOCAL_TIME}. * * Intended for use with logging * @@ -84,7 +84,7 @@ public class JdbcTimeTypeDescriptor extends AbstractTemporalTypeDescriptor } @Override - public java.util.Date fromString(String string) { + public Date fromString(String string) { try { return new Time( new SimpleDateFormat( TIME_FORMAT ).parse( string ).getTime() ); } @@ -153,7 +153,7 @@ public class JdbcTimeTypeDescriptor extends AbstractTemporalTypeDescriptor : new java.sql.Timestamp( value.getTime() ); return (X) rtn; } - if ( java.util.Date.class.isAssignableFrom( type ) ) { + if ( Date.class.isAssignableFrom( type ) ) { return (X) value; } if ( Calendar.class.isAssignableFrom( type ) ) { diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java index 40150a0c60..bf0d56d2f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java @@ -17,7 +17,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaDescriptor.java index b80386dc40..35e58d768f 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaDescriptor.java @@ -17,7 +17,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.jdbc.DateTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaDescriptor.java index d5391d544c..0c1489132b 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaDescriptor.java @@ -15,7 +15,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; @@ -77,7 +77,7 @@ public class LocalDateTimeJavaDescriptor extends AbstractTemporalTypeDescriptor< return (X) value; } - if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) { + if ( Timestamp.class.isAssignableFrom( type ) ) { /* * Workaround for HHH-13266 (JDK-8061577). * We used to do Timestamp.from( value.atZone( ZoneId.systemDefault() ).toInstant() ), @@ -98,9 +98,9 @@ public class LocalDateTimeJavaDescriptor extends AbstractTemporalTypeDescriptor< return (X) java.sql.Time.from( instant ); } - if ( java.util.Date.class.isAssignableFrom( type ) ) { + if ( Date.class.isAssignableFrom( type ) ) { Instant instant = value.atZone( ZoneId.systemDefault() ).toInstant(); - return (X) java.util.Date.from( instant ); + return (X) Date.from( instant ); } if ( Calendar.class.isAssignableFrom( type ) ) { diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaDescriptor.java index 885f8db8a2..8be184811e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaDescriptor.java @@ -19,7 +19,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobTypeDescriptor.java index b442fbec9d..9def020557 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobTypeDescriptor.java @@ -22,9 +22,9 @@ import org.hibernate.engine.jdbc.internal.CharacterStreamImpl; import org.hibernate.type.descriptor.WrapperOptions; /** - * Descriptor for {@link java.sql.NClob} handling. + * Descriptor for {@link NClob} handling. *

            - * Note, {@link java.sql.NClob nclobs} really are mutable (their internal state can in fact be mutated). We simply + * Note, {@link NClob nclobs} really are mutable (their internal state can in fact be mutated). We simply * treat them as immutable because we cannot properly check them for changes nor deep copy them. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaDescriptor.java index 30f4af91fb..b86370529c 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaDescriptor.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; @@ -64,7 +64,7 @@ public class OffsetDateTimeJavaDescriptor extends AbstractTemporalTypeDescriptor return DateTypeDescriptor.INSTANCE; } default: { - throw new IllegalArgumentException( "Unexpected javax.persistence.TemporalType : " + temporalPrecision ); + throw new IllegalArgumentException( "Unexpected jakarta.persistence.TemporalType : " + temporalPrecision ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaDescriptor.java index b3aa6f7bed..8724850aa7 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaDescriptor.java @@ -19,7 +19,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; @@ -81,8 +81,8 @@ public class OffsetTimeJavaDescriptor extends AbstractTemporalTypeDescriptor extends BasicJavaDescriptor { /** * The precision represented by this type */ - javax.persistence.TemporalType getPrecision(); + jakarta.persistence.TemporalType getPrecision(); /** * Resolve the appropriate TemporalJavaTypeDescriptor for the given precision * "relative" to this type. */ TemporalJavaTypeDescriptor resolveTypeForPrecision( - javax.persistence.TemporalType precision, + jakarta.persistence.TemporalType precision, TypeConfiguration typeConfiguration); } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaDescriptor.java index 9cf7d685f1..f8198e283e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaDescriptor.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; @@ -63,7 +63,7 @@ public class ZonedDateTimeJavaDescriptor extends AbstractTemporalTypeDescriptor< return DateTypeDescriptor.INSTANCE; } default: { - throw new IllegalArgumentException( "Unexpected javax.persistence.TemporalType : " + temporalPrecision ); + throw new IllegalArgumentException( "Unexpected jakarta.persistence.TemporalType : " + temporalPrecision ); } } } @@ -158,7 +158,7 @@ public class ZonedDateTimeJavaDescriptor extends AbstractTemporalTypeDescriptor< return offsetDateTime.toZonedDateTime(); } - if ( java.sql.Timestamp.class.isInstance( value ) ) { + if ( Timestamp.class.isInstance( value ) ) { final Timestamp ts = (Timestamp) value; /* * This works around two bugs: @@ -178,8 +178,8 @@ public class ZonedDateTimeJavaDescriptor extends AbstractTemporalTypeDescriptor< } } - if ( java.util.Date.class.isInstance( value ) ) { - final java.util.Date date = (java.util.Date) value; + if ( Date.class.isInstance( value ) ) { + final Date date = (Date) value; return ZonedDateTime.ofInstant( date.toInstant(), ZoneId.systemDefault() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java index b5b9952825..a6853a152d 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java @@ -18,7 +18,7 @@ import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; /** - * Convenience base implementation of {@link org.hibernate.type.descriptor.ValueExtractor} + * Convenience base implementation of {@link ValueExtractor} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryTypeDescriptor.java index 5ae090b7e7..48078f7e23 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryTypeDescriptor.java @@ -8,7 +8,7 @@ package org.hibernate.type.descriptor.jdbc; import java.sql.Types; /** - * Descriptor for {@link java.sql.Types#BINARY BINARY} handling. + * Descriptor for {@link Types#BINARY BINARY} handling. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanTypeDescriptor.java index 2ce0e34c51..35df2025a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanTypeDescriptor.java @@ -21,7 +21,7 @@ import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterBoolean; import org.hibernate.type.spi.TypeConfiguration; /** - * Descriptor for {@link java.sql.Types#BOOLEAN BOOLEAN} handling. + * Descriptor for {@link Types#BOOLEAN BOOLEAN} handling. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateTypeDescriptor.java index caae8a457e..02fabc7497 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateTypeDescriptor.java @@ -14,7 +14,7 @@ import java.sql.SQLException; import java.sql.Types; import java.util.Calendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptor.java index f3b9460bda..cb388913e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptor.java @@ -33,7 +33,7 @@ public interface JdbcTypeDescriptor extends Serializable { } /** - * Return the {@linkplain java.sql.Types JDBC type code} used when interacting + * Return the {@linkplain Types JDBC type code} used when interacting * with JDBC APIs. * * For example, it's used when calling {@link java.sql.PreparedStatement#setNull(int, int)}. diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptorIndicators.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptorIndicators.java index 629722aa33..4ddb67ba48 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptorIndicators.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptorIndicators.java @@ -7,8 +7,8 @@ package org.hibernate.type.descriptor.jdbc; import java.sql.Types; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeTypeDescriptor.java index 32b950f640..e2045208a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeTypeDescriptor.java @@ -14,7 +14,7 @@ import java.sql.Time; import java.sql.Types; import java.util.Calendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampTypeDescriptor.java index 45fa1740c8..eea5899d0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampTypeDescriptor.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; import java.sql.Types; import java.util.Calendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneDescriptor.java index 19e7322e43..bcfa20990f 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneDescriptor.java @@ -14,7 +14,7 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor; import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterTemporal; import org.hibernate.type.spi.TypeConfiguration; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import java.sql.CallableStatement; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java index 0d2258cd9f..67b3ad6c76 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcLiteralFormatterTemporal.java @@ -8,7 +8,7 @@ package org.hibernate.type.descriptor.jdbc.internal; import java.time.temporal.TemporalAccessor; import java.util.TimeZone; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/type/package.html b/hibernate-core/src/main/java/org/hibernate/type/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java index dea7a850b9..4b931156ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java +++ b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java @@ -66,7 +66,7 @@ import org.hibernate.type.internal.StandardBasicTypeImpl; import java.sql.Time; import java.sql.Timestamp; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.internal.CoreLogging.messageLogger; import static org.hibernate.query.BinaryArithmeticOperator.DIVIDE; diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/EnhancedUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/EnhancedUserType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java index e117e6dd6c..da504e237a 100644 --- a/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserCollectionType.java @@ -18,7 +18,7 @@ import org.hibernate.persister.collection.CollectionPersister; * A custom type for mapping user-written classes that implement PersistentCollection * * @author Gavin King - * @see org.hibernate.collection.spi.PersistentCollection + * @see PersistentCollection */ public interface UserCollectionType { diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserVersionType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserVersionType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/package.html b/hibernate-core/src/main/java/org/hibernate/usertype/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider b/hibernate-core/src/main/resources/META-INF/services/jakarta.persistence.spi.PersistenceProvider similarity index 100% rename from hibernate-core/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider rename to hibernate-core/src/main/resources/META-INF/services/jakarta.persistence.spi.PersistenceProvider diff --git a/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd b/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd index fea059f7f0..7b7fc94cc7 100644 --- a/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd +++ b/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd @@ -8,12 +8,12 @@ --> diff --git a/hibernate-core/src/main/xjb/hbm-configuration-bindings.xjb b/hibernate-core/src/main/xjb/hbm-configuration-bindings.xjb index a4aa89d212..c0a7021619 100644 --- a/hibernate-core/src/main/xjb/hbm-configuration-bindings.xjb +++ b/hibernate-core/src/main/xjb/hbm-configuration-bindings.xjb @@ -1,8 +1,8 @@ - + version="3.0"> diff --git a/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb b/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb index e9a2cc4c33..d723567462 100644 --- a/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb +++ b/hibernate-core/src/main/xjb/hbm-mapping-bindings.xjb @@ -1,11 +1,11 @@ - + version="3.0"> diff --git a/hibernate-core/src/main/xjb/mapping-bindings.xjb b/hibernate-core/src/main/xjb/mapping-bindings.xjb index 3ca2d1a54c..3cfd6b503c 100644 --- a/hibernate-core/src/main/xjb/mapping-bindings.xjb +++ b/hibernate-core/src/main/xjb/mapping-bindings.xjb @@ -1,10 +1,10 @@ - + version="3.0"> @@ -18,61 +18,61 @@ - - - - - - - - - - diff --git a/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java b/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java index 819356a0a1..05f831a267 100644 --- a/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java +++ b/hibernate-core/src/test/java/AnnotationMappedNoPackageEntity.java @@ -1,35 +1,35 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; - -@Entity(name = "annotationnopackage") -public class AnnotationMappedNoPackageEntity { - @Id - private Integer id; - - @Basic - private String name; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ + +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + +@Entity(name = "annotationnopackage") +public class AnnotationMappedNoPackageEntity { + @Id + private Integer id; + + @Basic + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/hibernate-core/src/test/java/from/In.java b/hibernate-core/src/test/java/from/In.java index fc6c533b9d..b3bf830ec4 100644 --- a/hibernate-core/src/test/java/from/In.java +++ b/hibernate-core/src/test/java/from/In.java @@ -6,10 +6,10 @@ */ package from; -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 Andrea Boriero diff --git a/hibernate-core/src/test/java/in/from/Any.java b/hibernate-core/src/test/java/in/from/Any.java index de22598242..12863e473a 100644 --- a/hibernate-core/src/test/java/in/from/Any.java +++ b/hibernate-core/src/test/java/in/from/Any.java @@ -6,10 +6,10 @@ */ package in.from; -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 Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java b/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java index a91204fdaf..3a192cd4fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/IrrelevantEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java index e402cf1e00..17222c8e6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEntity.java @@ -8,11 +8,11 @@ package org.hibernate.bytecode.internal.bytebuddy; import java.util.regex.Pattern; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity(name = "SimpleEntity") public class SimpleEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java index 8d49430855..1f9762451a 100644 --- a/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.engine.jdbc.env.internal; -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; import org.hibernate.annotations.GenericGenerator; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java index e66ed4439a..660af31fbe 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java @@ -1,8 +1,8 @@ package org.hibernate.event; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java index 547c5a55c2..5c01d13ee8 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java @@ -6,21 +6,21 @@ import java.util.Collection; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import org.hibernate.FlushMode; import org.hibernate.Transaction; @@ -323,10 +323,10 @@ public class NewlyInstantiatdCollectionSkipDeleteOrphanTest { } @OneToMany(mappedBy = "parent", cascade = { - javax.persistence.CascadeType.DETACH, - javax.persistence.CascadeType.MERGE, - javax.persistence.CascadeType.REFRESH, - javax.persistence.CascadeType.REMOVE + jakarta.persistence.CascadeType.DETACH, + jakarta.persistence.CascadeType.MERGE, + jakarta.persistence.CascadeType.REFRESH, + jakarta.persistence.CascadeType.REMOVE }, orphanRemoval = true) @Cascade({ org.hibernate.annotations.CascadeType.DELETE, @@ -434,10 +434,10 @@ public class NewlyInstantiatdCollectionSkipDeleteOrphanTest { } @OneToMany(mappedBy = "parent", cascade = { - javax.persistence.CascadeType.DETACH, - javax.persistence.CascadeType.MERGE, - javax.persistence.CascadeType.REFRESH, - javax.persistence.CascadeType.REMOVE + jakarta.persistence.CascadeType.DETACH, + jakarta.persistence.CascadeType.MERGE, + jakarta.persistence.CascadeType.REFRESH, + jakarta.persistence.CascadeType.REMOVE }, orphanRemoval = true) @Cascade({ org.hibernate.annotations.CascadeType.DELETE, diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/spi/NativeQueryTupleTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/spi/NativeQueryTupleTransformerTest.java index 0def3e165a..535dd6135c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/spi/NativeQueryTupleTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/spi/NativeQueryTupleTransformerTest.java @@ -3,7 +3,7 @@ package org.hibernate.jpa.spi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java index 03d78b3adc..f4d3bc8b42 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java @@ -15,10 +15,10 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; import org.hibernate.bytecode.enhance.spi.EnhancementContext; @@ -188,10 +188,10 @@ public abstract class BaseEntityManagerFunctionalTestCase extends BaseUnitTestCa addMappings( settings ); if ( createSchema() ) { - settings.put( org.hibernate.cfg.AvailableSettings.HBM2DDL_AUTO, "create-drop" ); + settings.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" ); } - settings.put( org.hibernate.cfg.AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); - settings.put( org.hibernate.cfg.AvailableSettings.DIALECT, getDialect().getClass().getName() ); + settings.put( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); + settings.put( AvailableSettings.DIALECT, getDialect().getClass().getName() ); return settings; } diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Cat.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/Cat.java index b0df359314..60900081d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Cat.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/Cat.java @@ -15,19 +15,19 @@ import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostUpdate; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Distributor.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/Distributor.java index 16d26b9434..c7e3d92067 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Distributor.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/Distributor.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.jpa.test; import java.io.Serializable; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java index 18530fa44a..1a5e15c586 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java @@ -10,7 +10,7 @@ package org.hibernate.jpa.test; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.jpa.AvailableSettings; @@ -80,4 +80,4 @@ public class EntityManagerFactoryClosedTest extends BaseEntityManagerFunctionalT TestingJtaPlatformImpl.INSTANCE.getTransactionManager().commit(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java old mode 100755 new mode 100644 index 6bc16d9565..682b887731 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java @@ -17,12 +17,12 @@ import java.io.ObjectOutputStream; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; -import javax.persistence.FlushModeType; -import javax.persistence.PersistenceException; -import javax.persistence.Query; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Query; import org.hibernate.FlushMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java old mode 100755 new mode 100644 index 5768d89d39..137eb051b4 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java @@ -10,19 +10,19 @@ package org.hibernate.jpa.test; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.QueryHint; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SqlResultSetMapping; import org.hibernate.annotations.QueryHints; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Kitten.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/Kitten.java index 2745f96b6c..1a750aa89d 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Kitten.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/Kitten.java @@ -7,9 +7,9 @@ // $Id$ package org.hibernate.jpa.test; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java index f3f4520fef..10691276ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.jpa.test; import java.util.Date; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/NamedQueryTransactionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/NamedQueryTransactionFailureTest.java index 5f7d8ea31f..b4a9400f40 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/NamedQueryTransactionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/NamedQueryTransactionFailureTest.java @@ -10,7 +10,7 @@ package org.hibernate.jpa.test; import java.util.Map; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.hibernate.cfg.Environment; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java index e9ddd7d4c8..2bf3957258 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.test; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.util.Map; import org.hibernate.jpa.boot.spi.Bootstrap; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Wallet.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/Wallet.java index 2127a0263b..c27a5f5ab9 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Wallet.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/Wallet.java @@ -9,8 +9,8 @@ package org.hibernate.jpa.test; import java.io.Serializable; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/joinable/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/joinable/ManyToOneJoinTableTest.java index fe315a41bf..ee7db22f2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/joinable/ManyToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/joinable/ManyToOneJoinTableTest.java @@ -8,16 +8,16 @@ package org.hibernate.jpa.test.joinable; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SecondaryTable; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java index 7c054c02d8..6f5a015da0 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java @@ -13,26 +13,26 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.persistence.AssociationOverride; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.annotations.Type; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/Phone.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/Phone.java index 37e6d0bacb..7f99a1f1bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/Phone.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.jpa.test.mapping; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java index 6f487f2b82..1d8da6d00f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java @@ -11,15 +11,15 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Address.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Address.java index 66f6ea90f8..13a2715a8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Address.java @@ -7,13 +7,13 @@ package org.hibernate.jpa.test.metamodel; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; /** * TODO : javadoc @@ -106,4 +106,4 @@ public class Address implements java.io.Serializable { public void setPhones(List phones) { this.phones = phones; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Alias.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Alias.java index 64ba94a1b4..c3ef2543e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Alias.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Alias.java @@ -6,15 +6,15 @@ */ package org.hibernate.jpa.test.metamodel; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Article.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Article.java index 163531eabe..f6db94d16f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Article.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Article.java @@ -8,9 +8,9 @@ package org.hibernate.jpa.test.metamodel; import java.util.Locale; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/BaseEmbeddedEntity.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/BaseEmbeddedEntity.java index 0180a2cde1..43cb04f534 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/BaseEmbeddedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/BaseEmbeddedEntity.java @@ -8,8 +8,8 @@ package org.hibernate.jpa.test.metamodel; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.MappedSuperclass; /** * @author Christian Beikov diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Country.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Country.java index 252e2c579a..4db3ca627f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Country.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/CreditCard.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/CreditCard.java index 2b3ad035e2..9001125291 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/CreditCard.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/CreditCard.java @@ -5,14 +5,14 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Customer.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Customer.java index 666ed6cc44..dd90fce4c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Customer.java @@ -6,16 +6,16 @@ */ package org.hibernate.jpa.test.metamodel; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * TODO : javadoc @@ -167,4 +167,4 @@ public class Customer implements java.io.Serializable { public void setAliasesNoop(Collection v) { this.aliasesNoop = v; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java index efd7cafe30..eeb6b5ff83 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.EntityManager; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.EntityManager; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.SingularAttribute; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity1.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity1.java index 09d6be664b..0c5d3d5f69 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity1.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity1.java @@ -23,11 +23,11 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "entity1") diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity2.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity2.java index 362ccc11eb..d9f014f492 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity2.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity2.java @@ -23,11 +23,11 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "entity2") diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity3.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity3.java index af804816b6..0581c68ec1 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity3.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Entity3.java @@ -23,9 +23,9 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "entity3") diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Info.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Info.java index ac098004ae..48eac7028a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Info.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Info.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/LineItem.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/LineItem.java index 5ec013e660..aaafbbb579 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/LineItem.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/LineItem.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * TODO : javadoc @@ -78,4 +78,4 @@ public class LineItem implements java.io.Serializable { public void setProduct(Product v) { product = v; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntity.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntity.java index 485697499f..bf1ff647c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntity.java @@ -8,15 +8,15 @@ package org.hibernate.jpa.test.metamodel; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; @Entity @Table( name = "MAP_ENTITY" ) diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntityLocal.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntityLocal.java index 4e7c5e489d..4f51dd5fbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntityLocal.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/MapEntityLocal.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class MapEntityLocal { diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Order.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Order.java index 211776f081..d838f23c38 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Order.java @@ -6,15 +6,15 @@ */ package org.hibernate.jpa.test.metamodel; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Phone.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Phone.java index cb324f9e71..27d0068222 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Phone.java @@ -6,13 +6,13 @@ */ package org.hibernate.jpa.test.metamodel; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * TODO : javadoc @@ -92,4 +92,4 @@ public class Phone implements java.io.Serializable { public void setTypes(Set types) { this.types = types; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Product.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Product.java index 534ae43ff7..ff3f42c3ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Product.java @@ -7,20 +7,20 @@ package org.hibernate.jpa.test.metamodel; import java.math.BigDecimal; import java.math.BigInteger; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ShelfLife.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ShelfLife.java index 6c27be5b13..d35808b4c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ShelfLife.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ShelfLife.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.test.metamodel; import java.sql.Date; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; @Embeddable public class ShelfLife implements java.io.Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Spouse.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Spouse.java index 75dfe37565..f467793f00 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Spouse.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Spouse.java @@ -5,13 +5,13 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Thing.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Thing.java index fe6e25af4a..05afbea52d 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Thing.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Thing.java @@ -6,10 +6,10 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author James Gilbertson diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ThingWithQuantity.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ThingWithQuantity.java index 545d8d4a37..44690d01e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ThingWithQuantity.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/ThingWithQuantity.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author James Gilbertson diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Translation.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Translation.java index 1ab70f659b..f1486b2bfd 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Translation.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/Translation.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/VersionedEntity.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/VersionedEntity.java index f95dfbe9af..c507a1e0b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/VersionedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/VersionedEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpa.test.metamodel; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java index a3f3156217..8cb4a50b65 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.cfgxmlpar; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java index e7022cae49..9a34eb0917 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java index 237faefd8f..a083947e72 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar; -import javax.persistence.PrePersist; +import jakarta.persistence.PrePersist; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java index 882e5e741f..2490d4336d 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java index 32c72b359b..4dc02590f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar; -import javax.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeDefaultListeners; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java index c4d5798ddb..59ff56d240 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/ApplicationServer1.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/ApplicationServer1.java index 20633b11d3..3a3ca8f177 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/ApplicationServer1.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/ApplicationServer1.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar_1_0; -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 Emmanuel Bernard @@ -45,4 +45,4 @@ public class ApplicationServer1 { public void setVersion(Version1 version) { this.version = version; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/IncrementListener1.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/IncrementListener1.java index 762cc6d276..8c4cb4cbbc 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/IncrementListener1.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/IncrementListener1.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar_1_0; -import javax.persistence.PrePersist; +import jakarta.persistence.PrePersist; /** * @author Emmanuel Bernard @@ -27,4 +27,4 @@ public class IncrementListener1 { public void increment(Object entity) { increment++; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Money1.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Money1.java index 953c8570f0..26933b2dc0 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Money1.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Money1.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar_1_0; -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 Emmanuel Bernard @@ -27,4 +27,4 @@ public class Money1 { this.id = id; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.java index d47874fb6e..575c5453d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar_1_0; -import javax.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeDefaultListeners; /** * @author Emmanuel Bernard @@ -32,4 +32,4 @@ public class Mouse1 { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java index 0626635dda..fac416624e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.defaultpar_1_0; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard @@ -46,4 +46,4 @@ public class Version1 { public String toString() { return new StringBuilder( major ).append( DOT ).append( minor ).append( DOT ).append( micro ).toString(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java index 9b31886cbc..00e1e2569b 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.excludehbmpar; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java index d141ba0d38..e2059dbdc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.explicitpar; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java index 0aff1d58da..6a6be51b7b 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.explodedpar; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java index 5a1db690c0..f286dfb3cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.jpa.test.pack.externaljar; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java index 30fb82790a..03b8fdebad 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.jpa.test.pack.overridenpar; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java index ea2820fc3d..11556ad45a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.jpa.test.pack.spacepar; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java index 574e170b4f..f42e1d399a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.war; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java index 05970847e6..173736b50e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.war; -import javax.persistence.PrePersist; +import jakarta.persistence.PrePersist; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Money.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Money.java index 0352e3029d..8bfb9d7ca5 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Money.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Money.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.jpa.test.pack.war; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java index 791ca0b224..b337c27bcd 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.war; -import javax.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeDefaultListeners; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java index 96ec605873..cf52d2d1ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.jpa.test.pack.war; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DataPoint.java index e2877f2e7f..c9ceb1ec5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DataPoint.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DataPoint.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpa.test.persistenceunit; -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 Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java index af22ffdd77..3c2519b893 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java @@ -8,10 +8,10 @@ package org.hibernate.jpa.test.persistenceunit; import java.util.Collections; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SharedCacheMode; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/UnlistedDataPoint.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/UnlistedDataPoint.java index 339001a07c..56529d8feb 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/UnlistedDataPoint.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/UnlistedDataPoint.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpa.test.persistenceunit; -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 Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/CachedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/CachedQueryTest.java index ceeeed97d4..fe700a48e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/CachedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/CachedQueryTest.java @@ -8,9 +8,9 @@ package org.hibernate.jpa.test.query; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.SharedCacheMode; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.TypedQuery; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ConstructorResultNativeQueryTest.java index 0621420cd3..63d1766f91 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ConstructorResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ConstructorResultNativeQueryTest.java @@ -12,19 +12,19 @@ import static org.junit.Assert.assertEquals; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Contractor.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Contractor.java index f00a05ac6f..a2e85f1731 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Contractor.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Contractor.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.test.query; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/DateTimeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/DateTimeParameterTest.java index 3e8e980b63..12268ce451 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/DateTimeParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/DateTimeParameterTest.java @@ -9,13 +9,13 @@ package org.hibernate.jpa.test.query; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.Query; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.Query; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Employee.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Employee.java index abb22d12b1..1fdf6ec138 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Employee.java @@ -7,12 +7,12 @@ package org.hibernate.jpa.test.query; import java.io.Serializable; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java index 1bc8fac9d4..e973af6806 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java @@ -8,13 +8,13 @@ package org.hibernate.jpa.test.query; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Query; -import javax.persistence.Table; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Query; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; import org.hibernate.annotations.NamedNativeQuery; import org.hibernate.annotations.NamedQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryTest.java index 3d36c4fd5d..620f4704d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryTest.java @@ -7,14 +7,14 @@ package org.hibernate.jpa.test.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Query; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Query; import org.hibernate.Session; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java index 4b7fe82351..1ed961943c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java @@ -7,15 +7,15 @@ package org.hibernate.jpa.test.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Query; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Query; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.hibernate.Session; import org.hibernate.dialect.CockroachDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java index b87246d9ff..ac0f635f66 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java @@ -23,11 +23,11 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -371,8 +371,8 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @TypeDef(name = FloatAsRealType.NAME, typeClass = FloatAsRealType.class) public static class RealEntity extends TestedEntity { /** - * The custom type sets the SQL type to {@link java.sql.Types#REAL} - * instead of the default {@link java.sql.Types#FLOAT}. + * The custom type sets the SQL type to {@link Types#REAL} + * instead of the default {@link Types#FLOAT}. */ @Type(type = FloatAsRealType.NAME) public Float getTestedProperty() { @@ -392,8 +392,8 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @TypeDef(name = BigDecimalAsDecimalType.NAME, typeClass = BigDecimalAsDecimalType.class) public static class DecimalEntity extends TestedEntity { /** - * The custom type sets the SQL type to {@link java.sql.Types#DECIMAL} - * instead of the default {@link java.sql.Types#NUMERIC}. + * The custom type sets the SQL type to {@link Types#DECIMAL} + * instead of the default {@link Types#NUMERIC}. */ @Type(type = BigDecimalAsDecimalType.NAME) @Column(precision = 50, scale = 15) @@ -429,8 +429,8 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @TypeDef(name = StringAsNonVarCharType.NAME, typeClass = StringAsNonVarCharType.class) public static class Char255Entity extends TestedEntity { /** - * The custom type sets the SQL type to {@link java.sql.Types#CHAR} - * instead of the default {@link java.sql.Types#VARCHAR}. + * The custom type sets the SQL type to {@link Types#CHAR} + * instead of the default {@link Types#VARCHAR}. */ @Type(type = StringAsNonVarCharType.NAME) @Column(length = 255) @@ -442,8 +442,8 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @Entity(name = "longvarcharEntity") public static class LongvarcharEntity extends TestedEntity { /** - * The custom type sets the SQL type to {@link java.sql.Types#LONGVARCHAR} - * instead of the default {@link java.sql.Types#VARCHAR}. + * The custom type sets the SQL type to {@link Types#LONGVARCHAR} + * instead of the default {@link Types#VARCHAR}. */ @Type(type = "text") public String getTestedProperty() { @@ -455,8 +455,8 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @TypeDef(name = ByteArrayAsNonVarBinaryType.NAME, typeClass = ByteArrayAsNonVarBinaryType.class) public static class BinaryEntity extends TestedEntity { /** - * The custom type sets the SQL type to {@link java.sql.Types#BINARY} - * instead of the default {@link java.sql.Types#VARBINARY}. + * The custom type sets the SQL type to {@link Types#BINARY} + * instead of the default {@link Types#VARBINARY}. */ @Type(type = ByteArrayAsNonVarBinaryType.NAME) public byte[] getTestedProperty() { @@ -474,8 +474,8 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @Entity(name = "longvarbinaryEntity") public static class LongvarbinaryEntity extends TestedEntity { /** - * The custom type sets the SQL type to {@link java.sql.Types#LONGVARBINARY} - * instead of the default {@link java.sql.Types#VARBINARY}. + * The custom type sets the SQL type to {@link Types#LONGVARBINARY} + * instead of the default {@link Types#VARBINARY}. */ @Type(type = "image") public byte[] getTestedProperty() { @@ -529,8 +529,8 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @TypeDef(name = BooleanAsBitType.NAME, typeClass = BooleanAsBitType.class) public static class BitEntity extends TestedEntity { /** - * The custom type sets the SQL type to {@link java.sql.Types#BIT} - * instead of the default {@link java.sql.Types#BOOLEAN}. + * The custom type sets the SQL type to {@link Types#BIT} + * instead of the default {@link Types#BOOLEAN}. */ @Type(type = BooleanAsBitType.NAME) public Boolean getTestedProperty() { diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NullParameterQueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NullParameterQueryTest.java index c57542e21a..b41487fa78 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NullParameterQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NullParameterQueryTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpa.test.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/OracleConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/OracleConstructorResultNativeQueryTest.java index 23d689462a..009272c7a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/OracleConstructorResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/OracleConstructorResultNativeQueryTest.java @@ -8,18 +8,18 @@ package org.hibernate.jpa.test.query; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryParametersValidationTest.java index 92bccf63a7..d8d1598f3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryParametersValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryParametersValidationTest.java @@ -12,11 +12,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.HibernateException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java index 6bfd1aadf5..65ce4b96db 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java @@ -12,15 +12,15 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; import java.util.Map; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.Parameter; -import javax.persistence.PersistenceException; -import javax.persistence.Query; -import javax.persistence.TemporalType; -import javax.persistence.Tuple; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Parameter; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Tuple; import org.hibernate.Hibernate; import org.hibernate.QueryException; @@ -660,19 +660,19 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { query.getHints().clear(); - query.setHint( "javax.persistence.cache.retrieveMode", CacheRetrieveMode.USE ); - query.setHint( "javax.persistence.cache.storeMode", CacheStoreMode.REFRESH ); + query.setHint( "jakarta.persistence.cache.retrieveMode", CacheRetrieveMode.USE ); + query.setHint( "jakarta.persistence.cache.storeMode", CacheStoreMode.REFRESH ); - assertEquals( CacheRetrieveMode.USE, query.getHints().get( "javax.persistence.cache.retrieveMode" ) ); - assertEquals( CacheStoreMode.REFRESH, query.getHints().get( "javax.persistence.cache.storeMode" ) ); + assertEquals( CacheRetrieveMode.USE, query.getHints().get( "jakarta.persistence.cache.retrieveMode" ) ); + assertEquals( CacheStoreMode.REFRESH, query.getHints().get( "jakarta.persistence.cache.storeMode" ) ); query.getHints().clear(); - query.setHint( "javax.persistence.cache.retrieveMode", "USE" ); - query.setHint( "javax.persistence.cache.storeMode", "REFRESH" ); + query.setHint( "jakarta.persistence.cache.retrieveMode", "USE" ); + query.setHint( "jakarta.persistence.cache.storeMode", "REFRESH" ); - assertEquals( CacheRetrieveMode.USE, query.getHints().get( "javax.persistence.cache.retrieveMode" ) ); - assertEquals( CacheStoreMode.REFRESH, query.getHints().get( "javax.persistence.cache.storeMode" ) ); + assertEquals( CacheRetrieveMode.USE, query.getHints().get( "jakarta.persistence.cache.retrieveMode" ) ); + assertEquals( CacheStoreMode.REFRESH, query.getHints().get( "jakarta.persistence.cache.storeMode" ) ); em.getTransaction().commit(); } diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryWithLiteralsInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryWithLiteralsInSelectExpressionTest.java index 769699f98f..9a0a5c288d 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryWithLiteralsInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryWithLiteralsInSelectExpressionTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.jpa.test.query; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ScalarResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ScalarResultNativeQueryTest.java index 6e7e18432a..d92ce8f0d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ScalarResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ScalarResultNativeQueryTest.java @@ -10,14 +10,14 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/TupleNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/TupleNativeQueryTest.java index c9cf4d5a33..b423348cfd 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/TupleNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/TupleNativeQueryTest.java @@ -11,8 +11,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import javax.persistence.*; -import javax.persistence.criteria.CriteriaDelete; +import jakarta.persistence.*; +import jakarta.persistence.criteria.CriteriaDelete; import java.util.List; import java.util.stream.Collectors; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java index 2fec7b9021..40d9887ae6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.actionqueue; import java.util.concurrent.atomic.AtomicBoolean; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.HibernateException; import org.hibernate.action.spi.AfterTransactionCompletionProcess; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java index 19a4323dca..0345e5a079 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.actionqueue; import java.util.concurrent.atomic.AtomicBoolean; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.HibernateException; import org.hibernate.action.spi.BeforeTransactionCompletionProcess; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java index 5c80ca523f..dd2d6204be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java @@ -10,9 +10,9 @@ package org.hibernate.orm.test.annotations; import java.io.Serializable; import java.util.Date; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java index 08aef97cba..2cb4d2af53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java @@ -5,10 +5,10 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.sql.Time; import java.sql.Timestamp; import java.time.*; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java index 11b776003d..4c0f609a61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseCreationTimestampNullableColumnTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.ValueGenerationType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java index 47c08b6453..56046bea8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java @@ -15,7 +15,7 @@ import java.util.EnumSet; import java.util.GregorianCalendar; import java.util.List; import java.util.TimeZone; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.HibernateException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java index 79e33a8531..19e0000e59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java @@ -10,20 +10,20 @@ package org.hibernate.orm.test.annotations; import java.io.Serializable; import java.util.Calendar; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; /** * Flight diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java index 9d17f910c4..d4e8f5d5fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java index 3cd9744251..a2d02de4a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.annotations; import java.util.Date; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.UpdateTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java index d2b6f19c3b..3b6143a84e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.orm.test.annotations.inheritance.Carrot; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java index 3483350011..5e122234ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.UniqueConstraint; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java index e53da5213f..c20c29c51e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java @@ -9,18 +9,18 @@ package org.hibernate.orm.test.annotations; import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.Session; import org.hibernate.annotations.CreationTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java index 4aacd40261..42647b2b49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java @@ -11,10 +11,10 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.sql.Time; import java.sql.Timestamp; import java.time.*; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java index 1d9b0f9e8e..c5a20f9d00 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Competitor.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.array; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java index 69501b30d2..9171332f9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/array/Contest.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.array; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.ListIndexBase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java index 8abc03b99f..0ca6ccdd49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Bug.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.backquotes; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.Index; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java index a07b66e051..2c8e779be6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Category.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.backquotes; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Category diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java index c8055bb891..d1e0654ef3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/Printer.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.backquotes; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java index 910dba75c3..825eb9c0b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/PrinterCable.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.backquotes; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class PrinterCable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java index 8d90fe95c7..ea0e150e1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/CollectionAsBasicTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.annotations.basic; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Type; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java index 7b1b8d142d..ecbff8c188 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; @Entity public class Address { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java index 0f4bca008f..9da53327b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java index 43ad8922ac..4f2fbdb1db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import java.util.Map; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java index e5e7abf0e4..a338ae016f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.lang.annotation.Annotation; import java.math.BigDecimal; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java index 871725fa8d..6c4672ef12 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import java.util.Locale; -import javax.validation.ConstraintViolationException; -import javax.validation.MessageInterpolator; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import org.junit.Test; @@ -66,10 +66,10 @@ public class BeanValidationProvidedFactoryTest extends BaseCoreFunctionalTestCas return interpolate( s, context ); } }; - final javax.validation.Configuration configuration = Validation.byDefaultProvider().configure(); + final jakarta.validation.Configuration configuration = Validation.byDefaultProvider().configure(); configuration.messageInterpolator( messageInterpolator ); ValidatorFactory vf = configuration.buildValidatorFactory(); - cfg.getProperties().put( "javax.persistence.validation.factory", vf ); + cfg.getProperties().put( "jakarta.persistence.validation.factory", vf ); cfg.setProperty( "javax.persistence.validation.mode", "AUTO" ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java index 45fab2fee9..078d020c81 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java index 7a35cc85c1..d7decc5f1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java index 04af03118c..64383b10d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java index 6969311ada..2a550aa73f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.validation.ConstraintViolationException; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java index 39706c46b8..a3b6ba06f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java index 29b010fdd2..54b1f90dc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; -import javax.validation.Valid; -import javax.validation.constraints.Min; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java index e46c849244..d1f4301191 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java index 306d157f4f..36dd462e70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java index fe06a478a1..400eea0f2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java index 3daecb0d5f..b6578ff878 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Column; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Column; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java index 827b9d104d..3c79fa6008 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java index 0a201054f7..10df4098b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java index 49e8e412af..e9b1d0af27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Entity; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java index 5dae80bfa6..e84bda5227 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java index e80cc4bed2..c4290e71a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Column; -import javax.validation.Valid; -import javax.validation.constraints.Future; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Column; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Future; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.hibernate.validator.constraints.Length; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java index ea92c89050..db70f5720f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.beanvalidation; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java index 6d4b19f08d..3f96cf147f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Child.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Jeff Schnitzer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java index 1e9a22191a..048f3b87bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairHolder.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.cascade; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "CODED_PAIR_HOLDER") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java index c7e359ac43..9cdcfb9a37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CodedPairSetHolder.java @@ -10,14 +10,14 @@ import java.io.Serializable; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java index d59706bc7c..07f7a9a415 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Mouth.java @@ -8,14 +8,14 @@ //$Id$ package org.hibernate.orm.test.annotations.cascade; import java.util.Collection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; -import static javax.persistence.CascadeType.DETACH; -import static javax.persistence.CascadeType.REMOVE; +import static jakarta.persistence.CascadeType.DETACH; +import static jakarta.persistence.CascadeType.REMOVE; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java index 112fc34724..d80b5266cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Parent.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.annotations.cascade; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; /** * @author Jeff Schnitzer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java index f2b3fc87a1..4b03d24687 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Person.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.cascade; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "PERSON") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java index 0d7225514a..4f03233e57 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/PersonPair.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.cascade; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java index 47412c993d..8126f4e2f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/Tooth.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Column; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Column; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java index 2319379f44..4cbf1b810a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/A.java @@ -9,31 +9,31 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class A extends AbstractEntity { private static final long serialVersionUID = 864804063L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "a") private java.util.Set bCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.ManyToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "aCollection") private java.util.Set dCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "a") private java.util.Set cCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java index 319d361928..bda717065c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; import java.io.Serializable; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; @MappedSuperclass public abstract class AbstractEntity implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java index a3149cb9e2..9f2116cf6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/B.java @@ -9,31 +9,31 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class B extends AbstractEntity { private static final long serialVersionUID = 325417243L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "b") private java.util.Set cCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private A a; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private F f; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java index b131ac864e..2308e69d18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/C.java @@ -9,31 +9,31 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class C extends AbstractEntity { private static final long serialVersionUID = 1226955752L; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private A a; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private G g; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private B b; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java index bb167db374..be28846419 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/D.java @@ -9,23 +9,23 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class D extends AbstractEntity { private static final long serialVersionUID = 2417176961L; /** * No documentation */ - @javax.persistence.ManyToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private java.util.Set aCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private java.util.Set eCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java index fd63d34fff..cf242af44a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/E.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class E extends AbstractEntity { private static final long serialVersionUID = 1226955558L; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private F f; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java index 3a33999e1c..55a7a1d75a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/F.java @@ -9,23 +9,23 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class F extends AbstractEntity { private static final long serialVersionUID = 1471534025L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "f") private java.util.Set bCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.OneToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private H h; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java index 78ed0a81af..fe5d9f969f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/G.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class G extends AbstractEntity { private static final long serialVersionUID = 325417437L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "g") private java.util.Set cCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java index 82bc3559d4..8d5d45cb95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/H.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.cascade.circle.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class H extends AbstractEntity { private static final long serialVersionUID = 1226955562L; /** * No documentation */ - @javax.persistence.OneToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private G g; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java index 07d4c7e2f3..e4b38fa078 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/A.java @@ -9,31 +9,31 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class A extends AbstractEntity { private static final long serialVersionUID = 864804063L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "a") private java.util.Set bCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.ManyToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "aCollection") private java.util.Set dCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "a") private java.util.Set cCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java index 41968d5364..1b38a5ca5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; import java.io.Serializable; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; @MappedSuperclass public abstract class AbstractEntity implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java index c0aaa377f9..5ada1556d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/B.java @@ -9,31 +9,31 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class B extends AbstractEntity { private static final long serialVersionUID = 325417243L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "b") private java.util.Set cCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) - private org.hibernate.orm.test.annotations.cascade.circle.sequence.A a; + private A a; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private F f; @@ -46,11 +46,11 @@ public class B extends AbstractEntity { this.cCollection = parameter; } - public org.hibernate.orm.test.annotations.cascade.circle.sequence.A getA() { + public A getA() { return a; } - public void setA(org.hibernate.orm.test.annotations.cascade.circle.sequence.A parameter) { + public void setA(A parameter) { this.a = parameter; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java index 52846ef911..a4ad25a6bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/C.java @@ -9,39 +9,39 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class C extends AbstractEntity { private static final long serialVersionUID = 1226955752L; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) - private org.hibernate.orm.test.annotations.cascade.circle.sequence.A a; + private A a; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private G g; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) - private org.hibernate.orm.test.annotations.cascade.circle.sequence.B b; + private B b; - public org.hibernate.orm.test.annotations.cascade.circle.sequence.A getA() { + public A getA() { return a; } - public void setA(org.hibernate.orm.test.annotations.cascade.circle.sequence.A parameter) { + public void setA(A parameter) { this.a = parameter; } @@ -53,11 +53,11 @@ public class C extends AbstractEntity { this.g = parameter; } - public org.hibernate.orm.test.annotations.cascade.circle.sequence.B getB() { + public B getB() { return b; } - public void setB(org.hibernate.orm.test.annotations.cascade.circle.sequence.B parameter) { + public void setB(B parameter) { this.b = parameter; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java index 48bb1e36d8..ca27c8d288 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/D.java @@ -9,32 +9,32 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class D extends AbstractEntity { private static final long serialVersionUID = 2417176961L; /** * No documentation */ - @javax.persistence.ManyToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) - private java.util.Set aCollection = new java.util.HashSet(); + private java.util.Set aCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private java.util.Set eCollection = new java.util.HashSet(); - public java.util.Set getACollection() { + public java.util.Set getACollection() { return aCollection; } public void setACollection( - java.util.Set parameter) { + java.util.Set parameter) { this.aCollection = parameter; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java index 0fbd8643f3..ed58c24a86 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/E.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class E extends AbstractEntity { private static final long serialVersionUID = 1226955558L; /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private F f; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java index cd645af543..108851bcb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/F.java @@ -9,32 +9,32 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class F extends AbstractEntity { private static final long serialVersionUID = 1471534025L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "f") - private java.util.Set bCollection = new java.util.HashSet(); + private java.util.Set bCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.OneToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) private H h; - public java.util.Set getBCollection() { + public java.util.Set getBCollection() { return bCollection; } public void setBCollection( - java.util.Set parameter) { + java.util.Set parameter) { this.bCollection = parameter; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java index 0dfb6a782f..d9f0a3dffd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/G.java @@ -9,24 +9,24 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class G extends AbstractEntity { private static final long serialVersionUID = 325417437L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "g") - private java.util.Set cCollection = new java.util.HashSet(); + private java.util.Set cCollection = new java.util.HashSet(); - public java.util.Set getCCollection() { + public java.util.Set getCCollection() { return cCollection; } public void setCCollection( - java.util.Set parameter) { + java.util.Set parameter) { this.cCollection = parameter; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java index 82be2fb802..a18c813be8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/H.java @@ -9,23 +9,23 @@ package org.hibernate.orm.test.annotations.cascade.circle.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class H extends AbstractEntity { private static final long serialVersionUID = 1226955562L; /** * No documentation */ - @javax.persistence.OneToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} ) - private org.hibernate.orm.test.annotations.cascade.circle.sequence.G g; + private G g; - public org.hibernate.orm.test.annotations.cascade.circle.sequence.G getG() { + public G getG() { return g; } - public void setG(org.hibernate.orm.test.annotations.cascade.circle.sequence.G parameter) { + public void setG(G parameter) { this.g = parameter; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java index ee5ee05fa5..774b164c2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity; import java.io.Serializable; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java index 2a092341e7..90bc210e85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityB.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityB extends AbstractEntity { private static final long serialVersionUID = 325417243L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "b") private java.util.Set gCollection = new java.util.HashSet(); @@ -25,8 +25,8 @@ public class EntityB extends AbstractEntity { /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private EntityC c; @@ -35,8 +35,8 @@ public class EntityB extends AbstractEntity { /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private EntityD d; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java index 0ec2a307f7..8d199ebe41 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityC.java @@ -11,15 +11,15 @@ import java.util.Set; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityC extends AbstractEntity { private static final long serialVersionUID = 1226955752L; - @javax.persistence.OneToMany(mappedBy = "c") + @jakarta.persistence.OneToMany(mappedBy = "c") private Set bCollection = new java.util.HashSet(); - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "c") private Set dCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java index 07a3c44a03..d7cf03215c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityD.java @@ -9,23 +9,23 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityD extends AbstractEntity { private static final long serialVersionUID = 2417176961L; - @javax.persistence.OneToMany(mappedBy = "d") + @jakarta.persistence.OneToMany(mappedBy = "d") private java.util.Set bCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityC c; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityE e; - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, - javax.persistence.CascadeType.PERSIST, - javax.persistence.CascadeType.REFRESH}, + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, + jakarta.persistence.CascadeType.PERSIST, + jakarta.persistence.CascadeType.REFRESH}, mappedBy = "d" ) private java.util.Set fCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java index 32651ef6f1..99881cdb58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityE.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityE extends AbstractEntity { private static final long serialVersionUID = 1226955558L; - @javax.persistence.OneToMany(mappedBy = "e") + @jakarta.persistence.OneToMany(mappedBy = "e") private java.util.Set dCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = true) + @jakarta.persistence.ManyToOne(optional = true) private EntityF f; public java.util.Set getDCollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java index f4255e9a76..574f24d3d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityF.java @@ -9,22 +9,22 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityF extends AbstractEntity { private static final long serialVersionUID = 1471534025L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "f") private java.util.Set eCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityD d; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityG g; public java.util.Set getECollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java index 8551ea0e08..9aeec6a55a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/EntityG.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityG extends AbstractEntity { private static final long serialVersionUID = 325417437L; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityB b; - @javax.persistence.OneToMany(mappedBy = "g") + @jakarta.persistence.OneToMany(mappedBy = "g") private java.util.Set fCollection = new java.util.HashSet(); public EntityB getB() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java index ce60bbaa75..13e4c74223 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; *

            * All IDs are generated from an identity column. *

            - * JPA cascade types are used (javax.persistence.CascadeType).. + * JPA cascade types are used (jakarta.persistence.CascadeType).. *

            * This test uses the following model: * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java index efaad6d060..aae43bf27e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence; import java.io.Serializable; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; @MappedSuperclass public abstract class AbstractEntity implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java index 417dec77fc..9af65e7b43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/B.java @@ -9,24 +9,24 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class B extends AbstractEntity { private static final long serialVersionUID = 325417243L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "b") - private java.util.Set gCollection = new java.util.HashSet(); + private java.util.Set gCollection = new java.util.HashSet(); /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private C c; @@ -35,8 +35,8 @@ public class B extends AbstractEntity { /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private D d; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java index 13c8574b44..7f206bb137 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/C.java @@ -11,15 +11,15 @@ import java.util.Set; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class C extends AbstractEntity { private static final long serialVersionUID = 1226955752L; - @javax.persistence.OneToMany(mappedBy = "c") + @jakarta.persistence.OneToMany(mappedBy = "c") private Set bCollection = new java.util.HashSet(); - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "c") private Set dCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java index aae9bffc66..a1e518eccc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/D.java @@ -9,21 +9,21 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class D extends AbstractEntity { private static final long serialVersionUID = 2417176961L; - @javax.persistence.OneToMany(mappedBy = "d") + @jakarta.persistence.OneToMany(mappedBy = "d") private java.util.Set bCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private C c; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private E e; - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH}, + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}, mappedBy = "d" ) private java.util.Set fCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java index 3e79905e18..96c071d500 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/E.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class E extends AbstractEntity { private static final long serialVersionUID = 1226955558L; - @javax.persistence.OneToMany(mappedBy = "e") + @jakarta.persistence.OneToMany(mappedBy = "e") private java.util.Set dCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = true) + @jakarta.persistence.ManyToOne(optional = true) private F f; public java.util.Set getDCollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java index 9a39612789..8ea2d592cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/F.java @@ -9,22 +9,22 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class F extends AbstractEntity { private static final long serialVersionUID = 1471534025L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "f") private java.util.Set eCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private D d; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private G g; public java.util.Set getECollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java index 1aa2d07469..318fb1795a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/G.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.jpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class G extends AbstractEntity { private static final long serialVersionUID = 325417437L; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private B b; - @javax.persistence.OneToMany(mappedBy = "g") + @jakarta.persistence.OneToMany(mappedBy = "g") private java.util.Set fCollection = new java.util.HashSet(); public B getB() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java index 0aac599656..b33d34f344 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; *

            * All IDs are generated from a sequence. *

            - * JPA cascade types are used (javax.persistence.CascadeType).. + * JPA cascade types are used (jakarta.persistence.CascadeType).. *

            * This test uses the following model: * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java index 0b4ec9ea5e..c5b13a5194 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity; import java.io.Serializable; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java index cf365dc07e..c5b41650d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityB.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity; -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityB extends AbstractEntity { private static final long serialVersionUID = 325417243L; - @javax.persistence.OneToMany(mappedBy = "b") + @jakarta.persistence.OneToMany(mappedBy = "b") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, @@ -20,7 +20,7 @@ public class EntityB extends AbstractEntity { private java.util.Set gCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, @@ -29,7 +29,7 @@ public class EntityB extends AbstractEntity { }) private EntityC c; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java index b830a22f1f..3062d2fc8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityC.java @@ -11,14 +11,14 @@ import java.util.Set; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityC extends AbstractEntity { private static final long serialVersionUID = 1226955752L; - @javax.persistence.OneToMany(mappedBy = "c") + @jakarta.persistence.OneToMany(mappedBy = "c") private Set bCollection = new java.util.HashSet(); - @javax.persistence.OneToMany(mappedBy = "c") + @jakarta.persistence.OneToMany(mappedBy = "c") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java index 0d725b69b0..7573fd946e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityD.java @@ -9,20 +9,20 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityD extends AbstractEntity { private static final long serialVersionUID = 2417176961L; - @javax.persistence.OneToMany(mappedBy = "d") + @jakarta.persistence.OneToMany(mappedBy = "d") private java.util.Set bCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityC c; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityE e; - @javax.persistence.OneToMany(mappedBy = "d") + @jakarta.persistence.OneToMany(mappedBy = "d") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java index 382047f5f6..3a872b21a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityE.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityE extends AbstractEntity { private static final long serialVersionUID = 1226955558L; - @javax.persistence.OneToMany(mappedBy = "e") + @jakarta.persistence.OneToMany(mappedBy = "e") private java.util.Set dCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = true) + @jakarta.persistence.ManyToOne(optional = true) private EntityF f; public java.util.Set getDCollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java index 4c8e45a5d8..29852b680c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityF.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityF extends AbstractEntity { private static final long serialVersionUID = 1471534025L; /** * No documentation */ - @javax.persistence.OneToMany(mappedBy = "f") + @jakarta.persistence.OneToMany(mappedBy = "f") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, @@ -25,10 +25,10 @@ public class EntityF extends AbstractEntity { }) private java.util.Set eCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityD d; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityG g; public java.util.Set getECollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java index 7f3870d01a..1357c03416 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/EntityG.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.identity; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class EntityG extends AbstractEntity { private static final long serialVersionUID = 325417437L; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private EntityB b; - @javax.persistence.OneToMany(mappedBy = "g") + @jakarta.persistence.OneToMany(mappedBy = "g") private java.util.Set fCollection = new java.util.HashSet(); public EntityB getB() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java index 9e4d10c5c3..4123cec50e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence; import java.io.Serializable; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; @MappedSuperclass public abstract class AbstractEntity implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java index 2c71d068db..ed96781d17 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/B.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence; -@javax.persistence.Entity +@jakarta.persistence.Entity public class B extends AbstractEntity { private static final long serialVersionUID = 325417243L; - @javax.persistence.OneToMany(mappedBy = "b") + @jakarta.persistence.OneToMany(mappedBy = "b") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, @@ -20,7 +20,7 @@ public class B extends AbstractEntity { private java.util.Set gCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, @@ -29,7 +29,7 @@ public class B extends AbstractEntity { }) private C c; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java index 179df25324..bfbaeb442f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/C.java @@ -11,14 +11,14 @@ import java.util.Set; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class C extends AbstractEntity { private static final long serialVersionUID = 1226955752L; - @javax.persistence.OneToMany(mappedBy = "c") + @jakarta.persistence.OneToMany(mappedBy = "c") private Set bCollection = new java.util.HashSet(); - @javax.persistence.OneToMany(mappedBy = "c") + @jakarta.persistence.OneToMany(mappedBy = "c") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java index 2658d7b235..67abef2fa7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/D.java @@ -9,20 +9,20 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class D extends AbstractEntity { private static final long serialVersionUID = 2417176961L; - @javax.persistence.OneToMany(mappedBy = "d") + @jakarta.persistence.OneToMany(mappedBy = "d") private java.util.Set bCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private C c; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private E e; - @javax.persistence.OneToMany(mappedBy = "d") + @jakarta.persistence.OneToMany(mappedBy = "d") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java index 4bdbd3f661..80761b4b92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/E.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class E extends AbstractEntity { private static final long serialVersionUID = 1226955558L; - @javax.persistence.OneToMany(mappedBy = "e") + @jakarta.persistence.OneToMany(mappedBy = "e") private java.util.Set dCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = true) + @jakarta.persistence.ManyToOne(optional = true) private F f; public java.util.Set getDCollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java index 732835ef94..894a99405e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/F.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class F extends AbstractEntity { private static final long serialVersionUID = 1471534025L; /** * No documentation */ - @javax.persistence.OneToMany(mappedBy = "f") + @jakarta.persistence.OneToMany(mappedBy = "f") @org.hibernate.annotations.Cascade({ org.hibernate.annotations.CascadeType.PERSIST, org.hibernate.annotations.CascadeType.SAVE_UPDATE, @@ -25,10 +25,10 @@ public class F extends AbstractEntity { }) private java.util.Set eCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private D d; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private G g; public java.util.Set getECollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java index cc99425a92..23149ef541 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/G.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.cascade.multicircle.nonjpa.sequence; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class G extends AbstractEntity { private static final long serialVersionUID = 325417437L; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private B b; - @javax.persistence.OneToMany(mappedBy = "g") + @jakarta.persistence.OneToMany(mappedBy = "g") private java.util.Set fCollection = new java.util.HashSet(); public B getB() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java index 2e26a234eb..b0c573b7b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/A.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Artur Legan diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java index eb287b80ff..db3409e1ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/AId.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java index e241e68c3b..9c9af2b8e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/B.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java index 0f932a839f..fb20887d63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/C.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java index 945a740076..52706dc675 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Channel.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java index 5a5985f19f..ee5abca6ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Child.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Entity having a many to one in its pk diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java index 24af85be96..14017b7fc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ChildPk.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * Child Pk with many to one inside diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java index 8826051be6..79c3c38e97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DialectFeatureChecks; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java index 44c2b26abe..794e6c8f93 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PersistenceException; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SQLServer2012Dialect; @@ -252,7 +252,7 @@ public class CompositeIdFkGeneratedValueTest { } @Entity(name = "Node") - @IdClass(CompositeIdFkGeneratedValueTest.Node.PK.class) + @IdClass(Node.PK.class) public static class Node { @Id @@ -309,7 +309,7 @@ public class CompositeIdFkGeneratedValueTest { } @Entity(name = "NodeS") - @IdClass(CompositeIdFkGeneratedValueTest.NodeS.PK.class) + @IdClass(NodeS.PK.class) public static class NodeS { @Id @@ -367,7 +367,7 @@ public class CompositeIdFkGeneratedValueTest { } @Entity(name = "NodeA") - @IdClass(CompositeIdFkGeneratedValueTest.NodeA.PK.class) + @IdClass(NodeA.PK.class) public static class NodeA { @Id @@ -425,7 +425,7 @@ public class CompositeIdFkGeneratedValueTest { } @Entity(name = "NodeT") - @IdClass(CompositeIdFkGeneratedValueTest.NodeT.PK.class) + @IdClass(NodeT.PK.class) public static class NodeT { @Id @@ -473,7 +473,7 @@ public class CompositeIdFkGeneratedValueTest { } @Entity(name = "ComplexNodeS") - @IdClass(CompositeIdFkGeneratedValueTest.ComplexNodeS.PK.class) + @IdClass(ComplexNodeS.PK.class) public static class ComplexNodeS { @Id @@ -524,7 +524,7 @@ public class CompositeIdFkGeneratedValueTest { } @Entity(name = "ComplexNodeT") - @IdClass(CompositeIdFkGeneratedValueTest.ComplexNodeT.PK.class) + @IdClass(ComplexNodeT.PK.class) public static class ComplexNodeT { @Id @@ -575,7 +575,7 @@ public class CompositeIdFkGeneratedValueTest { } @Entity(name = "ComplexNodeA") - @IdClass(CompositeIdFkGeneratedValueTest.ComplexNodeA.PK.class) + @IdClass(ComplexNodeA.PK.class) public static class ComplexNodeA { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java index a1db39236b..551a87dead 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.FailureExpected; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java index a6b0b86761..b764dfa908 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.annotations.cid; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java index 5f3d5b3db3..3bc1ba1f47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/LittleGenius.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; /** * Hierarchy with cid + many to one diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java index 3d4093e7ad..13819cc479 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Order.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.cid; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java index 9fdd5b29d6..010dc57977 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLine.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java index e0d0d3ad0b..bd1c7a758b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/OrderLinePk.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java index f274152eb3..9950a28a3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Parent.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * Entity with composite id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java index a3885dc196..d13436594e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/ParentPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java index 2fdb682360..efadba23f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Presenter.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java index 092a8ef071..d03185b778 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/Product.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.cid; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java index 637327430d..2eb48ded08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author bartek diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java index ca6530f649..d9238d9328 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/SomeEntityId.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author bartek diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java index d20d8c33c9..e961aa8020 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazin.java @@ -1,33 +1,33 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -//$Id$ -package org.hibernate.orm.test.annotations.cid; -import java.util.Date; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Column; - -/** - * @author Emmanuel Bernard - */ -@Entity -@AssociationOverrides({ -@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id", nullable = false)), -@AssociationOverride(name = "id.presenter", joinColumns = @JoinColumn(name = "presenter_name", nullable = false))}) -public class TvMagazin { - @EmbeddedId - public TvMagazinPk id; - @Temporal(TemporalType.TIME) - @Column(name="`time`") - Date time; -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ + +//$Id$ +package org.hibernate.orm.test.annotations.cid; +import java.util.Date; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Column; + +/** + * @author Emmanuel Bernard + */ +@Entity +@AssociationOverrides({ +@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id", nullable = false)), +@AssociationOverride(name = "id.presenter", joinColumns = @JoinColumn(name = "presenter_name", nullable = false))}) +public class TvMagazin { + @EmbeddedId + public TvMagazinPk id; + @Temporal(TemporalType.TIME) + @Column(name="`time`") + Date time; +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java index 1206dfc448..3512d19b1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvMagazinPk.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.cid; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java index 25b406599a..0c8bfb6324 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgram.java @@ -1,44 +1,44 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -//$Id$ -package org.hibernate.orm.test.annotations.cid; -import java.util.Date; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author Chandra Patni - */ -@Entity -@SecondaryTable( name = "TV_PROGRAM_EXT", pkJoinColumns = { -@PrimaryKeyJoinColumn( name = "CHANNEL_ID" ), -@PrimaryKeyJoinColumn( name = "PRESENTER_NAME" ) - } ) -@AssociationOverrides({ -@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id", nullable = false)), -@AssociationOverride(name = "id.presenter", joinColumns = @JoinColumn(name = "presenter_name", nullable = false))}) -public class TvProgram { - @EmbeddedId - public TvMagazinPk id; - - @Temporal( TemporalType.TIME ) - @Column(name="`time`") - Date time; - - @Column( name = "TXT", table = "TV_PROGRAM_EXT" ) - public String text; - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ + +//$Id$ +package org.hibernate.orm.test.annotations.cid; +import java.util.Date; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; + +/** + * @author Chandra Patni + */ +@Entity +@SecondaryTable( name = "TV_PROGRAM_EXT", pkJoinColumns = { +@PrimaryKeyJoinColumn( name = "CHANNEL_ID" ), +@PrimaryKeyJoinColumn( name = "PRESENTER_NAME" ) + } ) +@AssociationOverrides({ +@AssociationOverride(name = "id.channel", joinColumns = @JoinColumn(name = "chan_id", nullable = false)), +@AssociationOverride(name = "id.presenter", joinColumns = @JoinColumn(name = "presenter_name", nullable = false))}) +public class TvProgram { + @EmbeddedId + public TvMagazinPk id; + + @Temporal( TemporalType.TIME ) + @Column(name="`time`") + Date time; + + @Column( name = "TXT", table = "TV_PROGRAM_EXT" ) + public String text; + +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java index f58b401504..f4ddc94969 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/TvProgramIdClass.java @@ -1,44 +1,44 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -//$Id$ -package org.hibernate.orm.test.annotations.cid; -import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SecondaryTable( name = "TV_PROGRAM_IDCLASS", pkJoinColumns = - { - @PrimaryKeyJoinColumn( name = "CHANNEL_ID" ), - @PrimaryKeyJoinColumn( name = "PRESENTER_NAME" ) - } ) -@IdClass( TvMagazinPk.class ) -public class TvProgramIdClass { - @Id - @JoinColumn(nullable=false) - public Channel channel; - @Id - @JoinColumn(nullable=false) - public Presenter presenter; - - @Temporal( TemporalType.TIME ) - @Column(name="`time`") - Date time; - - @Column( name = "TXT", table = "TV_PROGRAM_IDCLASS" ) - public String text; -} - - +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ + +//$Id$ +package org.hibernate.orm.test.annotations.cid; +import java.util.Date; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; + +@Entity +@SecondaryTable( name = "TV_PROGRAM_IDCLASS", pkJoinColumns = + { + @PrimaryKeyJoinColumn( name = "CHANNEL_ID" ), + @PrimaryKeyJoinColumn( name = "PRESENTER_NAME" ) + } ) +@IdClass( TvMagazinPk.class ) +public class TvProgramIdClass { + @Id + @JoinColumn(nullable=false) + public Channel channel; + @Id + @JoinColumn(nullable=false) + public Presenter presenter; + + @Temporal( TemporalType.TIME ) + @Column(name="`time`") + Date time; + + @Column( name = "TXT", table = "TV_PROGRAM_IDCLASS" ) + public String text; +} + + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java index 03407eda10..ec01d1347d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Card.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.cid.keymanytoone; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java index 7f6375b28a..8f2609d85c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/CardField.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.cid.keymanytoone; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java index 927aa5dfba..8de25fd388 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/Key.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.annotations.cid.keymanytoone; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java index 36e26f6ed7..291ceb29c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/PrimaryKey.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.cid.keymanytoone; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java index 6ca5f809c9..f28d4b57d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Card.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.cid.keymanytoone.association; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java index b644822fa4..10e5774d82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/CardField.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.cid.keymanytoone.association; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java index 13b5476916..3a6016e2d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/Key.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.annotations.cid.keymanytoone.association; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java index 5947ec0565..080587f158 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/PrimaryKey.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.cid.keymanytoone.association; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java index 95b0b96dcf..9bf1c47021 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Boy.java @@ -11,21 +11,21 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java index 46ac9d7775..d984de25a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Brand.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java index 5f56b7ad96..d30a2afa99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Bug.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class Bug { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java index 88b0f2e88f..15b1996547 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/BugSystem.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.collectionelement; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderBy; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderBy; @SuppressWarnings({"unchecked", "serial"}) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java index 900c5477fc..3c18ab9a48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CountryAttitude.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; import org.hibernate.test.annotations.Country; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java index da19b7be54..76be5a39e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java @@ -347,7 +347,7 @@ public class DefaultNamingCollectionElementTest { Class ownerEntityClass, String ownerCollectionPropertyName, String expectedCollectionTableName) { - final org.hibernate.mapping.Collection collection = metadataImplementor.getCollectionBinding( + final Collection collection = metadataImplementor.getCollectionBinding( ownerEntityClass.getName() + '.' + ownerCollectionPropertyName ); final org.hibernate.mapping.Table table = collection.getCollectionTable(); @@ -401,7 +401,7 @@ public class DefaultNamingCollectionElementTest { Class ownerEntityClass, String ownerCollectionPropertyName, String ownerForeignKeyNameExpected) { - final org.hibernate.mapping.Collection ownerCollection = metadataImplementor.getCollectionBinding( + final Collection ownerCollection = metadataImplementor.getCollectionBinding( ownerEntityClass.getName() + '.' + ownerCollectionPropertyName ); // The default owner join column can only be computed if it has a PK with 1 column. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java index f8bb217141..e71ebfdbd6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.query.criteria.HibernateCriteriaBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java index f4c7ae989b..dccf077c14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableElementCollectionMemberOfTest.java @@ -2,14 +2,14 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; import org.hibernate.query.spi.QueryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java index 6c875d5c5a..3e9165a9de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EntityWithAnElementCollection.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java index b9b104a241..4deea4e0e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/LocalizedString.java @@ -11,9 +11,9 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.MapKeyColumn; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java index c008dbc528..86e51aec56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Matrix.java @@ -10,12 +10,12 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; import org.hibernate.annotations.MapKeyType; import org.hibernate.annotations.SortNatural; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java index b5b2c671df..0c8081c3a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrderByColumnNameTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OrderBy; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OrderBy; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; @@ -29,10 +29,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @DomainModel( annotatedClasses = { - org.hibernate.orm.test.annotations.collectionelement.OrderByColumnNameTest.Product.class, - org.hibernate.orm.test.annotations.collectionelement.OrderByColumnNameTest.Widgets.class, - org.hibernate.orm.test.annotations.collectionelement.OrderByColumnNameTest.Widget1.class, - org.hibernate.orm.test.annotations.collectionelement.OrderByColumnNameTest.Widget2.class, + OrderByColumnNameTest.Product.class, + OrderByColumnNameTest.Widgets.class, + OrderByColumnNameTest.Widget1.class, + OrderByColumnNameTest.Widget2.class, } ) @SessionFactory diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java index d01f7e1d83..c145eb15c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Owner.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.annotations.collectionelement; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java index 930f7dd115..4ba5feb820 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Person.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Person { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java index f1379dc01a..781cd32244 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/PrimitiveArrayElementCollectionTempTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java index c33d4c0862..88737b508d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Products.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.collectionelement; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderBy; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderBy; @Entity public class Products { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java index 5941fd150e..425a79ebe2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/TestCourse.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.ParamDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java index 2b89df82d8..bf24653c0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Toy.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.hibernate.annotations.Parent; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java index e38eb577c1..4e81f62674 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/Widgets.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.collectionelement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.JOINED) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java index a8177c3d84..63833bd72d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/A.java @@ -8,14 +8,14 @@ //$ package org.hibernate.orm.test.annotations.collectionelement.deepcollectionelements; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OrderColumn; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table( name = "A" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java index 79bac468e9..0120b6f13e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/B.java @@ -8,9 +8,9 @@ //$ package org.hibernate.orm.test.annotations.collectionelement.deepcollectionelements; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; @Embeddable public class B { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java index 7fb8c33d43..90c1800351 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/deepcollectionelements/C.java @@ -7,10 +7,10 @@ //$ package org.hibernate.orm.test.annotations.collectionelement.deepcollectionelements; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java index 9b8198c1d4..9877db610e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java @@ -1,78 +1,78 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.annotations.collectionelement.embeddables.withcustomenumdef; - -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Column; - -/** - * @author Steve Ebersole - */ -@Embeddable -public class Location { - public static enum Type { - POSTAL_CODE, - COMMUNE, - REGION, - PROVINCE, - COUNTY - } - - private String name; - - @Enumerated(EnumType.STRING) -// @Column(columnDefinition = "VARCHAR(32)") - @Column(name = "`type`") - private Type type; - - public Location() { - } - - public Location(String name, Type type) { - this.name = name; - this.type = type; - } - - public Type getType() { - return type; - } - - public void setType(Type type) { - this.type = type; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object obj) { - if (! obj.getClass().equals( Location.class )) { - return false; - } - - Location loc = (Location) obj; - if (name != null ? !name.equals(loc.name) : loc.name != null) return false; - if (type != null ? !type.equals(loc.type) : loc.type != null) return false; - - return true; - } - - @Override - public int hashCode() { - int result; - result = (name != null ? name.hashCode() : 0); - result = 31 * result + (type != null ? type.hashCode() : 0); - return result; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.annotations.collectionelement.embeddables.withcustomenumdef; + +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Column; + +/** + * @author Steve Ebersole + */ +@Embeddable +public class Location { + public static enum Type { + POSTAL_CODE, + COMMUNE, + REGION, + PROVINCE, + COUNTY + } + + private String name; + + @Enumerated(EnumType.STRING) +// @Column(columnDefinition = "VARCHAR(32)") + @Column(name = "`type`") + private Type type; + + public Location() { + } + + public Location(String name, Type type) { + this.name = name; + this.type = type; + } + + public Type getType() { + return type; + } + + public void setType(Type type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object obj) { + if (! obj.getClass().equals( Location.class )) { + return false; + } + + Location loc = (Location) obj; + if (name != null ? !name.equals(loc.name) : loc.name != null) return false; + if (type != null ? !type.equals(loc.type) : loc.type != null) return false; + + return true; + } + + @Override + public int hashCode() { + int result; + result = (name != null ? name.hashCode() : 0); + result = 31 * result + (type != null ? type.hashCode() : 0); + return result; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java index bc96ef0e40..9efd054cb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.collectionelement.embeddables.withcus import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java index 486e52d804..baf001858a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Contact.java @@ -7,7 +7,7 @@ //$ package org.hibernate.orm.test.annotations.collectionelement.indexedCollection; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java index 62bfe4875e..4e0a3b4f24 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/Sale.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.collectionelement.indexedCollection; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java index dccac06240..88d1ec7560 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Address.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.collectionelement.ordered; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java index d91f868ee2..7982c71f29 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/Person.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.annotations.collectionelement.ordered; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OrderBy; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OrderBy; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java index f8dd124814..8b1acd11df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/Poi.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.collectionelement.recreate; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java index 909f24ea8a..e5b9fc18c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/PoiArrival.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.collectionelement.recreate; -import javax.persistence.Embeddable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import java.util.Date; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java index 11570cc986..dbe404b494 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RaceExecution.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.annotations.collectionelement.recreate; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.*; +import jakarta.persistence.*; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java index 0a14bf3f7b..44ba14b77f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java @@ -12,11 +12,11 @@ import static org.hamcrest.core.Is.is; import java.util.Iterator; import java.util.stream.StreamSupport; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Comment; import org.hibernate.boot.Metadata; @@ -55,7 +55,7 @@ public class CommentTest { } @Entity(name = "Person") - @javax.persistence.Table(name = TABLE_NAME) + @jakarta.persistence.Table(name = TABLE_NAME) @org.hibernate.annotations.Table(comment = TABLE_COMMENT, appliesTo = TABLE_NAME) public static class TestEntity { @@ -65,7 +65,7 @@ public class CommentTest { private Long id; @Comment("I am name") - @javax.persistence.Column(length = 50) + @jakarta.persistence.Column(length = 50) private String name; @ManyToOne diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java index 99c2f4b301..c75e66f57a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.derivedidentities.e1.b; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java index abf71d7b33..81ebee0f61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.derivedidentities.e1.b; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java index c162ce1790..71e9976dfb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.derivedidentities.e1.b; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java index 9a4295cb9e..01da2b70a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.derivedidentities.e1.b; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java index 0c0bcab3e7..9bc70db07c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java @@ -10,18 +10,18 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; @SuppressWarnings("serial") @NamedQueries({ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java index 45eb7583c7..b09390dbda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java @@ -8,20 +8,20 @@ package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid; import java.io.Serializable; import java.math.BigDecimal; import java.util.Comparator; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Version; @NamedQueries({ @NamedQuery(name = "CustomerInventory.selectAll", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java index 075bdb389d..48c6fd9e09 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @NamedQueries({ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java index 93e4fbeb84..26a98137ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java @@ -10,20 +10,20 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Comparator; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Version; import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java index a36adbc439..dece4044be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java @@ -13,18 +13,18 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java index 1bcd7e573e..d2ede03522 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.derivedidentities.e1.c; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java index 293c742a5e..cca6db990a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.derivedidentities.e1.c; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java index 2d503e7d3c..5e5a38d4c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.annotations.derivedidentities.e4.b; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java index 25e8705c69..91f689abae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.annotations.derivedidentities.e4.b; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java index 381e2a0985..ce2de61409 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.derivedidentities.e4.b; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java index 59d72c0caf..e5d08ffd15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.derivedidentities.e5.c; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java index a168957e89..cd5e2b6621 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.derivedidentities.e5.c; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java index 065f4675be..7bff83ea1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.duplicatedgenerator; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Here to test duplicate import diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java index 79d8c31548..13075f3f0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java @@ -10,20 +10,20 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.boot.MetadataSources; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java index 6594de7567..43dbca2c95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java @@ -10,20 +10,20 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.boot.MetadataSources; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java index ae19208b08..a8e8da61b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java @@ -8,18 +8,18 @@ package org.hibernate.orm.test.annotations.embeddables.collection; import java.io.Serializable; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java index 91209b6eb0..beccc6b819 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java @@ -10,14 +10,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.TreeMap; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java index 6a7825d2d9..7272f21133 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Customer.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.embeddables.nested; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java index 3f930165af..ce5fe22931 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/Investment.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.embeddables.nested; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Thomas Vanstals diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java index fff4b778b7..2c28ce46f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/MonetaryAmount.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.embeddables.nested; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; /** * @author Thomas Vanstals diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java index aff86ec586..4757539c7e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Customer.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.annotations.embeddables.nested.fieldaccess; import java.util.ArrayList; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java index 35d10abed4..33b7675d59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/Investment.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.embeddables.nested.fieldaccess; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Thomas Vanstals diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java index 8a9c612be4..d2333dd306 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/nested/fieldaccess/MonetaryAmount.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.embeddables.nested.fieldaccess; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; /** * @author Thomas Vanstals diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java index 6d2cf3833c..f337273b2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.embedded; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java index aedf0212e3..972f22e5cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.embedded; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java index 9dcd52cfd7..34a47a1f24 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.embedded; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java index e662577bd4..7c77178af1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Address.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.embedded.many2one; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java index 3ba08e05e1..5d98cf8d76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Country.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.embedded.many2one; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * THe entity target of the many-to-one from a component/embeddable. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java index 0ab330e15d..83c974c667 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/Person.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.embedded.many2one; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java index 9ee7660884..393537d53a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Alias.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.embedded.one2many; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java index 3bd2774db0..4258857a68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Name.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.embedded.one2many; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java index 9f54d38a54..a5aa07379b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/Person.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.embedded.one2many; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java index 7b044b0fd8..32375a9eac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/PersonName.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.annotations.embedded.one2many; import java.util.HashSet; import java.util.Set; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.OneToMany; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToMany; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java index 8767f2a640..7d3723b472 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Father.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.annotations.engine.collection; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java index 98210d6458..b71a310b9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Mother.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.engine.collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java index 7f3c6153c5..cc9885f358 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/Son.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.engine.collection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java index 7bd340b62f..a82ac19c07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -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; /** * Has a serializable class as a property diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java index a6e9e268aa..37c92142ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java @@ -15,7 +15,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Set; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import org.hibernate.AnnotationException; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java index db1d4a81a2..0f5753aef7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java index c0627e5416..96d8611d6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java index 68ac3581f3..df668564e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java index 1d75fc2ea0..2a406d1b33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java index e8b4df1e5e..51e27107b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Where; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java index df5fb02f76..05c7f5964c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java index 852f5f06ad..c2dd8db01a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java index 8b75eccdfe..09c501e4e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java index 52bddc4d82..1d89f4dce1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.entity; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.DynamicInsert; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java index 98f20a6bdf..7a12f379c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -22,7 +22,7 @@ import org.hibernate.annotations.Type; /** * Mapping following lines of {@link Forest}, but using the replacements for the now deprecated - * {@link javax.persistence.Entity} annotation. + * {@link jakarta.persistence.Entity} annotation. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java index 9b855bfd92..b9dc7e6e38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java @@ -8,10 +8,10 @@ //$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java index 933a692d48..a2d52ed503 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java index 7a3840c16f..e70d58fd45 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java index 2287377543..0e32987dad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java index fe2408bcf0..81bfa4ad03 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Name extends FirstName { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java index 9ce0f1ede9..b74ecc6703 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Peugot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Peugot.java index 9182f5d709..4ca13d92d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Peugot.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Peugot.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java index 938bb4d5e1..9d0b903a40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java index 106f89cd62..dd0919f421 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java index a995d5f751..9bb68434d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java index 6bbdd0a763..c72288af92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Columns; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java index 1fda6a8cc5..7e6fbc7301 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java @@ -10,12 +10,12 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.Where; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java index 2deb662ed2..1943435922 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java index 8a5834d821..d65089c2d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.entity; 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.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java index 27ba77c9a7..e549fc292e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Proxy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java index 0986ea042c..9c3b9fdfed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java index 6268772fdb..8a5b542f9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java index 9470df7c90..42103db8b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java index 9ee9a9a7b3..2c1f3c3db4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.entitynonentity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java index 6ee6125cdc..efb2c144ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.entitynonentity; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java index cb24b299f4..220db0c025 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.entitynonentity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java index ca48e67689..0570c5b875 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.entitynonentity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EntityEnum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EntityEnum.java index bdc46b1e93..6414d90e54 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EntityEnum.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EntityEnum.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.annotations.enumerated; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; import org.hibernate.annotations.Formula; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java index a8fc15cd40..318ee78c46 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedSmokeTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.enumerated; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedTypeTest.java index c2c8af4ef9..f8eefae756 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedTypeTest.java @@ -10,9 +10,9 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.dialect.AbstractHANADialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/EntityMapEnum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/EntityMapEnum.java index d6b5e4316e..f1c5c54b4d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/EntityMapEnum.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/EntityMapEnum.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.annotations.enumerated.custom_mapkey; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; import org.hibernate.annotations.MapKeyType; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/MapKeyCustomEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/MapKeyCustomEnumTypeTest.java index f8da5ab571..ffef8c56ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/MapKeyCustomEnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_mapkey/MapKeyCustomEnumTypeTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.enumerated.custom_mapkey; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.mapping.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java index 8777132b68..cbac0829bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.annotations.enumerated.mapkey; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * @author Dmitry Spikhalskiy @@ -23,11 +23,11 @@ import javax.persistence.UniqueConstraint; @Entity @Table(name = "social_network_profile", uniqueConstraints = {@UniqueConstraint(columnNames = {"social_network", "network_id"})}) public class SocialNetworkProfile { - @javax.persistence.Id - @javax.persistence.GeneratedValue(generator = "system-uuid") + @jakarta.persistence.Id + @jakarta.persistence.GeneratedValue(generator = "system-uuid") @org.hibernate.annotations.GenericGenerator(name = "system-uuid", strategy = "uuid2") - @javax.persistence.Column(name = "id", unique = true) - private java.lang.String id; + @jakarta.persistence.Column(name = "id", unique = true) + private String id; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id", nullable = false) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java index 6b9066526d..a25a083d76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.annotations.enumerated.mapkey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.FetchType; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.FetchType; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.EnumMap; import java.util.Map; @@ -25,11 +25,11 @@ import java.util.Map; @Entity @Table( name = "USER_TABLE" ) public class User { - @javax.persistence.Id - @javax.persistence.GeneratedValue(generator = "system-uuid") + @jakarta.persistence.Id + @jakarta.persistence.GeneratedValue(generator = "system-uuid") @org.hibernate.annotations.GenericGenerator(name = "system-uuid", strategy = "uuid2") - @javax.persistence.Column(name = "id", unique = true) - private java.lang.String id; + @jakarta.persistence.Column(name = "id", unique = true) + private String id; @MapKeyEnumerated( EnumType.STRING ) @MapKeyColumn(name = "social_network") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java index 5601038345..fdbb9dea28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.annotations.enumerated.mappedSuperclass; import java.io.Serializable; import java.sql.Types; -import javax.persistence.Column; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.boot.Metadata; @@ -34,7 +34,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static javax.persistence.EnumType.STRING; +import static jakarta.persistence.EnumType.STRING; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.junit.Assert.assertEquals; @@ -143,7 +143,7 @@ public class EnumeratedWithMappedSuperclassTest extends BaseUnitTestCase { LIST, EXLIST, INPUT } - @javax.persistence.Entity(name = "AddressLevel") + @jakarta.persistence.Entity(name = "AddressLevel") @Table(name = "address_level") public static class AddressLevel extends DescriptionEntity { // @Column(columnDefinition = "varchar", nullable = false, length = 100) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java index cb886774aa..ba850be37b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Branch.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.fetch; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java index f241fe1c85..0688195bbd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.annotations.fetch; import java.util.Date; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java index 29fdf51ca5..a617bbaec9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Leaf.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.fetch; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java index 6a2e120aaf..91dfc1b6b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Person.java @@ -12,14 +12,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java index 317aeb5863..09f8bd5327 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/Stay.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.fetch; import java.io.Serializable; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java index 35a23883f3..151ba31972 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.fetchprofile; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java index 90f2f06b61..4de85860bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java @@ -11,12 +11,12 @@ package org.hibernate.orm.test.annotations.fetchprofile; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java index af779e91ec..44ab34891f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java index 5436a99ebb..d09fe25c73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java index 222bfd211b..e46d053668 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java index 53cbd37eea..be1c0f0cdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java index 01a768465f..b12fd467a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java @@ -4,11 +4,11 @@ import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity @FetchProfile(name = "customer-with-address", fetchOverrides = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java index cafce5e3d5..987f57e7f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java index 086f139d6c..326f2fda19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java @@ -8,9 +8,9 @@ // $Id$ package org.hibernate.orm.test.annotations.fetchprofile; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java index 5c81b00a5e..61ac34435b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java @@ -4,11 +4,11 @@ import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; import org.hibernate.orm.test.annotations.fetchprofile.Customer6; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity @FetchProfile(name = "address-with-customer", fetchOverrides = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java index 081f7006d8..876a81fd25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A.java @@ -7,8 +7,8 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * Test entities ANN-722. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java index cddd28878b..bae09afbad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/A_PK.java @@ -8,7 +8,7 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; import java.io.Serializable; -import javax.persistence.ManyToOne; +import jakarta.persistence.ManyToOne; /** * Test entities ANN-722. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java index 4995cdb29f..a8a192f34a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/B.java @@ -7,10 +7,10 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Test entities ANN-722. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java index d55bf503b9..376e13be74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/C.java @@ -7,7 +7,7 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Test entities ANN-722. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java index 3c6b5c04cf..7eb051d9c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassA.java @@ -7,12 +7,12 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; /** * Test entities ANN-730. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java index 7cad45e760..60fc758537 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassB.java @@ -7,9 +7,9 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; /** * Test entities ANN-730. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java index 1a5b0fcd70..9ef96ddf7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassC.java @@ -7,9 +7,9 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; /** * Test entities ANN-730. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java index 860af2052d..ef90a23253 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/ClassD.java @@ -7,9 +7,9 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; /** * Test entities ANN-730. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java index fed89f41ba..1de0471164 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D.java @@ -7,8 +7,8 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * Test entities ANN-722. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java index e8ce2f34a8..a3b9e7bc72 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fkcircularity/D_PK.java @@ -8,7 +8,7 @@ // $Id$ package org.hibernate.orm.test.annotations.fkcircularity; import java.io.Serializable; -import javax.persistence.ManyToOne; +import jakarta.persistence.ManyToOne; /** * Test entities ANN-722. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java index cdc400ec49..37cebca6f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.formula; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java index 961885ccec..053adc1e8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.annotations.formula; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityNotFoundException; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.LazyInitializationException; import org.hibernate.annotations.JoinColumnOrFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java index 9c8394cfa1..a9a006bad8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.annotations.formula; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.LazyInitializationException; import org.hibernate.annotations.JoinColumnOrFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java index d0d10cee62..0944afa020 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.formula; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.LazyInitializationException; import org.hibernate.annotations.JoinColumnOrFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java index ceea71ea3d..f8036c49ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.annotations.formula; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java index 28ca60f0a0..322bbb69ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Classes.java @@ -7,16 +7,16 @@ package org.hibernate.orm.test.annotations.generics; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; public class Classes { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java index fe60f11a74..84157ba081 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/DNA.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -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 Paolo Perrotta diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java index 52837e2950..65972818ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Dummy.java @@ -7,10 +7,10 @@ //$ package org.hibernate.orm.test.annotations.generics; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java index 4eaf7d4f30..316a6053d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Gene.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.generics; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java index 405ba12cd2..483426dc02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Item.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java index 8ec00a701c..e7dd5b987a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Paper.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java index 1019880a18..f36e5ccfcb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PaperType.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java index 218af16cc8..7256cba1a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Price.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java index 2d0c1fc563..a94a9db0c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/PricedStuff.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java index 45e9952734..7005cac6a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/SomeGuy.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java index efb737d7be..ae68e21fb4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/Stuff.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java index 74685b572f..2814875c5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildEntity.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.generics; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java index d507340a00..1a5315e5e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Child.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.genericsinheritance; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class Child

            { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java index 935cce387e..fef273e2ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy1.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.genericsinheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ChildHierarchy1 extends Child { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java index ecc64dcf5c..1e2645f283 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy2.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.genericsinheritance; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class ChildHierarchy2

            extends Child

            { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java index 2175156f72..7b83aca010 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ChildHierarchy22.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.genericsinheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ChildHierarchy22 extends ChildHierarchy2 { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java index e27b62a464..2ca151877f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/Parent.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.genericsinheritance; import java.util.HashMap; import java.util.Map; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; @MappedSuperclass public abstract class Parent { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java index 65d6b09836..c50a6499f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy1.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.genericsinheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ParentHierarchy1 extends Parent { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java index 0043f2af5d..aceb840d4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy2.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.genericsinheritance; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class ParentHierarchy2 extends Parent { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java index 907bcc50e0..e0f8bd5cee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/genericsinheritance/ParentHierarchy22.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.genericsinheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ParentHierarchy22 extends ParentHierarchy2 { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java index 31135b03a3..a33af190b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/AndFormulaTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.id; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Formula; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java index 85f43dc489..fb61980147 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Ball.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; /** * Sample of table generator diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java index ae859ed02b..991762b5b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/BreakDance.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java index b4b8fa89dd..d11fe5974a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Bunny.java @@ -10,13 +10,13 @@ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; import java.math.BigDecimal; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java index 7e38bf25bb..658f5280ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Computer.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -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; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java index d475907b40..10a85f1740 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Department.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; -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 of method generator diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java index 4f63aa3bbf..71921e8541 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Dog.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; /** * Share the generator table decribed by the GEN_TABLE GeneratedIdTable diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java index c8630a5a01..d30479b52c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FirTree.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java index 08260dc74f..33f2683f5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Footballer.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java index 03ce38ad42..af2f5e3b5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/FootballerPk.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java index aaa26d3ef6..d37e449397 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Furniture.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java index 9120f0936e..884ae12fce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/GoalKeeper.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java index 5435912e01..1679890207 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Home.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Default sequence generation usage diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java index 50a98bbf44..fc145acef4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Hotel.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Entity with assigned identity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java index 1ab537cef5..5f22d8e002 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/MilitaryBuilding.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java index 8b91181410..0363e08f43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Monkey.java @@ -7,9 +7,9 @@ //$ package org.hibernate.orm.test.annotations.id.entities; -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 Paul Cowan diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java index a5949d4314..06aa313c7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Phone.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java index 7ee10debd7..cbb9ff8e47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PlanetCheatSheet.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java index 89dd32c207..32e6baa383 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/PointyTooth.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java index 4c1c3dba23..185cd681d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Shoe.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; -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 of Sequance generator diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java index 911964ff25..f57484cfa7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/SoundSystem.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java index 306728c256..2c7269be1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Store.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; -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 of class generator diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java index 16305e25e1..9002413729 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tower.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java index d90bea501c..3e720e4c49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/Tree.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.id.entities; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java index cdb4e63461..3b38881d49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/entities/TwinkleToes.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.id.entities; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java index aaa2eee166..294480a617 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AbstractTPCAutoEntity.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.generationmappings; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Christian Beikov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java index 12074f8bfe..7ebfc00aa0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/AutoEntity.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.generationmappings; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java index da0d953d6c..ef595415f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/CompleteSequenceEntity.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.generationmappings; -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; /** * TODO : javadoc @@ -22,7 +22,7 @@ public class CompleteSequenceEntity { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "COMPLETE_SEQ") - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "COMPLETE_SEQ", sequenceName = SEQ_NAME, initialValue = 1000, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java index c9e71edbdd..acc9cec006 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.id.generationmappings; import java.io.Serializable; -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 Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java index 71c6c888fd..c40bd6ccea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.id.generationmappings; import java.io.Serializable; -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 Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java index 3c934ed23d..b34bf3c775 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalSequenceEntity.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.generationmappings; -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; /** * TODO : javadoc @@ -22,7 +22,7 @@ public class MinimalSequenceEntity { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "MINIMAL_SEQ") - @javax.persistence.SequenceGenerator( name = "MINIMAL_SEQ", sequenceName = SEQ_NAME ) + @jakarta.persistence.SequenceGenerator( name = "MINIMAL_SEQ", sequenceName = SEQ_NAME ) public Long getId() { return id; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java index ec57fe9ef4..3fb4542102 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/MinimalTableEntity.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.generationmappings; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java index 763923ab78..af0360663c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; /** - * Test mapping the {@link javax.persistence.GenerationType GenerationTypes} to the corresponding + * Test mapping the {@link jakarta.persistence.GenerationType GenerationTypes} to the corresponding * hibernate generators using the new scheme * * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java index 90acef28a8..ba07bf000e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/TPCAutoEntity1.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.generationmappings; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Christian Beikov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java index 5726bdcbc8..825ac7ed4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Ball.java @@ -8,12 +8,12 @@ //$Id: Ball.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; /** * Sample of table generator diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java index 512449ad0c..2688c57ebb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/BreakDance.java @@ -7,11 +7,11 @@ //$Id: BreakDance.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java index 862e6e42a5..af316bb3bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Bunny.java @@ -10,13 +10,13 @@ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; import java.math.BigDecimal; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java index 58a5ddd786..766f630453 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Computer.java @@ -7,10 +7,10 @@ //$Id: Computer.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -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; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java index 8ce52305b4..ca95b0fd33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Department.java @@ -8,10 +8,10 @@ //$Id: Department.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; -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; /** * Sample of method generator @@ -25,7 +25,7 @@ public class Department implements Serializable { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_DEPT") - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "SEQ_DEPT", sequenceName = "my_sequence" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java index 23839ffd62..8e0ac0ec64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Dog.java @@ -7,12 +7,12 @@ //$Id: Dog.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; /** * Share the generator table decribed by the GEN_TABLE GeneratedIdTable diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java index 67c2dc5a6b..dd0a742125 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FirTree.java @@ -7,7 +7,7 @@ //$Id: FirTree.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java index 0c44a7ae6d..3c4cb7bf3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Footballer.java @@ -7,10 +7,10 @@ //$Id: Footballer.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java index 8b6d6ede50..4d901923d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/FootballerPk.java @@ -8,8 +8,8 @@ //$Id: FootballerPk.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java index 6a75113a23..4673ce441e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Furniture.java @@ -7,9 +7,9 @@ //$Id: Furniture.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java index 3bcf6f0646..416065c3c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/GoalKeeper.java @@ -7,7 +7,7 @@ //$Id: GoalKeeper.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java index a59fa5d483..9302990d9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/HibernateSequenceEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.id.sequences.entities; -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; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java index 556d1c71f9..e19f43733e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Home.java @@ -7,9 +7,9 @@ //$Id: Home.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Default sequence generation usage diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java index ea3bede791..5e51400c7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/MilitaryBuilding.java @@ -7,9 +7,9 @@ //$Id: MilitaryBuilding.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java index 3868cdd5ac..e26c575f64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Monkey.java @@ -7,9 +7,9 @@ //$ package org.hibernate.orm.test.annotations.id.sequences.entities; -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 Paul Cowan diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java index cda86fc450..dbd4ce7b0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Phone.java @@ -7,10 +7,10 @@ //$Id: Phone.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -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; /** * @author Emmanuel Bernard @@ -21,7 +21,7 @@ public class Phone { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "Phone_Gen") - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "Phone_Gen", sequenceName = "phone_seq" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java index f5006a7f2c..3c80a1e163 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PlanetCheatSheet.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java index 705ef77709..c800190a82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/PointyTooth.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java index 0c38b1fffb..ccc0df7b93 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Shoe.java @@ -8,10 +8,10 @@ //$Id: Shoe.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; -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; /** * sample of Sequance generator diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java index 0f442b9ace..84e942ba32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/SoundSystem.java @@ -7,9 +7,9 @@ //$Id: SoundSystem.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java index d72ea3ba41..74baf6d838 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Store.java @@ -8,10 +8,10 @@ //$Id: Store.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; -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; /** * Sample of class generator @@ -19,7 +19,7 @@ import javax.persistence.Id; * @author Emmanuel Bernard */ @Entity -@javax.persistence.SequenceGenerator( +@jakarta.persistence.SequenceGenerator( name = "SEQ_STORE", sequenceName = "my_sequence" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java index 81b675c66e..ac52596aa5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tower.java @@ -7,9 +7,9 @@ //$Id: Tower.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java index b68932ddaf..4d483cb57c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/Tree.java @@ -7,9 +7,9 @@ //$Id: Tree.java 14760 2008-06-11 07:33:15Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.id.sequences.entities; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java index 91ed463114..8b1b108bd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/entities/TwinkleToes.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.id.sequences.entities; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java index 20899f98e5..0b128f07c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/DomainAdmin.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.idclass; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedNativeQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.Table; /** @@ -27,7 +27,7 @@ import javax.persistence.Table; @IdClass(DomainAdminId.class) @NamedNativeQuery(name = "DomainAdmin.testQuery", query = "select * from domainadmin da where da.domain_name = 'org'", - resultClass = org.hibernate.orm.test.annotations.idclass.DomainAdmin.class) + resultClass = DomainAdmin.class) public class DomainAdmin implements Serializable { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java index 8e06388f4e..d407174f8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.idclass; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java index 3593d0ad60..6f65ca3c9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Multiple.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.idclassgeneratedvalue; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.SequenceGenerator; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java index a00df425f5..da748b1b30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.idclassgeneratedvalue; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * A Simple entity class. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java index a0fafa6ff1..9439829755 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/Simple2.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.idclassgeneratedvalue; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java index 11bbaf2109..8e49502082 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Passport.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.identifiercollection; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.TableGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.TableGenerator; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java index decace56dc..001f15958d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/Stamp.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.identifiercollection; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java index a79ab96706..0b5a7e3b99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItems.java @@ -8,17 +8,17 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="BasketItems") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java index fbbe615708..1cb9f8314d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/BasketItemsPK.java @@ -8,15 +8,15 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Embeddable public class BasketItemsPK implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java index 4f852aa875..2af1e5662f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Card.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java index 706a75e607..329b74aaae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardField.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java index c5c2dd2760..040d16bb71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CardKey.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.idmanytoone; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java index 7b571ec223..f8e96b9688 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Course.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Alex Kalashnikov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java index 0588474e4b..3bcf585880 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/CourseStudent.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Alex Kalashnikov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java index 1d3311cd82..aad29a99dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customer.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java index 002d98706f..42051804bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Customers.java @@ -8,12 +8,12 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="Customers") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java index 74cd725f17..9fc83b3cef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.idmanytoone; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java index 55da8499c9..c1b9ec4c00 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Project.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.idmanytoone; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java index c3c8e9bd7b..f678991d7d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBaskets.java @@ -8,18 +8,18 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="ShoppingBasket") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java index 02d7c40df0..c9a45a8cbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/ShoppingBasketsPK.java @@ -8,15 +8,15 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Embeddable public class ShoppingBasketsPK implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java index b66af062a7..3852f72b3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Store.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java index 9f33f0aaab..3f198e006e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomer.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java index 7d06b7d467..9f68ad5283 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/StoreCustomerPK.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java index cbccbb6739..d42a5af4e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/Student.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.idmanytoone; import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Alex Kalashnikov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java index f9c1f1fde2..265ed69c10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/A.java @@ -8,9 +8,9 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class A { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java index da47106ed2..babac731ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Acces.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Acces implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java index 88d2122218..b489c458b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/B.java @@ -7,9 +7,9 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity @IdClass( BId.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java index 18409cefaa..a8f2947cf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/BId.java @@ -8,10 +8,10 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Embeddable public class BId implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java index c0bb5f9e85..205e23960f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Benefserv.java @@ -8,9 +8,9 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.math.BigInteger; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Benefserv { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java index aa0aee9bfc..a11a14945b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/C.java @@ -8,10 +8,10 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; @Entity @IdClass( CId.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java index f6f2ab6ca8..398dee7eb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/CId.java @@ -8,9 +8,9 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Embeddable public class CId implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java index a2a2fd4d91..a088491ea7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Droitacces.java @@ -8,9 +8,9 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.math.BigInteger; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Droitacces { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java index 11c9e8dff0..5b635f3155 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/Service.java @@ -8,8 +8,8 @@ //$ package org.hibernate.orm.test.annotations.idmanytoone.alphabetical; import java.math.BigInteger; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java index 7859b24cce..d6e5f8e131 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/CaptionConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.immutable; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * Created by soldier on 12.04.16. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java index 5cb9a5c9c5..fa5c37bd26 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Country.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.immutable; import java.io.Serializable; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.Immutable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java index 4eb6019775..0032b255b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ExifConverter.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.immutable; import java.util.Collections; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java index d371bb3e10..5b8f3f566c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Foobar.java @@ -7,9 +7,9 @@ // $Id$ package org.hibernate.orm.test.annotations.immutable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java index 78054853cb..0553f1548b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeExceptionTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.immutable; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PersistenceException; import org.hibernate.HibernateException; import org.hibernate.annotations.Immutable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java index 7976c4820c..d75af8f9d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.annotations.immutable; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.AnnotationException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java index bbaac24875..631e5ac8c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/Photo.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.immutable; import java.io.Serializable; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java index 664e192807..94ca40aced 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/State.java @@ -7,9 +7,9 @@ // $Id$ package org.hibernate.orm.test.annotations.immutable; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java index a9ec75cd84..cb54fcd38b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java @@ -8,19 +8,19 @@ package org.hibernate.orm.test.annotations.index.jpa; import java.util.List; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.ManyToMany; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java index c9e225492a..e7b72b73c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.annotations.index.jpa; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Strong Liu diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java index 2a0343df90..f2f3489c10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.annotations.index.jpa; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; /** * @author Strong Liu diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java index 3b4d00aef0..2905729745 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressBook.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java index be9c2ae151..24d70241a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntry.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java index c404e98dbf..3b0badf6a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AddressEntryPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java index e126a39ff0..f5221bec6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/AlphabeticalDirectory.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java index b76621828e..0d73e022ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Atmosphere.java @@ -10,22 +10,22 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MapKeyTemporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.TemporalType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java index 247a0e97d5..138a527e8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java index d11c4c0a78..209c94b646 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Drawer.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java index 4fc30e8d14..4ddd4fc220 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Dress.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java index e74b3d49b4..5e382d59af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeOffice.java @@ -10,11 +10,11 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.math.BigDecimal; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity @@ -36,8 +36,8 @@ public class ExchangeOffice { return id; } - @javax.persistence.OneToMany(mappedBy = "parent") - @javax.persistence.MapKey(name="key") + @jakarta.persistence.OneToMany(mappedBy = "parent") + @jakarta.persistence.MapKey(name="key") private Map exchangeRates = new java.util.HashMap(); public Map getExchangeRates() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java index 0e75ae6470..04335db4ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRate.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity @@ -56,7 +56,7 @@ public class ExchangeRate { this.key = key; } - @javax.persistence.ManyToOne(fetch = FetchType.LAZY ) + @jakarta.persistence.ManyToOne(fetch = FetchType.LAZY ) private ExchangeOffice parent = null; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java index fe9d04344c..7b546ce4c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/ExchangeRateKey.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; @Embeddable @@ -31,10 +31,10 @@ public class ExchangeRateKey @Column(name="`date`", nullable = false) protected long date; - @javax.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false) + @jakarta.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false) protected Currency currency1; - @javax.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false) + @jakarta.persistence.ManyToOne(fetch = FetchType.LAZY, optional = false) protected Currency currency2; @@ -60,4 +60,4 @@ public class ExchangeRateKey return hashcode; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java index d4446ac6ac..4ab6501ab4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Gas.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java index 5851870671..461ca4ca79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GasKey.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java index ca75173185..8c5a8df5be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Generation.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java index e06a7929e8..321632362b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java index 78685fadc0..8ca3c0fee1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java index 9753039e8b..1d090a5326 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/News.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java index 79b7d45d7f..e97be38ebf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Newspaper.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java index ff37c92f18..30f1e5e14d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painter.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java index dbc3a66256..c3f525a602 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Painting.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java index 69b03c40e9..384c948438 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PaintingPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java index 3b7970c12f..824e3156e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/PressReleaseAgency.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java index e05b4bf796..05fb3b9066 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Software.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java index aae31d9269..1734a9e335 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Trainee.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java index c6dc87baaf..504bc667dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Training.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.SortedMap; import java.util.TreeMap; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; import org.hibernate.annotations.SortNatural; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java index 15345a020d..798eb7224f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Version.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.indexcoll; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java index 6eb7f7a663..d5398ad067 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Wardrobe.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.annotations.indexcoll; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.ListIndexBase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java index 7de4739c2a..88a2e0a775 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java @@ -10,23 +10,23 @@ package org.hibernate.orm.test.annotations.indexcoll.eager; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MapKeyTemporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.TemporalType; import org.hibernate.orm.test.annotations.indexcoll.Gas; import org.hibernate.orm.test.annotations.indexcoll.GasKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java index 265c8cb8b6..0845eeb8d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Apple.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java index f5512f8d68..259ed83685 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Carrot.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java index 8bf69423b3..c798efdf65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Fruit.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java index 745a6bcd27..0b0c945f95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.inheritance; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.orm.test.annotations.inheritance.Apple; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java index 659d37743d..f73ae18697 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Tomato.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java index 8479074c5a..812a691e49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/Vegetable.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java index cb7e37c8e1..b74668bf71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/VegetablePk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java index 0fd31fa9eb..df9da864b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass.java @@ -7,10 +7,10 @@ // $Id$ package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.DiscriminatorOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java index 14c677c042..b4506225c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/BaseClass2.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java index 5d43a8ad8a..4d7071106f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass.java @@ -7,8 +7,8 @@ // $Id$ package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java index 98fe62250f..dd230c19ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/discriminatoroptions/SubClass2.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.inheritance.discriminatoroptions; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java index ac4a6046dc..f7d36310b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Account.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.inheritance.joined; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "`ACCOUNT`") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java index d5d27e7313..71c6a10661 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Alarm.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToOne; @Entity @DiscriminatorValue("AlarmT") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java index b0acc599f0..12da4e84de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Asset.java @@ -8,14 +8,14 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java index 82d1f42779..ceef414881 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Client.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.annotations.inheritance.joined; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "CLIENT") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java index 485e8e31d3..fe396a364e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Clothing.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java index 807805a302..aab780ebcf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Company.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java index 6c6825f4dd..dac2c1cbca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Customer.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java old mode 100755 new mode 100644 index 282923dbbc..5ff9a504cf --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java index e08c354e71..222e664741 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/EventInformation.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java old mode 100755 new mode 100644 index f9bdd8b37f..b5e68a976a --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java index cc2398457f..91a76c779b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/FinancialAsset.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java old mode 100755 new mode 100644 index 51fdd002c9..24754aca75 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java @@ -10,8 +10,8 @@ package org.hibernate.orm.test.annotations.inheritance.joined; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java index 7fcd3cbb49..5dd058ac4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @DomainModel( annotatedClasses = { Pool.class, - org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool.class + SwimmingPool.class } ) @SessionFactory @@ -52,7 +52,7 @@ public class JoinedSubclassAndSecondaryTable { public void testSecondaryTableAndJoined(SessionFactoryScope scope) { scope.inTransaction( session -> { - org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool sp = new org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool(); + SwimmingPool sp = new SwimmingPool(); session.persist( sp ); session.flush(); session.clear(); @@ -72,17 +72,17 @@ public class JoinedSubclassAndSecondaryTable { "The address table is marked as optional. For null values no database row should be created" ); - org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool sp2 = session.get( org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool.class, sp.getId() ); + SwimmingPool sp2 = session.get( SwimmingPool.class, sp.getId() ); assertNull( sp.getAddress() ); - org.hibernate.orm.test.annotations.inheritance.joined.PoolAddress address = new org.hibernate.orm.test.annotations.inheritance.joined.PoolAddress(); + PoolAddress address = new PoolAddress(); address.setAddress( "Park Avenue" ); sp2.setAddress( address ); session.flush(); session.clear(); - sp2 = session.get( org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool.class, sp.getId() ); + sp2 = session.get( SwimmingPool.class, sp.getId() ); // rowCount = getTableRowCount( session, "POOL_ADDRESS" ); // assertEquals( // @@ -107,7 +107,7 @@ public class JoinedSubclassAndSecondaryTable { public void testSecondaryTableAndJoinedInverse(SessionFactoryScope scope) { scope.inTransaction( session -> { - org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool sp = new org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool(); + SwimmingPool sp = new SwimmingPool(); session.persist( sp ); session.flush(); session.clear(); @@ -125,10 +125,10 @@ public class JoinedSubclassAndSecondaryTable { "The address table is marked as optional. For null values no database row should be created" ); - org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool sp2 = session.get( org.hibernate.orm.test.annotations.inheritance.joined.SwimmingPool.class, sp.getId() ); + SwimmingPool sp2 = session.get( SwimmingPool.class, sp.getId() ); assertNull( sp.getSecondaryAddress() ); - org.hibernate.orm.test.annotations.inheritance.joined.PoolAddress address = new PoolAddress(); + PoolAddress address = new PoolAddress(); address.setAddress( "Park Avenue" ); sp2.setSecondaryAddress( address ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java old mode 100755 new mode 100644 index fc212e5efb..617e24e014 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.annotations.inheritance.joined; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java index 8285f635e0..45b178d77a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/LegalEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java index 2d11947da5..2a2ec24fdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Parent.java @@ -10,13 +10,13 @@ package org.hibernate.orm.test.annotations.inheritance.joined; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java index 3529a217b0..9ba05ca35f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Person.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Inheritance(strategy = InheritanceType.JOINED) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java index 523486c77d..f820bf34c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Pool.java @@ -8,16 +8,16 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; import org.hibernate.annotations.Tables; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java index f71be89b4d..d579597263 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PoolAddress.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class PoolAddress { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java index 56f1228b01..3a45136869 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/ProgramExecution.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java index e4749fce41..fd06ee9491 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/PropertyAsset.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java index 745ef0ca4e..02f9896b6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Sweater.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java index dec3a85dc3..510559c9f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SwimmingPool.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java old mode 100755 new mode 100644 index 727e57d04e..d0747853fd --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.joined; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SymbolicLink extends File { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java old mode 100755 new mode 100644 index effc14940b..2991610475 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.mixed; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java old mode 100755 new mode 100644 index 403d391fbd..a24876a46e --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java @@ -7,15 +7,15 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.mixed; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java old mode 100755 new mode 100644 index 031b162783..addf23d64d --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.annotations.inheritance.mixed; import java.util.HashSet; import java.util.Set; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java old mode 100755 new mode 100644 index d898343b3a..7c3ef6322d --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.inheritance.mixed; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java old mode 100755 new mode 100644 index fc9fb1c159..9fe4213138 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.mixed; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; @Entity @DiscriminatorValue("L") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java index a88159c24a..8839e5d0c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Building.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java index 563502a0af..8a6bd67662 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/DuplicatedDiscriminatorValueTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.MappingException; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java index 129b21e911..178177fdea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Funk.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java index 0c6d18db68..c6dcabdff0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/House.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java index 83e2e4c69f..4c24c52394 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Music.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.DiscriminatorFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java index 7abe2322e1..79016f52bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Noise.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java index c9d6b8f110..6f5e6601fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/PaperTrash.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java index 03c67e0be3..7b97aba8db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Rock.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java index a5b02e624b..497528acf8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/singletable/Trash.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.singletable; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java old mode 100755 new mode 100644 index 90fb33513d..b9c9d08077 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.union; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java old mode 100755 new mode 100644 index d46244d318..3d86466919 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.union; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java old mode 100755 new mode 100644 index 4569bf3b0a..ae472a5a8e --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java @@ -10,9 +10,9 @@ package org.hibernate.orm.test.annotations.inheritance.union; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java old mode 100755 new mode 100644 index 20a0cea710..2ff968ea76 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.annotations.inheritance.union; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java old mode 100755 new mode 100644 index 1ad6cb3fbd..38d5984ced --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.inheritance.union; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "SymbolicLinkUnion") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java index 9a239af9b5..3acaf7d555 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/ContactImpl.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.interfaces; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java index 14363f178a..4514f44439 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/interfaces/UserImpl.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.interfaces; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java index 0fbca29ed3..ed82367544 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.annotations.join; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java index 05358417fb..aca816a20b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.join; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java index 34fd68e67b..0f2b21b9ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.join; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.SecondaryTable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java index ab63598c8a..9f5ce1778f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.join; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java index 8aab1d0b00..c008e2c30c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.join; import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java index 68ad3b1f02..419e63055b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.join; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java index 8c93feb564..6d18f9a7ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.join; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java index 6673f07ac9..30455b04b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.join; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.Date; import java.util.Locale; @@ -132,7 +132,7 @@ public class JoinTest extends BaseNonConfigCoreFunctionalTestCase { CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); CriteriaQuery criteria = criteriaBuilder.createQuery( Life.class ); Root root = criteria.from( Life.class ); - javax.persistence.criteria.Join owner = root.join( "owner", JoinType.INNER ); + jakarta.persistence.criteria.Join owner = root.join( "owner", JoinType.INNER ); criteria.where( criteriaBuilder.equal( owner.get( "name" ), "kitty" ) ); life = s.createQuery( criteria ).uniqueResult(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java index 4e352ef525..a635c263fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java @@ -8,15 +8,15 @@ //$Id$ package org.hibernate.orm.test.annotations.join; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java index 0afa7ad1f9..5a7653b606 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.join; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table( name = "SYS_GROUPS" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java index 51380b9d8d..34bfc6751d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.annotations.join; import java.util.Collection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Entity( name = "sys_user" ) @Table( name = "`SYS_USER`" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java index a04ef7e77a..8a59fd922a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.annotations.join.namingstrategy; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; import java.io.Serializable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java index 027dbca133..b84ece403d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.join.namingstrategy; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.io.Serializable; /** @@ -38,4 +38,4 @@ public class SimpleCat implements Serializable { } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java index 701b8cf594..5e927869a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/list/ListMappingTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.annotations.list; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java index 6d9f46d1f9..1fa8b5a543 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.loader; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.HibernateException; import org.hibernate.annotations.Loader; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java index 347b5bcbf2..91acc34dd2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.loader; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java index 41217fe456..9a046377c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.loader; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java index a4094047e0..b95a85588b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractBook.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Column; -import javax.persistence.Lob; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Lob; +import jakarta.persistence.MappedSuperclass; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java index 1139e513fd..ee27055a28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/AbstractCompiledCode.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Lob; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Lob; +import jakarta.persistence.MappedSuperclass; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java index 893443e9ec..37845653a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Book.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.lob; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java index 4cf238a3fe..ea16a546f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/CompiledCode.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Compiled code representation diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java index fa4e762b45..50fbcff844 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/Document.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.annotations.lob; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/EntitySerialize.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/EntitySerialize.java index b4cd0e3f19..b48fc28ce3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/EntitySerialize.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/EntitySerialize.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java index 3d857d09cd..840f2f0770 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageHolder.java @@ -8,9 +8,9 @@ //$Id: $ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * An entity containing data that is materialized into a byte array immediately. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java index f7805c1c75..e1c279dd40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/LongStringHolder.java @@ -8,9 +8,9 @@ //$Id: $ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java index fb2406950f..c6340de4a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobEntity.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java index b9cb5703e2..2c1efce931 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedBook.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java index 587190180f..ef40a1a9eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedCompiledCode.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.lob; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * Compiled code representation with a version diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java index 184aa93b4b..ea7f235ba6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/hhh4635/LobTestEntity.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.lob.hhh4635; import java.sql.Blob; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; @Entity @Table( name = "lob_test" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java index 1fab958573..17610c02d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.annotations.lob.locator; import java.sql.Blob; import java.sql.Clob; -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 Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java index 578668e098..bc0c632cae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Building.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java index af2a9852f0..0fc80018a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/BuildingCompany.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.util.Date; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java index 65642c6b20..f725bd4bb8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Cat.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.util.Set; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java index cba01d9301..68a799641f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/CatPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java index b8a9388b85..0215e4a4da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/City.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java index d3095e1cee..6ab8d4f60b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Company.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java index f1d8432894..c191c7544f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ContactInfo.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.manytomany; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToMany; @Embeddable public class ContactInfo { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java index 5b48eb7f17..9dcbcab34d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Contractor.java @@ -8,7 +8,7 @@ //$Id: Employee.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Employee in an Employer-Employee relationship diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java index 62e76f846b..a6ef7c0903 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employee.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java index a37a4841c7..f261ba1ade 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Employer.java @@ -10,15 +10,15 @@ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; import java.util.Collection; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java index b952965390..14aa0f6d44 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Friend.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java index bbaadeb37d..0646c6d9c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Group.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java index 4e13c357ea..73e2c155ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/GroupWithSet.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.manytomany; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java index a82926832e..9f3f99e1c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Inspector.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java index bb6b6dfe27..52c2c18904 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/InspectorPrefixes.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.manytomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java index 8e83eb6a68..14bc57741b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/JobInfo.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.manytomany; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class JobInfo { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java index 997cfc5545..2969aa8d38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/KnownClient.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; 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; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java index b4a0ada0da..dabe55fa1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Man.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** * Man knowing sevezral womens diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java index 357c8e21e7..607b835767 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManPk.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java index 56ada144f3..1d16730df2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java @@ -14,11 +14,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java index 9017bd4ad1..c910eb01d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Permission.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java index 32e3ff0025..f995b0dc68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/PhoneNumber.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.manytomany; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class PhoneNumber { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java index aa78950cbf..42daff1aca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ProgramManager.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.manytomany; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class ProgramManager { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java index 3309f9d19c..a193208999 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Store.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java index fe022472c4..e7a777c0b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Supplier.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; 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; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java index df67dc5995..879dc1a725 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Woman.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java index a5d13cdeab..28e0fab3d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/WomanPk.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java index c8cf4684c3..3b675acfbd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/Zone.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java index 629fa4f4e8..d656f6bca7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java index 55bb2f7117..0276239b58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java index 4e59e4a883..faf14afc92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToMany; @Embeddable public class ContactInfo { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java index 5f2bf46469..b4e643124f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany.defaults; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Employee in an Employer-Employee relationship diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java index 3f968bc9c6..051b1612d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java index 11a4a5e539..f6e9a1c02a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.annotations.manytomany.defaults; 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; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java index 2a0ad706d8..9641e82886 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class PhoneNumber { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java index 10d43ed4f1..b457a05cb4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java index 2e64324b62..2eee2a19ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/BiggestForest.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java index 447202763e..c30d8e8789 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Car.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; -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; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java index 1aa43441c1..17dd6c15ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Carz.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java index 1cb9a41665..e3cdad5932 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Child.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * TODO: change this sample with an Address -> Country relation. This is more accurate diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java index 060840118d..2cfbe3386c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Color.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Color showing a surrogate key and a unique constraint to ensure business rule diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java index e906bc798f..f12517bf19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Customer.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java index 229c4ed7a7..d2738a1b65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Deal.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java index 6b3d632713..4ebbad9292 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/DistrictUser.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.annotations.manytoone; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "CLRUS2DI") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java index 9242d6ebf8..541b03a8ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ForestType.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java index d9635c0527..b2ad327566 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Frame.java @@ -10,11 +10,11 @@ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java index c1b22f51f5..7664bd2a8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lens.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java index 4fea384df8..fd4d51c209 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Lotz.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java index d0f6bb2b01..fa908e0429 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/LotzPK.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java index 0a80c83d50..b1f30c5538 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.manytoone; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java index 5112bb413b..fd8bd51ed2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Node.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java index 2087c544b7..c61ee34a3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NodePk.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java index 628349605e..f71bd30bd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java @@ -1,12 +1,12 @@ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; @@ -45,7 +45,7 @@ public class NotNullManyToOneTest extends BaseCoreFunctionalTestCase { ); } - @Test(expected = javax.validation.ConstraintViolationException.class) + @Test(expected = jakarta.validation.ConstraintViolationException.class) public void testSaveChildWithoutParent() { inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java index 32cf7ff9f5..c7cd2e4cf7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.orm.test.annotations.manytoone.NotOptionalManyToOneTest.Child; import org.hibernate.orm.test.annotations.manytoone.NotOptionalManyToOneTest.Parent; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java index a5dfc9ff50..85efdc9e10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Order.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java index edd2cb356a..01b7f291d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/OrderLine.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java index c1b5d16f66..7fe78e847c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/Parent.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java index 78345452d3..2700574353 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ParentPk.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java index e73a81c98c..c2d6afc73e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/TreeType.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.manytoone; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java index f94fa82c06..7d2dedf65a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/User.java @@ -7,15 +7,15 @@ package org.hibernate.orm.test.annotations.manytoone; import java.util.Date; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "CTVUSERS") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java index ff7e1b5010..e7bd4f7819 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/UserPK.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.manytoone; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; -import javax.persistence.Column; +import jakarta.persistence.Column; public class UserPK implements Serializable { private static final long serialVersionUID = -7720874756224520523L; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java index 8f0ea3c361..903e7188ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/GenericObject.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname; import java.io.Serializable; import java.rmi.server.UID; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; @MappedSuperclass public class GenericObject implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java index 62f2b40198..1f20c533e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Item.java @@ -7,7 +7,7 @@ //$ package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java index 73ce1519d1..62b818f272 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/Vendor.java @@ -7,7 +7,7 @@ //$ package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Vendor extends GenericObject { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java index 373c807479..7881a5e44b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java @@ -8,11 +8,11 @@ //$ package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Entity public class WarehouseItem extends GenericObject { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java index a45f41bfdf..c0106d2f33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ZItemCost.java @@ -8,9 +8,9 @@ //$ package org.hibernate.orm.test.annotations.manytoone.referencedcolumnname; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; @Entity public class ZItemCost extends GenericObject { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java index 314b13bfa4..ea6b5ffe18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/Account.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; /** * The intermediate entity in the hierarchy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java index cdc7b55800..7b8aa3096a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Represents the most base super class in the hierarchy. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java index ed4ae400fb..adee0b321e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; /** * The "leaf" entity in the hierarchy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java index aa52aeaa2c..e24524efe3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.mappedsuperclass.intermediate; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java index d25e3a4dc4..c0f8fa6fd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.namingstrategy; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "AEC") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java index d252e5f953..f7f68a2caa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java @@ -7,10 +7,10 @@ // $Id$ package org.hibernate.orm.test.annotations.namingstrategy; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; @Entity public class Address { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java index 35938f5fd2..ccfebe9e22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.namingstrategy; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class AddressEntry implements java.io.Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java index 4544427758..4f3f7d515f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java @@ -8,14 +8,14 @@ // $Id$ package org.hibernate.orm.test.annotations.namingstrategy; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java index a2d54ddd17..7467a1b29f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.annotations.namingstrategy; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Person { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java index 949e22bfc5..c1c8b7e3f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java @@ -10,12 +10,12 @@ package org.hibernate.orm.test.annotations.namingstrategy.charset; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java index 264c2e9db7..ee14e7246d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.annotations.naturalid; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -41,10 +41,10 @@ public class A { @Cache(usage = CacheConcurrencyStrategy.READ_WRITE) @org.hibernate.annotations.OptimisticLock(excluded = true) - @javax.persistence.OneToMany(mappedBy = "a") + @jakarta.persistence.OneToMany(mappedBy = "a") private Set ds = new HashSet(); - @javax.persistence.OneToOne + @jakarta.persistence.OneToOne private D singleD = null; public String getName() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java index e41a7b58cf..9b362bf8b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.naturalid; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java index e89c6b2dd8..3b7eab2c4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.naturalid; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -29,10 +29,10 @@ public class D { @Version private int version; - @javax.persistence.ManyToOne(fetch = FetchType.LAZY) + @jakarta.persistence.ManyToOne(fetch = FetchType.LAZY) private A a = null; - @javax.persistence.OneToOne(mappedBy = "singleD") + @jakarta.persistence.OneToOne(mappedBy = "singleD") private A singleA = null; public A getA() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java index 12396295c3..9602a0b540 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.naturalid; -import javax.persistence.FlushModeType; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java index 2eb5f0082a..eb937a4a68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.naturalid; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java index f3f8c67e00..63c25f49ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.annotations.naturalid; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.NaturalIdLoadAccess; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java index e2c4696a63..3991ea175e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.naturalid; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java index b5171b664e..dee3ee4da6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.naturalid.cid; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java index 5bb974f9e7..96c13e8328 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.naturalid.cid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Donnchadh O Donnabhain diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java index 9381a6fd04..a43d51a0da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.naturalid.cid; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java index 340ef7d25d..bca29dfb95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/A.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java index a0339fb061..01e3c56eae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Asset.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java index b3516815a1..711f3c75f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/B.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java index c6dfb8b435..6890920beb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/BankAccount.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java index 38921d2c8e..160630b6b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Box.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java index 881f8bd96f..c146e3757e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/C.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; /** * @author Peter Kotula diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java index 59f367fdb0..06c683e94a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Child.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java index 6f14576a97..e21d462458 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/City.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Immutable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java index ac44a6263f..cdb66474fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Comment.java @@ -6,19 +6,19 @@ */ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity(name="CommentTable") // "Comment" reserved in Oracle @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java index d7306170c3..80ff974643 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Computer.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; @Entity @PrimaryKeyJoinColumns({ @PrimaryKeyJoinColumn(name = "id_asset"), @PrimaryKeyJoinColumn(name = "id_test") }) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java index 5b2e334949..8d4e3c46c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java @@ -10,9 +10,9 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java index 2cd7bc4928..0eca7408cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Employee.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java index 36d90ca7e6..d66c466d81 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Forum.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java index 44dd3a97c4..c5136ee205 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Item.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java index eda26e7e96..ef3ee00042 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Model.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java index 75f1f69e92..10c0c48fa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Monkey.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java index 7e2b87f2bc..a30364fc96 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java @@ -15,13 +15,13 @@ import java.util.List; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.PersistenceException; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PersistenceException; import org.hibernate.AnnotationException; import org.hibernate.Hibernate; @@ -571,7 +571,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { } @Entity(name = "OnDeleteUnidirectionalOneToManyParent") - @javax.persistence.Table(name = "OneToManyParent") + @jakarta.persistence.Table(name = "OneToManyParent") public static class OnDeleteUnidirectionalOneToManyParent { @Id @@ -585,7 +585,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { } @Entity(name = "OnDeleteUnidirectionalOneToManyChild") - @javax.persistence.Table(name = "OneToManyChild") + @jakarta.persistence.Table(name = "OneToManyChild") public static class OnDeleteUnidirectionalOneToManyChild { @Id @@ -594,7 +594,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { } @Entity(name = "OnDeleteUnidirectionalOneToMany") - @javax.persistence.Table(name = "OneToMany") + @jakarta.persistence.Table(name = "OneToMany") public static class OnDeleteUnidirectionalOneToMany { @Id @@ -606,7 +606,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { } @Entity(name = "ParentUnawareChild") - @javax.persistence.Table(name = "Child") + @jakarta.persistence.Table(name = "Child") public static class ParentUnawareChild { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java index fc536fb512..0640fae781 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Order.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; @Entity @Table( name = "Order_tbl" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java index 735d9d6180..0c3b1eeaf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java @@ -122,7 +122,7 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { Iterator iterator1 = zoo.getTigers().iterator(); Assert.assertEquals( tiger2.getName(), iterator1.next().getName() ); Assert.assertNull( iterator1.next().getName() ); - // Testing @javax.persistence.OrderBy. + // Testing @jakarta.persistence.OrderBy. Iterator iterator2 = zoo.getMonkeys().iterator(); Assert.assertEquals( monkey1.getName(), iterator2.next().getName() ); Assert.assertNull( iterator2.next().getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java index 1a1f647e9e..1d79e4af23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderID.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java index 24789da0f6..d2b2310d19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItem.java @@ -7,15 +7,15 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table( name = "OrderItem_tbl" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java index 0475cf93eb..cdd02bc359 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderItemID.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java index 91dbc882ca..80edefadd7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Organisation.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java index 07a7040369..6bc80e6ba5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrganisationUser.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java index 9fd2689a60..c1684b1c02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Parent.java @@ -10,10 +10,10 @@ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.BatchSize; @@ -28,7 +28,7 @@ public class Parent implements Serializable { @OneToMany(cascade = CascadeType.ALL, mappedBy = "parent") @BatchSize(size = 5) - @javax.persistence.OrderBy("favoriteSuperhero asc, favoriteSinger desc") + @jakarta.persistence.OrderBy("favoriteSuperhero asc, favoriteSinger desc") public Set children; public int hashCode() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java index 7c4941de70..d054f5f2d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/ParentPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java index 26d2bc4441..b588616e07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Person.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java index f76532e7be..f0f026ae5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/PoliticalParty.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java index 76db290871..ad7e89c1fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Politician.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java index 606467028e..44d25ae5c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Post.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java index 752e213f06..29248b0d70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Soldier.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java index 49934fb2ed..2d1eede589 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Street.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java index 640bbc8902..38b0f086de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Tiger.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java index 21603a80de..7bbbb2fc9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Trainer.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.onetomany; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java index 17fc759488..b37f2765a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Transaction.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java index 3a570762a0..11fa5fbcd6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Troop.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.onetomany; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java index 8c30b52985..69af57f8df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/User.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.annotations.onetomany; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity(name="Userx") public class User { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java index eea68a3dd0..8da6089de1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Visitor.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; -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 Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java index 455c5f31b6..a93d12a658 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/Zoo.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.annotations.onetomany; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; /** * Entity used to test {@code NULL} values ordering in SQL {@code ORDER BY} clause. @@ -35,12 +35,12 @@ public class Zoo implements Serializable { @OneToMany @JoinColumn(name = "zoo_id") - @javax.persistence.OrderBy("name asc nulls last") // According to JPA specification this is illegal, but works in Hibernate. + @jakarta.persistence.OrderBy("name asc nulls last") // According to JPA specification this is illegal, but works in Hibernate. private Set monkeys = new HashSet(); @OneToMany @JoinColumn(name = "zoo_id") - @javax.persistence.OrderBy("lastName desc nulls last, firstName asc nulls LaSt") // Sorting by multiple columns. + @jakarta.persistence.OrderBy("lastName desc nulls last, firstName asc nulls LaSt") // Sorting by multiple columns. private Set visitors = new HashSet(); public Zoo() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java index 76a50ff2df..dea596aa58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Address.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java index b1387f389a..77ea15a9da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Body.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java index fe41eaefa1..a31c85c619 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Client.java @@ -7,13 +7,13 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SecondaryTable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java index 4dbc66e8e5..4ba5f366c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Computer.java @@ -7,15 +7,15 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToOne; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToOne; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java index 96e088c18a..a6e753ad94 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ComputerPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java index 7d2f1ad284..6bfe99faf1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Heart.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java index dc0bbd9636..5af70f93fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneJoinTableUniquenessTest.java @@ -17,15 +17,15 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java index f0c0e92545..942294d5c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.annotations.onetoone; import java.util.Iterator; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.EmptyInterceptor; import org.hibernate.MappingException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java index 9a2e5c9578..e578d5aa64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.onetoone; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.id.IdentifierGenerationException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java index 9773c2a041..256ef0845c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java index a8e24c0fa5..5d29a3e6a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java index e6ac201739..01d831b8ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java index b0ecee44bd..03f59c196b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Owner.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java index d45dd3329d..a08d231e1e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OwnerAddress.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java index 1760d75f30..f1470ddd63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Party.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java index d68fbe3c7a..48695cda60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PartyAffiliate.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java index ba5c302a06..313197f70b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Person.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java index 9f94df9298..24b5c87c36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/PersonAddress.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java index 8f17af7ecb..1e3b4391fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumber.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java index ad96c6b265..d691d6e3df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/SerialNumberPk.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java index dd36cadf1e..9a886b8f36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Show.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java index f5db45c650..3c3f8de59f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/ShowDescription.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java index e046ccdebb..eca6d01776 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/Trousers.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java index 79abde166a..fec0918dba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/TrousersZip.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.annotations.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java index f1b7c6571c..a5c89084e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java @@ -5,13 +5,13 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.onetoone.hhh4851; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class BaseEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java index 399e063981..0b05833551 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.onetoone.hhh4851; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; @Entity @DiscriminatorValue(value = "T") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java index b8d65ce2f7..891e2c4f76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.onetoone.hhh4851; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * A group of {@link LogicalTerminal logical terminals}. Used to group them for Configuration purpose. That's why a diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java index f0bf2f7683..d6ad5c2f24 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java @@ -5,16 +5,16 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.onetoone.hhh4851; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java index fdde3c835b..df528e84b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java @@ -5,14 +5,14 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.onetoone.hhh4851; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * this class represents a logical representation of a terminal it could be linked to a terminal or not it contains the diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java index 9718447e06..bbddf90f37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.onetoone.hhh4851; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java index 1381659607..f29f48f59a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.annotations.override.inheritance; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.cfg.AnnotationBinder; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java index 06ffd41a98..4fdb602b1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/MappedSuperclassAttributeOverrideTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.annotations.override.inheritance; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java index f4cc3986e5..c862c6487e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassBasicPropertyIdAttributeOverrideTest.java @@ -1,12 +1,12 @@ package org.hibernate.orm.test.annotations.override.mappedsuperclass; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java index b95afe1521..9506065ad1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/MappedSuperClassWithUuidAsBasic.java @@ -1,8 +1,8 @@ package org.hibernate.orm.test.annotations.override.mappedsuperclass; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java index a1ea5f264f..7d95b6065d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/mappedsuperclass/SubclassWithUuidAsId.java @@ -1,11 +1,11 @@ package org.hibernate.orm.test.annotations.override.mappedsuperclass; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Card.java index f8bab90433..f02c57b4e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Card.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Card.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.annotations.persister; import org.hibernate.annotations.Persister; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Shawn Clowater diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Deck.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Deck.java index 22c932ef5a..a2e1ec484d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Deck.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Deck.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.annotations.persister; import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Persister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java index 008dd1726e..be60ac799b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java @@ -5,16 +5,16 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.quote.resultsetmappings; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java index 9f354fd94e..b76fbaa90e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java @@ -7,15 +7,15 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToOne; -import javax.persistence.PostLoad; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PostLoad; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java index 497e74e09b..a9ae8748f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java @@ -10,8 +10,8 @@ package org.hibernate.orm.test.annotations.reflection; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java index e576c1edb4..dfaaa07cec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.annotations.reflection; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java index f536ce04ec..bc37d00b15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java index fc4ee30cfc..ec4a2b627c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java @@ -19,7 +19,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java index c2adcdc7a3..816db12980 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.PostPersist; -import javax.persistence.PrePersist; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PrePersist; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java index 4f009ab8f2..40320ce581 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java @@ -7,16 +7,16 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java index 96c1ffb760..c4d6237ac6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * Converts {@link Organization} <=> String diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java index b2af74129e..e3604181fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.PostPersist; -import javax.persistence.PrePersist; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PrePersist; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java index f734389ead..cf3f54c44f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.IdClass; -import javax.persistence.SequenceGenerator; -import javax.persistence.TableGenerator; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.IdClass; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.TableGenerator; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java index 41497c8f8c..18b4be6779 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java index e250d13243..5305b2b1c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java index ce5c433999..331c31f3cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.annotations.reflection; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java index cf02bc8910..092cd2f1e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.secondarytable; import java.io.Serializable; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.OptimisticLockType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java index 2559049462..62cb48ab8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.annotations.selectbeforeupdate; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.hibernate.annotations.SelectBeforeUpdate; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java index 2252d09ddb..9e486acb2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java @@ -7,13 +7,13 @@ //$Id$ package org.hibernate.orm.test.annotations.strategy; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Index; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java index 270b5ffc4f..857709a530 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.subselect; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java index 10c9d3389a..d3ff381ca3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.subselect; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Subselect; import org.hibernate.annotations.Synchronize; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java index 967bd45280..f91d0ad990 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.annotations.subselect; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java index 2129d30db5..4b87e69d10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Component.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.annotations.tableperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.Index; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java index 4b426b6af2..d9eb9e70eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Machine.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.annotations.tableperclass; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java index d44045c9a4..e2a8e6eda0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Product.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.annotations.tableperclass; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java index d88b3b2bb0..bf7663f5ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/Robot.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.tableperclass; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java index 4450edbab1..329a55ace3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/T800.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.orm.test.annotations.tableperclass; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java index d1dead66a0..b48b7c6277 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/tableperclass/TablePerClassTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.annotations.tableperclass; import java.util.List; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.JDBCException; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java index 83633c42d4..e115817960 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.annotations.target; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyClass; -import javax.persistence.MapKeyJoinColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MapKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java index 965e09943c..e86a114389 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.target; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Target; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java index 16e8ad75fe..04078f856e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.target; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java index d0dee07d63..67596b020f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.target; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java index 6edbc7298e..2e2ec8ab33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.annotations.uniqueconstraint; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.JDBCException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java index 162df468f5..f200c5b829 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.annotations.uniqueconstraint; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java index 35078e43c0..ca133f765f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.annotations.uniqueconstraint; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.AnnotationException; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java index 06c0a3f988..386b9ddf5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.annotations.uniqueconstraint; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.AnnotationException; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java index 52eef3149e..e8ea29193c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.annotations.xml.ejb3; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.Date; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java index 8669b5e11f..718baf066e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java @@ -6,33 +6,33 @@ */ package org.hibernate.orm.test.annotations.xml.ejb3; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.MapKey; -import javax.persistence.MapKeyClass; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MapKeyTemporal; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java index ce4b536dd0..eacf152a70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java @@ -6,28 +6,28 @@ */ package org.hibernate.orm.test.annotations.xml.ejb3; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CascadeType; -import javax.persistence.EnumType; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.MapKeyClass; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MapKeyTemporal; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CascadeType; +import jakarta.persistence.EnumType; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java index 53ab22f83f..539d078098 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java @@ -6,17 +6,17 @@ */ package org.hibernate.orm.test.annotations.xml.ejb3; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java index 0041eff822..ccbfac0dec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java @@ -6,28 +6,28 @@ */ package org.hibernate.orm.test.annotations.xml.ejb3; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CascadeType; -import javax.persistence.EnumType; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.MapKey; -import javax.persistence.MapKeyClass; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MapKeyTemporal; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CascadeType; +import jakarta.persistence.EnumType; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java index ead49da9cb..b923e81d19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java @@ -6,19 +6,19 @@ */ package org.hibernate.orm.test.annotations.xml.ejb3; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java index 8cd34a3245..ed06d549b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.annotations.xml.ejb3; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TableGenerator; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java index 90f3dc57d2..8f42e88adf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/CharProperty.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ package org.hibernate.orm.test.any.annotations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Column; @Entity @Table( name = "char_property" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java index 553fa148e0..c00acc690f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/EmbeddedAnyTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.any.annotations; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Any; import org.hibernate.annotations.AnyMetaDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java index d8431a7bee..6285657bf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/IntegerProperty.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.any.annotations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="int_property") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java index c76388c943..26da1a72da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LazyPropertySet.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.any.annotations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Any; import org.hibernate.annotations.AnyMetaDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java index d480c059ac..1ace855033 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/LongProperty.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ package org.hibernate.orm.test.any.annotations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Column; @Entity @Table(name = "long_property") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java index f0eccfbbd0..e96838317a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyList.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.any.annotations; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Any; import org.hibernate.annotations.Cascade; @@ -41,7 +41,7 @@ public class PropertyList { } @ManyToAny( metaDef = "Property", metaColumn = @Column(name = "property_type") ) - @Cascade( { org.hibernate.annotations.CascadeType.ALL }) + @Cascade( { CascadeType.ALL }) @JoinTable(name = "list_properties", joinColumns = @JoinColumn(name = "obj_id"), inverseJoinColumns = @JoinColumn(name = "property_id") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java index 6ccc0bd3d4..27dfdc47cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertyMap.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.any.annotations; import java.util.HashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.AnyMetaDef; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java index e1e8f21f13..012f1c1214 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySet.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.any.annotations; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; import org.hibernate.annotations.Any; import org.hibernate.annotations.AnyMetaDef; @@ -45,7 +45,7 @@ public class PropertySet { metaValues = { @MetaValue( value = "S", targetEntity = StringProperty.class ), @MetaValue( value = "I", targetEntity = IntegerProperty.class ) } ) - @Cascade( { org.hibernate.annotations.CascadeType.ALL } ) + @Cascade( { CascadeType.ALL } ) @JoinTable( name = "obj_properties", joinColumns = @JoinColumn( name = "obj_id" ), inverseJoinColumns = @JoinColumn( name = "property_id" ) ) public List getGeneralProperties() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java index 953b6fce15..981936dcd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/StringProperty.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ package org.hibernate.orm.test.any.annotations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Column; @Entity @Table(name="string_property") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/A.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/B.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java index fe86b12e00..55d2c66586 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java @@ -11,11 +11,11 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OptimisticLockException; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.Version; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.CockroachDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java index 6b4fa5cfd5..3b0f126dfb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.batch; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.lang.reflect.Field; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java index 076a1d98e3..2155f4a696 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java @@ -8,19 +8,19 @@ package org.hibernate.orm.test.batch; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java index cb3819bb48..7208e1f2a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.batch; import java.lang.reflect.Field; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java index 0ef79bd844..66e3a9e8b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java @@ -10,11 +10,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Version; import org.hibernate.annotations.Table; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java index e43de735bd..d486209518 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java @@ -5,11 +5,11 @@ import static org.junit.Assert.assertNotNull; import java.util.Map; -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; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction2.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest2.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Bid.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java index bd26e3bc64..be04858bba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** - * Test that makes sure the input stream inside {@link ConfigLoader#loadConfigXmlResource(java.lang.String)} + * Test that makes sure the input stream inside {@link ConfigLoader#loadConfigXmlResource(String)} * gets closed. * * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java index 6fa395bde2..90b2eae1d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.boot.database.qualfiedTableNaming; import java.sql.Connection; import java.sql.SQLException; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.relational.Namespace; @@ -77,7 +77,7 @@ public class QualifiedTableNamingTest extends BaseNonConfigCoreFunctionalTestCas } @Entity(name = "Box") - @javax.persistence.Table(name = "Box", schema = "PUBLIC", catalog = "DB1") + @jakarta.persistence.Table(name = "Box", schema = "PUBLIC", catalog = "DB1") public static class Box { @Id public Integer id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java index 29690097f4..1ec7d817a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.boot.jaxb.hbm.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java index 6699acad0b..55c565880a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/AttributeAccessorTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.AttributeAccessor; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java index 6fce0270ee..7ec932e3eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BaseFurniture.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.AccessType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.AccessType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java index d99ae059de..a9db2ac85e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Bed.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Transient; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java index 7d6f2da314..cc7d667a53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/BigBed.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java index b5fc1355de..0d0c388954 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Chair.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.Entity; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java index 9e338cc9d5..f2fa7ba968 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Closet.java @@ -8,7 +8,7 @@ // $Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java index f49ff54eb7..e4fb179b36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Foobar.java @@ -8,7 +8,7 @@ // $Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java index 85293ad09d..d2f692c49c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Furniture.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.AccessType; -import javax.persistence.Entity; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java index 65b5436a26..cfa9e058fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Gardenshed.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * This is the opposite of the Furniture test, as this tries to override the class Access(AccessType.PROPERTY) with @@ -24,7 +24,7 @@ import javax.persistence.Access; * @since 2007-05-31 */ @Entity -@Access(javax.persistence.AccessType.PROPERTY) +@Access(jakarta.persistence.AccessType.PROPERTY) public class Gardenshed extends Woody { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java index 22c86e1120..1f92fd1e68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Thingy.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java index 36808e7a4a..d180bd6305 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/Woody.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java index bde9c9d3e1..a318b9a33f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Animal.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java index 8062232ae0..2aef4399a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Bed.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java index f823c98b05..02713e1d97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Being.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java index 662ab23160..5fa33d928c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/BigBed.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java index eb2087430e..df6eb8b6d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Chair.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Entity; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java index d989ee1379..5dda35dc22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Circle.java @@ -8,10 +8,10 @@ //$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embedded; -import javax.persistence.Entity; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java index 0a0432a8d8..0cda242c26 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Color.java @@ -8,7 +8,7 @@ //$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java index 197727b2f4..01fbfa0f9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course1.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java index 9d92db7237..146563850a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course2.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java index 4f282b9969..59b6e3eaf5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course3.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java index 5199ff2314..e4b8c015a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course4.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java index 6e83340684..e5bdd6ec19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course5.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java index e644f64fd3..25a2953bea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course6.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java index 5c762da6b7..685c7f9eef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course7.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java index 35ea4f895e..c21e20fac8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Course8.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java index 46cf83fee0..4168f5918b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Furniture.java @@ -8,17 +8,17 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard */ @Entity -@Access(javax.persistence.AccessType.FIELD) +@Access(jakarta.persistence.AccessType.FIELD) public class Furniture extends Woody { @Id @GeneratedValue @@ -45,7 +45,7 @@ public class Furniture extends Woody { public long weight; - @Access(javax.persistence.AccessType.PROPERTY) + @Access(jakarta.persistence.AccessType.PROPERTY) public long getWeight() { return weight + 1; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java index aa58e33b8b..045da90875 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Gardenshed.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; /** * This is the opposite of the Furniture test, as this tries to override the class Access(AccessType.PROPERTY) with @@ -22,7 +22,7 @@ import javax.persistence.Transient; * @since 2007-05-31 */ @Entity -@Access(javax.persistence.AccessType.PROPERTY) +@Access(jakarta.persistence.AccessType.PROPERTY) public class Gardenshed extends Woody { @@ -51,7 +51,7 @@ public class Gardenshed // These 2 functions should not return in Hibernate, but the value should come from the field "floors" - @Access(javax.persistence.AccessType.FIELD) + @Access(jakarta.persistence.AccessType.FIELD) public long getFloors() { return this.floors + 2; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java index 3e92d6588e..2819ed7471 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Horse.java @@ -8,7 +8,7 @@ //$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java index 7645eb6f5c..2c91cc5317 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Person.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.Entity; +import jakarta.persistence.Access; +import jakarta.persistence.Entity; /** @@ -17,7 +17,7 @@ import javax.persistence.Entity; */ @Entity // explicitly override the access type to be property (default is field, see Being) -@Access(javax.persistence.AccessType.PROPERTY) +@Access(jakarta.persistence.AccessType.PROPERTY) public class Person extends Being { String firstname; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java index 5e031292db..272025d31d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Position.java @@ -8,9 +8,9 @@ //$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java index d008b4cc37..1e04a7b531 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Shape.java @@ -8,9 +8,9 @@ //$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java index 00d0cc440c..85ff9351b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Square.java @@ -8,10 +8,10 @@ //$Id: Being.java 18260 2009-12-17 21:14:07Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java index 9acae5b2eb..e7ed69503a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Student.java @@ -8,9 +8,9 @@ //$Id: AccessTest.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java index 7c644532eb..42c86b2c73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Thingy.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java index 6f00632fab..d4450d3599 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/User.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java index 8652b1e3e1..a8b3d6f9a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/Woody.java @@ -8,14 +8,14 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.jpa; -import javax.persistence.Access; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard */ @MappedSuperclass -@Access(javax.persistence.AccessType.PROPERTY) +@Access(jakarta.persistence.AccessType.PROPERTY) public class Woody extends Thingy { private String color; private String name; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java index 498977d1b1..bec910ddbc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Boy.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml; import java.util.Set; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java index 26920e9bd7..f4bac67a78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Cook.java @@ -8,9 +8,9 @@ // $Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java index 7f8fbc154d..725069a433 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Driver.java @@ -8,9 +8,9 @@ // $Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java index 8c1c6e001c..37107aefd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Knive.java @@ -8,7 +8,7 @@ // $Id: Waiter.java 18506 2010-01-11 20:23:08Z hardy.ferentschik $ package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java index 9c5b3a188d..ef69c8f80c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/RentalCar.java @@ -8,9 +8,9 @@ // $Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java index d95adf6589..2b89fb1255 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Tourist.java @@ -8,9 +8,9 @@ // $Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java index 34008e047b..d3254e2409 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/Waiter.java @@ -8,7 +8,7 @@ // $Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.access.xml; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java index 3fe12c95bf..af917f9e45 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/xml/XmlAccessTest.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import javax.persistence.AccessType; +import jakarta.persistence.AccessType; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java index e5945ebb04..1423d60efb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.associationOverride; -import javax.persistence.AssociationOverride; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java index 1f61029d7a..69e58e7f39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.associationOverride; -import javax.persistence.AssociationOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java index 01581d04e8..8b8064504f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.mapping.BasicValue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java index a7e7ecc4dc..3854810d8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java index 2ea8a48423..0ca7a96ec6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java @@ -8,18 +8,18 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides; import java.util.HashMap; import java.util.Map; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java index 034047a7b0..0b6271d40b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java @@ -7,16 +7,16 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.attributeOverrides; import java.util.List; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java index 9fc474ce43..b28b41ee95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/BagIdTypeResolutionTests.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.basics; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/CustomTypeResolutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/CustomTypeResolutionTests.java index a75c94eec8..495fbd1446 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/CustomTypeResolutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/CustomTypeResolutionTests.java @@ -14,9 +14,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java index f8352e2caf..c573278a8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.basics; import java.sql.Types; import java.util.function.Consumer; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.PersistentClass; @@ -34,8 +34,8 @@ import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.junit.jupiter.api.Test; -import static javax.persistence.EnumType.ORDINAL; -import static javax.persistence.EnumType.STRING; +import static jakarta.persistence.EnumType.ORDINAL; +import static jakarta.persistence.EnumType.STRING; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java index 75a3ca8294..bb038fec26 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java @@ -10,7 +10,7 @@ import java.time.Instant; import java.util.Date; import java.util.Iterator; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.SessionFactory; import org.hibernate.mapping.BasicValue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java index dcd793a0c5..6cdcaf0bdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java @@ -10,10 +10,10 @@ import java.sql.Clob; import java.sql.Types; import java.util.function.BiConsumer; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.annotations.JdbcType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java index 6cc1745c0d..6a7d05be63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/MapKeyJdbcTypeTests.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.basics.sql; import java.sql.Types; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcTypeCode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java index dc123cbd79..acf335159a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Address.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java index e01bd97afc..0d1ce2659f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/AddressType.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Kind of address (home, professional etc) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java index 10b7fb85f3..3f3ca40893 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Book.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.SecondaryTable; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.SecondaryTable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java index 3b814bfc38..d1c250a230 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/CorpType.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java index 56d73a5721..eb31f5457b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Country.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.io.Serializable; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * Non realistic embedded dependent object diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java index ef5a5e5937..f516bfffb3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Deal.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Embedded; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Embedded; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java index 25238aec7b..04dc114022 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java index 0a5ebb963a..714c3e9cf7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableB.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java index 1c719774e8..3412ad1793 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.util.HashSet; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java index b062ed50c7..0e570bf92e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.util.HashSet; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java index aaab1071bc..9f8f829ce6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EntityWithNestedEmbeddables.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; +import jakarta.persistence.Table; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java index b4649a60b3..300f0caffb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FavoriteThings.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Has collection of embeddable objects inside embeddable objects for testing HHH-4598 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java index 38d40786d2..1ec3fadd3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FixedLeg.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.text.NumberFormat; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * Represents fixed part of Interest Rate Swap cash flows. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java index 215a882628..c809c1dd27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/FloatLeg.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.text.NumberFormat; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * Represents floating part of Interest Rate Swap cash flows. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java index 46677c8feb..be6804e272 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetFavorites.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.util.Collection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class InternetFavorites { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java index 096c3acb70..2d44fb7bd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/InternetProvider.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java index bd87420370..9e19908367 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Leg.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * Represents a leg of a vanilla interest rate swap. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java index ec4ce5a04f..8dc2101b32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/LegalStructure.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.util.HashSet; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java index faa9d2864f..9ea1c22089 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Manager.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java index 5ec7e16c75..f90311f4fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Nationality.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java index c6c2594c9f..0bd53bc5aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/NotonialDeal.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java index c3c480bd23..72a6b6f86e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Person.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java index 732721dc18..dd5c882d55 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticle.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * A regional article is typically a bad design, it keep the country iso2 and a business key as diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java index 9466ac30a4..8383065867 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/RegionalArticlePk.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.io.Serializable; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * Regional article pk diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java index 7b3c17b2e2..c6b6548c5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/SpreadDeal.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; /** * Represents a "curve spread" deal that consists of diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java index eee803a959..61131dc694 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Summary.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.hibernate.annotations.Parent; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java index ee230dce8f..30133e1a28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/Swap.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; /** * Interest Rate Swap with Tenor. Used here to compose diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java index 81b9eeb67e..abc6b93cb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/URLFavorite.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class URLFavorite { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java index a8bbbfa996..1cd06c695a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/VanillaSwap.java @@ -5,11 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Represents an Interest Rate Swap. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java index 0131187a1f..a3dad560b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/WealthyPerson.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.embedded; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Index; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; @Entity public class WealthyPerson extends Person { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java index 275054f2bc..72eb89e537 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Addr.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Addr { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java index ba0af8a724..b01453061e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Address.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java index 80339a689a..1f420430da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Transaction; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java index 8e9f93de4d..9e353782c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/BlogEntry.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.AssociationOverride; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java index 1ceaf2d00e..14c4e834eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/ContactInfo.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java index d612dd00f2..86202502ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Employee.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; @Entity public class Employee { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java index 5366e60b97..261c3baf1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Entry.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java index 91aa578e8b..f82e5831f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/InheritedAttributeOverridingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java index 8a60237fe3..b698bd0e1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Location.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java index 9248be5d40..ed287bb67f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Move.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java index 813b4216f4..5af4fe3c61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PhoneNumber.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class PhoneNumber { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java index fa93acf994..06847ad86a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyInfo.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.math.BigDecimal; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java index c670b13fb9..459ddf2e2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/PropertyRecord.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java index 26009ec08a..0a44fecbbc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialSite.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; @Entity public class SocialSite { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java index c6b7121a91..b9253a798d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/SocialTouchPoints.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToMany; @Embeddable public class SocialTouchPoints { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java index 49b46d6eb2..39787e50f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/Trip.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.bootstrap.binding.annotations.override; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java index b7fbc12124..56e75f42d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/plural/orderby/compliance/OrderByMappingComplianceTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.plural.orderby.compliance; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java index 1a8f8b50e3..5f85388608 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.bootstrap.binding.mixed; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class AnnotationEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java index 1c0ca45444..4c32b7e087 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.bootstrap.jpa; import java.util.Collections; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; import javax.sql.DataSource; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java index 8965d3e3f2..cbe518a31b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java @@ -10,12 +10,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.metamodel.EntityType; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; import javax.sql.DataSource; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java index 5821375ada..997859a548 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/IntegerToVarcharConverter.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.bootstrap.scanning; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java index aae2bcc998..af4465d232 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java @@ -10,10 +10,10 @@ import java.io.File; import java.util.HashMap; import java.util.HashSet; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceException; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; @@ -473,4 +473,4 @@ public class PackagedEntityManagerTest extends PackagingTestCase { em.getTransaction().setRollbackOnly(); }); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java index e416619347..918a2168fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/Pasta.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ package org.hibernate.orm.test.bootstrap.scanning; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java index 7d7444bf81..2946c4449f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.bootstrap.scanning; import java.io.File; import java.io.InputStream; import java.util.HashMap; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.hibernate.boot.archive.scan.internal.StandardScanOptions; import org.hibernate.boot.archive.scan.internal.StandardScanParameters; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java index 4ab439bcbc..cb9d8a4c8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java index 6a9f078fd1..6d8d018da8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import java.time.YearMonth; import java.util.Map; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; import org.hibernate.boot.spi.MetadataBuilderContributor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java index cab0230a0b..326f6ce871 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddableAndMappedSuperclassTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy; import java.lang.reflect.Method; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker; import org.hibernate.bytecode.enhance.internal.tracker.SimpleFieldTracker; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java index 0809afa2ee..fd3ad7da12 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy; import java.lang.reflect.Method; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker; import org.hibernate.bytecode.enhance.internal.tracker.SimpleFieldTracker; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java index 492c8dbb11..cbba87b032 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy; import java.lang.reflect.Method; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker; import org.hibernate.bytecode.enhance.internal.tracker.SimpleFieldTracker; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java index 3b0fea279a..78b953bc26 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithMappedsuperclassTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.bytecode.enhance.internal.bytebuddy; import java.lang.reflect.Method; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.bytecode.enhance.internal.tracker.SimpleFieldTracker; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java index 63db4f64d3..41024ddcde 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java @@ -12,13 +12,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java index 13b5efc06c..14d0800331 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java @@ -12,18 +12,18 @@ import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; import java.util.List; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java index d75ce14998..01ca51c50d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java @@ -11,10 +11,10 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.Collections; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java index 960bfa6e8b..6be9af71f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java @@ -11,12 +11,12 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java index 3773007596..8c060bac92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java @@ -12,9 +12,9 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java index 44b39fb56f..81189cce1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java @@ -15,8 +15,8 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java index e479763061..2d2000dbdb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java @@ -13,10 +13,10 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java index 8ed74fa2d9..95fe6d3a25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java @@ -12,13 +12,13 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; import java.io.Serializable; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java index 3fa53e3b44..c71e35b8bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java @@ -12,10 +12,10 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.getFieldByReflection; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java index 5db0df2998..e15aba2606 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.bytecode.enhancement.basic; import static org.junit.Assert.assertEquals; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java index ae6fb32931..2096f502bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java @@ -12,9 +12,9 @@ import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.checkDirtyTracking; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.clearDirtyTracking; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java index bbf455156c..d8200915b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java @@ -12,10 +12,10 @@ import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.checkDirtyTracking; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.clearDirtyTracking; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java index d1b9c8a53f..158f58eefe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java @@ -8,10 +8,10 @@ import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; import org.junit.runner.RunWith; -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; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java index c19c4d28cb..a8e0f5793f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java @@ -10,14 +10,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.internal.SessionFactoryBuilderImpl; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; @@ -109,4 +109,4 @@ public class DirtyTrackingCollectionInDefaultFetchGroupTest extends BaseCoreFunc @OneToMany(mappedBy = "parent", cascade = CascadeType.PERSIST, fetch = FetchType.LAZY) Set someStringEntities; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java index b4e980eabf..23cb7a8cb5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java @@ -13,10 +13,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -83,4 +83,4 @@ public class DirtyTrackingCollectionTest extends BaseCoreFunctionalTestCase { @ElementCollection List someStrings; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java index 7ed375796c..d1a6039a30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java @@ -12,13 +12,13 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java index a92ec41081..448c6fd706 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java @@ -10,20 +10,20 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.boot.internal.SessionFactoryBuilderImpl; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; @@ -179,4 +179,4 @@ public class DirtyTrackingPersistTest extends BaseCoreFunctionalTestCase { aNumber = aNumber == null ? 0 : aNumber++; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java index 49dafbdde0..37d67da0d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java @@ -11,11 +11,11 @@ import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -157,4 +157,4 @@ public class DirtyTrackingTest { Long id; String name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java index 4cb552cd66..200759ef8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java @@ -13,11 +13,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java index fff1539283..6bfe89e5a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java @@ -17,12 +17,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; @@ -91,4 +91,4 @@ public class UnexpectedDeleteTest1 extends BaseCoreFunctionalTestCase { @Cascade( CascadeType.ALL ) Set bars = new HashSet<>(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java index 6b87214b68..b0712a6a38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java @@ -14,12 +14,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; @@ -90,4 +90,4 @@ public class UnexpectedDeleteTest2 extends BaseCoreFunctionalTestCase { @GeneratedValue Long id; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java index 2c201d65f2..0e437e1776 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java @@ -14,13 +14,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -131,4 +131,4 @@ public class UnexpectedDeleteTest3 extends BaseCoreFunctionalTestCase { children.add( child ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java index e1d91879f2..4313ef8f93 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.bytecode.enhancement.lazy; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java index decab9a008..9887834e5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java @@ -16,16 +16,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Query; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Query; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; @@ -142,4 +142,4 @@ public class LazyCollectionDeletedTest extends BaseCoreFunctionalTestCase { @MapsId Post post; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java index 98a1c9ab96..1ab0d9e647 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java @@ -18,15 +18,15 @@ import static org.junit.Assert.assertFalse; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.proxy.HibernateProxy; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java index 330969b245..4a94c34938 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.bytecode.enhance.spi.UnloadedClass; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java index c92b331eae..2087efdab6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java @@ -17,14 +17,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java index a2e0943ef8..7e5539f80f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java @@ -16,13 +16,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.HashSet; import java.util.Objects; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java index 6f90bc7027..01c6a49952 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java @@ -22,13 +22,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java index a9b962aea0..8f359bd468 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.internal.SessionFactoryBuilderImpl; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; @@ -95,4 +95,4 @@ public class MultipleBagsInLazyFetchGroupTest extends BaseCoreFunctionalTestCase @ElementCollection(fetch = FetchType.EAGER) List someStrings2; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java index 8af8bd810e..9c043ef923 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java @@ -19,14 +19,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java index a3e872d4fd..9cda2c8980 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java @@ -2,15 +2,15 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.cache; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java index 655b5368d3..5c73ab7c67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.bytecode.enhancement.lazy.cache; -import javax.persistence.Basic; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java index 906ed6438c..437674f19d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java @@ -13,11 +13,11 @@ */ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.ObjectNotFoundException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java index c566baaeaf..16e2cd2d54 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java index 64c40c3dee..ec45458a5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java @@ -9,18 +9,18 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; import java.sql.Blob; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyGroup; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java index d2bb914c34..577248cb6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.SessionFactoryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java index 1934f780b3..869c194c62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecki import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java index 91eb3b7bca..c5968e18bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java @@ -10,14 +10,14 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecki import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Query; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Query; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java index 066d8080af..15dcc96196 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java @@ -3,13 +3,13 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecki import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.FlushMode; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java index 8b53e58d22..d408e01d40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java @@ -13,17 +13,17 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import java.util.Arrays; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java index 4ede7ab40e..d9e2de124b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.bytecode.enhancement.merge; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java index 8649d9d95c..cd08dda6ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.bytecode.enhancement.merge; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java index a2cb984b9b..76d229a391 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.bytecode.enhancement.merge; import java.util.HashSet; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java index f554414f84..6b01954b9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java @@ -14,14 +14,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java index 3c5dc1d65f..b15d898347 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.bytecode.enhancement.merge; import java.util.HashSet; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java index f342b35f9d..c6b050f5f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java @@ -10,7 +10,7 @@ package org.hibernate.orm.test.bytecode.enhancement.mutable; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; public class MapStringConverter implements AttributeConverter, String> { @@ -36,4 +36,4 @@ public class MapStringConverter implements AttributeConverter. */ package org.hibernate.orm.test.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java index 26647f655b..7aa1ecbd61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.cache; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java index 293ab78885..5d6392f323 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Company.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.cache; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java index 9b797bc467..350f0a7607 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Continent.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.cache; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java index 4edc8a22b8..b70ea6d102 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/Country.java @@ -6,19 +6,19 @@ */ package org.hibernate.orm.test.cache; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @Entity @Cacheable -@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) +@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) public class Country { private Long id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java index c7edc56b10..b558b384cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/EntityUpdateCacheModeIgnoreTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.cache; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java index a8e0ad1f52..1c4c6c4616 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java @@ -2,12 +2,12 @@ package org.hibernate.orm.test.cache; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java index bf423a8510..b604c55f25 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.cache; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.SharedCacheMode; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java index 7e26a4ee4e..8930c3ebd2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.cache; import java.util.HashMap; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.SharedCacheMode; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java index 8ab2ad3bda..8765c0d5c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cache; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java index d81fec4602..6fb14af5b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.cache; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RegionNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RegionNameTest.java index 909ba940a7..c1a679fe57 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RegionNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RegionNameTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.cache; import java.util.List; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java index 84824b16b2..099681b7b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.cache; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; import org.hibernate.Hibernate; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java index 93b8623e59..f73afc14a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cache; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java index 7afd22dbc8..1956310f4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/User.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.cache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java index da2f079f8b..4409e6111f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/It.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.cache.cid; import java.io.Serializable; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java index c15360cd66..1f8f5d1e04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/ItWithPkClass.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.cache.cid; import java.io.Serializable; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java index 63355033f1..c680f85614 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/cid/NonAggregatedCompositeIdCachingTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cache.cid; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/AbstractCachedItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/AbstractCachedItem.java index f9ca691ed3..847ffaf0ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/AbstractCachedItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/AbstractCachedItem.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.cache.polymorphism; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java index 988b50da73..03edd6ab13 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem1.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cache.polymorphism; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java index ec81e2c967..f907f2d5ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/CachedItem2.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cache.polymorphism; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java index 0ad93db70b..46972267ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/CacheKeyImplementationHashCodeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.caching.mocked; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java index a660b8a79b..1eb3e6cc8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.caching.mocked; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java old mode 100755 new mode 100644 index baf0762173..269cec8c3f --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.cascade; import java.util.HashSet; import java.util.Set; -import javax.persistence.OneToMany; +import jakarta.persistence.OneToMany; public class A { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java index fb83e514ed..7b658326b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxyEntityCopyAllowedTest.java @@ -11,21 +11,21 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Transient; -import javax.persistence.TypedQuery; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.Version; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java index af37fe02df..28a100b454 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeMergeToProxySimpleTest.java @@ -10,15 +10,15 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/G.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java old mode 100755 new mode 100644 index 2f31fce7ee..5f8ead4c5c --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java @@ -10,8 +10,8 @@ package org.hibernate.orm.test.cascade; import java.util.HashSet; import java.util.Set; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; public class H { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java index 6b669d037e..3730a96b9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.cascade; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java index ed48d8489a..8fddd81e4d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java @@ -11,17 +11,17 @@ import static org.junit.Assert.assertFalse; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java index 3fc25a2ea4..3360f1f11e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java @@ -10,17 +10,17 @@ import java.sql.Statement; import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java index 50bb27b580..4fea49250c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.cascade.circle; import java.util.Iterator; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.JDBCException; import org.hibernate.PropertyValueException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java index 7b71dc5466..2158615f88 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/ConverterBean.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cdi.converters; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Steve Ebersole @@ -14,7 +14,7 @@ import javax.persistence.AttributeConverter; public class ConverterBean implements AttributeConverter { private final MonitorBean monitor; - @javax.inject.Inject + @jakarta.inject.Inject public ConverterBean(MonitorBean monitor) { this.monitor = monitor; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java index 72c194b552..f8f8b8b2c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/TheEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.converters; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java index e49d90653a..3472b91b84 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.converters.delayed; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java index d6e70e3c12..efc04c92be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/AddTenConverter.java @@ -30,7 +30,7 @@ */ package org.hibernate.orm.test.cdi.converters.legacy; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * This converter adds 10 to each integer stored in the database, and remove diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java index 28866aa5e6..25e4939675 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/BigDecimalToStringConverter.java @@ -32,7 +32,7 @@ package org.hibernate.orm.test.cdi.converters.legacy; import java.math.BigDecimal; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Etienne Miret diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java index f81c743acb..bbc9c59347 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java @@ -35,13 +35,13 @@ import static org.junit.Assert.assertEquals; import java.math.BigDecimal; import java.math.RoundingMode; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java index a283bee85d..67c2a2ebeb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/Item.java @@ -32,10 +32,10 @@ package org.hibernate.orm.test.cdi.converters.legacy; import java.math.BigDecimal; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Etienne Miret diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java index d94734e004..00d34f368b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java @@ -35,18 +35,18 @@ import static org.junit.Assert.assertNotNull; import java.util.List; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.Query; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.Query; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java index 8c4881bf9e..766f0e280d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/standard/CdiHostedConverterTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.converters.standard; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java index 1c3ef783ef..40cf4e960a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.cdi.events; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java index 3727a848d1..833bf15010 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/TheListener.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cdi.events; -import javax.persistence.PrePersist; +import jakarta.persistence.PrePersist; /** * @author Steve Ebersole @@ -14,7 +14,7 @@ import javax.persistence.PrePersist; public class TheListener { private final Monitor monitor; - @javax.inject.Inject + @jakarta.inject.Inject public TheListener(Monitor monitor) { this.monitor = monitor; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java index db6ba852ef..5c2e48b2e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/delayed/DelayedCdiSupportTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.events.delayed; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java index 83dfe1ba5c..a4c8145e97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/extended/ValidExtendedCdiSupportTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.events.extended; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java index 4bae7fc552..7f3c16dd37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/nocdi/ValidNoCdiSupportTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.cdi.events.nocdi; import java.util.concurrent.atomic.AtomicInteger; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.Id; -import javax.persistence.PrePersist; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java index d968da3e43..65cfb75839 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/events/standard/StandardCdiSupportTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.events.standard; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java index eada372283..b52cfd40ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/DelayedMixedAccessTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cdi.general.mixed; -import javax.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainer; import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java index 227c582f87..dfae438b39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ExtendedMixedAccessTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.general.mixed; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java index 4de15fa339..ee8a3f430e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/Helper.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.general.mixed; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java index b681150765..c2ed28192a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/HostedBean.java @@ -12,7 +12,7 @@ package org.hibernate.orm.test.cdi.general.mixed; public class HostedBean { private final InjectedHostedBean injectedHostedBean; - @javax.inject.Inject + @jakarta.inject.Inject public HostedBean(InjectedHostedBean injectedHostedBean) { this.injectedHostedBean = injectedHostedBean; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java index dfa29c8332..daab663fff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/mixed/ImmediateMixedAccessTests.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cdi.general.mixed; -import javax.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainer; import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java index c8f67aee28..5bfaceccbc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedApplicationScopedBeanImpl.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; /** * @author Yoann Rodiere @@ -19,7 +19,7 @@ import javax.inject.Named; public class TheAlternativeNamedApplicationScopedBeanImpl implements TheNamedApplicationScopedBean { public static final String NAME = "TheAlternativeNamedApplicationScopedBeanImpl_name"; - @javax.inject.Inject + @jakarta.inject.Inject private TheNestedDependentBean nestedDependentBean; public TheAlternativeNamedApplicationScopedBeanImpl() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java index 578381475a..21cb63f8d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheAlternativeNamedDependentBeanImpl.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Named; /** * @author Yoann Rodiere @@ -19,7 +19,7 @@ import javax.inject.Named; public class TheAlternativeNamedDependentBeanImpl implements TheNamedDependentBean { public static final String NAME = "TheAlternativeNamedDependentBeanImpl_name"; - @javax.inject.Inject + @jakarta.inject.Inject private TheNestedDependentBean nestedDependentBean; public TheAlternativeNamedDependentBeanImpl() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java index c4b6ffe9ef..94d5d637ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheApplicationScopedBean.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Yoann Rodiere @@ -16,7 +16,7 @@ import javax.enterprise.context.ApplicationScoped; @ApplicationScoped public class TheApplicationScopedBean { - @javax.inject.Inject + @jakarta.inject.Inject private TheNestedDependentBean nestedDependentBean; public TheApplicationScopedBean() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheDependentBean.java index 3166f4f348..9a9f0d130f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheDependentBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheDependentBean.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; /** * @author Yoann Rodiere */ @Dependent public class TheDependentBean { - @javax.inject.Inject + @jakarta.inject.Inject private TheNestedDependentBean dependentBean; public TheDependentBean() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheEntity.java index 9dcbd63e33..dde81a4697 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java index 0ebcb03103..0ae94c120d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedApplicationScopedBeanImpl.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; /** * @author Yoann Rodiere @@ -19,7 +19,7 @@ import javax.inject.Named; public class TheMainNamedApplicationScopedBeanImpl implements TheNamedApplicationScopedBean { public static final String NAME = "TheMainNamedApplicationScopedBeanImpl_name"; - @javax.inject.Inject + @jakarta.inject.Inject private TheNestedDependentBean nestedDependentBean; public TheMainNamedApplicationScopedBeanImpl() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java index 4f6a5a2235..60e3f793fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheMainNamedDependentBeanImpl.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Named; /** * @author Yoann Rodiere @@ -19,7 +19,7 @@ import javax.inject.Named; public class TheMainNamedDependentBeanImpl implements TheNamedDependentBean { public static final String NAME = "TheMainNamedDependentBeanImpl_name"; - @javax.inject.Inject + @jakarta.inject.Inject private TheNestedDependentBean nestedDependentBean; public TheMainNamedDependentBeanImpl() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java index 5cbeb15d3a..730160989c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNestedDependentBean.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; /** * A dependent bean required by other beans, but never requested directly diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java index 430476ddd5..2f5389be35 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheNonHibernateBeanConsumer.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Singleton; /** * Simulates CDI bean consumers outside of Hibernate ORM @@ -22,7 +22,7 @@ import javax.inject.Singleton; public class TheNonHibernateBeanConsumer { public static final String NAME = "TheAlternativeNamedApplicationScopedBeanImpl_name"; - @javax.inject.Inject + @jakarta.inject.Inject private TheSharedApplicationScopedBean sharedApplicationScopedBean; @PostConstruct diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java index bd2d5dedbd..a61337df76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheReflectionInstantiatedBean.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; /** * @author Yoann Rodiere diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java index f723ef0c88..a32fbea78f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/TheSharedApplicationScopedBean.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Yoann Rodiere @@ -16,7 +16,7 @@ import javax.enterprise.context.ApplicationScoped; @ApplicationScoped public class TheSharedApplicationScopedBean { - @javax.inject.Inject + @jakarta.inject.Inject private TheNestedDependentBean nestedDependentBean; public TheSharedApplicationScopedBean() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java index 32597b2915..04c5cdb8e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/delayed/NonRegistryManagedDelayedCdiSupportTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged.delayed; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java index a19778c4f1..9cfce2d4f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/extended/NonRegistryManagedExtendedCdiSupportTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged.extended; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java index b502ee96df..8cb2d3510d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/general/nonregistrymanaged/standard/NonRegistryManagedStandardCdiSupportTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cdi.general.nonregistrymanaged.standard; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java index 0242e4ba8e..c2e4d87b1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManager.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cdi.testsupport; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; public interface TestingExtendedBeanManager { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java index 395e163a2a..8d5cadf258 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingExtendedBeanManagerImpl.java @@ -6,17 +6,17 @@ */ package org.hibernate.orm.test.cdi.testsupport; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.resource.beans.container.spi.ExtendedBeanManager; class TestingExtendedBeanManagerImpl implements TestingExtendedBeanManager, ExtendedBeanManager { - private ExtendedBeanManager.LifecycleListener lifecycleListener; + private LifecycleListener lifecycleListener; @Override - public void registerLifecycleListener(ExtendedBeanManager.LifecycleListener lifecycleListener) { + public void registerLifecycleListener(LifecycleListener lifecycleListener) { if ( this.lifecycleListener != null ) { throw new RuntimeException( "LifecycleListener already registered" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java index 4bcf2a703b..4aba198886 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/testsupport/TestingLegacyExtendedBeanManagerImpl.java @@ -6,17 +6,17 @@ */ package org.hibernate.orm.test.cdi.testsupport; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.hibernate.jpa.event.spi.jpa.ExtendedBeanManager; class TestingLegacyExtendedBeanManagerImpl - implements TestingExtendedBeanManager, org.hibernate.jpa.event.spi.jpa.ExtendedBeanManager { + implements TestingExtendedBeanManager, ExtendedBeanManager { - private ExtendedBeanManager.LifecycleListener lifecycleListener; + private LifecycleListener lifecycleListener; @Override - public void registerLifecycleListener(ExtendedBeanManager.LifecycleListener lifecycleListener) { + public void registerLifecycleListener(LifecycleListener lifecycleListener) { if ( this.lifecycleListener != null ) { throw new RuntimeException( "LifecycleListener already registered" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java index b358d92acf..f0011d64c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.cfg; import static org.junit.Assert.assertTrue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java index 8595dfe425..317fb2e408 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.Enumeration; import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java index eadd8443b4..977eef325a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/WrongCircularityDetectionTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.cfg; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java index 91a05361a8..feb9f16bfb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.cfg.cache; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Immutable; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java index 3dcaeef18a..dd828c1b29 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.cfg.cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Immutable; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java index ecf158726a..fb57661974 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Gate.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cfg.persister; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java index 80924b5921..fc8b49026b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java @@ -703,7 +703,7 @@ public class GoofyPersisterClassProvider implements PersisterClassResolver { } @Override - public java.util.List getAttributeMappings() { + public List getAttributeMappings() { return null; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java index 4efdc2cca5..aef82db17a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Palmtree.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.cfg.persister; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java index 32bcbf5806..1b7ffaabf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Portal.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.cfg.persister; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Persister; import org.hibernate.persister.entity.SingleTableEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java index de22bf0417..5664e21417 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Tree.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cfg.persister; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java index da9ccea3cc..a23b3fd0ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/Window.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.cfg.persister; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Persister; import org.hibernate.persister.entity.SingleTableEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java index 2004e27d4d..4dd73164a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.classloader; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java index c0c9829f1d..0b65cf0dce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagDuplicatesTest.java @@ -17,13 +17,13 @@ package org.hibernate.orm.test.collection.bag; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java index af0d451164..6dd8e3a156 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.collection.bag; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java index d306e4ea62..b45b10bf53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchHqlTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.collection.bag; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.loader.MultipleBagFetchException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java index 7a13d81268..5094d26b08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/MultipleBagFetchTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.collection.bag; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java index 2c53b01c2f..edaeb9a7d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.collection.bag; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java index c0745b08c5..f533b0b4c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/Contact.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.collection.basic; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; @Entity @Table(name="contact") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java index f38f0b4625..cd21f642fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/EmailAddress.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.collection.basic; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; @Embeddable public class EmailAddress implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java index bba2c86de5..070ec599b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/User.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.collection.basic; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="users") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java index fec6b8a0f7..d3450bac93 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationNoCascadeTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.collection.delayedOperation; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.collection.internal.AbstractPersistentCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java index 20f1e1f1c9..687fb8cbbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.collection.delayedOperation; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.collection.internal.AbstractPersistentCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java index 65fc9ce6a7..95acf31da2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java @@ -12,15 +12,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityExistsException; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.collection.internal.AbstractPersistentCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java index 79dcb6b301..902558401c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListAddTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.collection.delayedOperation; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.LazyInitializationException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java index 811f4403a7..7cd2a947ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.collection.delayedOperation; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java index 29ddf9652c..6cbe2aff84 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.collection.delayedOperation; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java index 2fea93a5bf..61307060c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/Many.java @@ -23,9 +23,9 @@ */ package org.hibernate.orm.test.collection.dereferenced; -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 Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java index 7114bfeacd..afbe934278 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeOne.java @@ -24,12 +24,12 @@ package org.hibernate.orm.test.collection.dereferenced; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java index 61a93b1740..4b6bd6f76e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeOne.java @@ -24,11 +24,11 @@ package org.hibernate.orm.test.collection.dereferenced; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java index 66408c207e..2a03c08710 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeOne.java @@ -24,13 +24,13 @@ package org.hibernate.orm.test.collection.dereferenced; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java index d5acea8522..bc7d307c49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeOne.java @@ -24,12 +24,12 @@ package org.hibernate.orm.test.collection.dereferenced; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java index 0aabac8cca..334b197e78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.collection.idbag; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java index 2ea96a0d30..7f106ff309 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.collection.list; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java index 9b9f070385..566c35dc42 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java @@ -8,17 +8,17 @@ package org.hibernate.orm.test.collection.list; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java index a9e3c09192..bf6b6c11d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.collection.map; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java index 6a8b102b8e..9f49acc479 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/LocalizedString.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.collection.map; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class LocalizedString { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java index 21827e0fb1..f98b2225be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.collection.map; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java index 7b581c23af..26ded8d5b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualString.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.collection.map; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; @Entity @Table(name = "multilingual") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java index 0f96406fdd..89190ccf0c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MultilingualStringParent.java @@ -1,6 +1,6 @@ package org.hibernate.orm.test.collection.map; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "multilingual_parent") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java index 7b74720702..2b5ad7dd8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java @@ -10,17 +10,17 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.collection.internal.PersistentMap; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java index 794195a410..08b5147d1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapHolder.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.collection.map.hhh7557; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.Table; import java.util.Map; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java index b6ddced343..7230a38902 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapKey.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.collection.map.hhh7557; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java index 381bf17797..71d562e730 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/MapValue.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.collection.map.hhh7557; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java index 0e80e1a833..f0aaad1237 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java @@ -25,13 +25,13 @@ package org.hibernate.orm.test.collection.multisession; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java index 0f6dbccd6d..d49ff3c593 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java @@ -25,13 +25,13 @@ package org.hibernate.orm.test.collection.multisession; 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.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.collection.internal.AbstractPersistentCollection; import org.hibernate.collection.internal.PersistentSet; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java index 7dac2b2ddf..3bd7d1880e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/nonInsertable/NonInsertableColumnTest.java @@ -2,13 +2,13 @@ package org.hibernate.orm.test.collection.nonInsertable; import java.util.Arrays; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java index 598968f0fc..76ef13681d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Animal.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.collection.ordered.joinedInheritence; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java index 08e5bd35f8..4400b00e8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Lion.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.collection.ordered.joinedInheritence; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java index d3b0648b01..df426ce10b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Tiger.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.collection.ordered.joinedInheritence; -import javax.persistence.Embeddable; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java index fc252d9eb9..3091306dac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/ordered/joinedInheritence/Zoo.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.collection.ordered.joinedInheritence; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import java.util.HashSet; import java.util.Set; @@ -58,7 +58,7 @@ public class Zoo { @OneToMany @JoinColumn - @javax.persistence.OrderBy( "details" ) + @jakarta.persistence.OrderBy( "details" ) public Set getTigers() { return tigers; } @@ -80,7 +80,7 @@ public class Zoo { @OneToMany @JoinColumn - @javax.persistence.OrderBy( "id asc" ) // HHH-7630 ensure explicitly naming the superclass id works + @jakarta.persistence.OrderBy( "id asc" ) // HHH-7630 ensure explicitly naming the superclass id works public Set getAnimalsById() { return animals; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java old mode 100755 new mode 100644 index 34cb3931bf..318fc5defd --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.collection.original; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Hibernate; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Email.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Email.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Permission.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Permission.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/UserPermissions.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/UserPermissions.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java index b1e21d434e..17b35228d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.collection.propertyref; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java index 1129fd3fc8..cff9876e90 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.collection.set; import java.util.HashSet; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.CacheMode; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java index 1e6af45952..0d6474113c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.collection.set; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java index d1482469e3..702c6c5944 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ATable.java @@ -1,102 +1,102 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.collectionalias; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; - -/** - * @author Dave Stephan - */ -@Entity -public class ATable implements Serializable -{ - private Integer firstId; - - private List tablebs = new ArrayList(); - - public ATable() - { - } - - /** minimal constructor */ - public ATable(Integer firstId) - { - this.firstId = firstId; - } - - @Id - @Column(name = "idcolumn", nullable = false) - public Integer getFirstId() - { - return this.firstId; - } - - public void setFirstId(Integer firstId) - { - this.firstId = firstId; - } - - @Override - public int hashCode() - { - final int prime = 31; - int result = 1; - result = prime * result + ((firstId == null) ? 0 : firstId.hashCode()); - result = prime * result + ((tablebs == null) ? 0 : tablebs.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ATable other = (ATable) obj; - if (firstId == null) - { - if (other.firstId != null) - return false; - } - else if (!firstId.equals(other.firstId)) - return false; - if (tablebs == null) - { - if (other.tablebs != null) - return false; - } - else if (!tablebs.equals(other.tablebs)) - return false; - return true; - } - - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tablea") - public List getTablebs() - { - return tablebs; - } - - public void setTablebs(List tablebs) - { - this.tablebs = tablebs; - } - - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.collectionalias; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; + +/** + * @author Dave Stephan + */ +@Entity +public class ATable implements Serializable +{ + private Integer firstId; + + private List tablebs = new ArrayList(); + + public ATable() + { + } + + /** minimal constructor */ + public ATable(Integer firstId) + { + this.firstId = firstId; + } + + @Id + @Column(name = "idcolumn", nullable = false) + public Integer getFirstId() + { + return this.firstId; + } + + public void setFirstId(Integer firstId) + { + this.firstId = firstId; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((firstId == null) ? 0 : firstId.hashCode()); + result = prime * result + ((tablebs == null) ? 0 : tablebs.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ATable other = (ATable) obj; + if (firstId == null) + { + if (other.firstId != null) + return false; + } + else if (!firstId.equals(other.firstId)) + return false; + if (tablebs == null) + { + if (other.tablebs != null) + return false; + } + else if (!tablebs.equals(other.tablebs)) + return false; + return true; + } + + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tablea") + public List getTablebs() + { + return tablebs; + } + + public void setTablebs(List tablebs) + { + this.tablebs = tablebs; + } + + +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java index cd7a9492bc..d6a0bd1716 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableA.java @@ -1,96 +1,96 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.collectionalias; - -import javax.persistence.Entity; -import javax.persistence.Id; - -/** - * @author Dave Stephan - */ -@Entity -public class TableA -{ - @Id - private int id; - - private String test; - - private String test2; - - @Override - public int hashCode() - { - final int prime = 31; - int result = 1; - result = prime * result + id; - result = prime * result + ((test == null) ? 0 : test.hashCode()); - result = prime * result + ((test2 == null) ? 0 : test2.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TableA other = (TableA) obj; - if (id != other.id) - return false; - if (test == null) - { - if (other.test != null) - return false; - } - else if (!test.equals(other.test)) - return false; - if (test2 == null) - { - if (other.test2 != null) - return false; - } - else if (!test2.equals(other.test2)) - return false; - return true; - } - - public String getTest2() - { - return test2; - } - - public void setTest2(String test2) - { - this.test2 = test2; - } - - public String getTest() - { - return test; - } - - public void setTest(String test) - { - this.test = test; - } - - public int getId() - { - return id; - } - - public void setId(int id) - { - this.id = id; - } - - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.collectionalias; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + +/** + * @author Dave Stephan + */ +@Entity +public class TableA +{ + @Id + private int id; + + private String test; + + private String test2; + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + id; + result = prime * result + ((test == null) ? 0 : test.hashCode()); + result = prime * result + ((test2 == null) ? 0 : test2.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TableA other = (TableA) obj; + if (id != other.id) + return false; + if (test == null) + { + if (other.test != null) + return false; + } + else if (!test.equals(other.test)) + return false; + if (test2 == null) + { + if (other.test2 != null) + return false; + } + else if (!test2.equals(other.test2)) + return false; + return true; + } + + public String getTest2() + { + return test2; + } + + public void setTest2(String test2) + { + this.test2 = test2; + } + + public String getTest() + { + return test; + } + + public void setTest(String test) + { + this.test = test; + } + + public int getId() + { + return id; + } + + public void setId(int id) + { + this.id = id; + } + + +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java index 99f650bfd8..603b354618 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableB.java @@ -1,101 +1,101 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.collectionalias; - -import java.io.Serializable; - -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; - -/** - * @author Dave Stephan - */ -@Entity -public class TableB implements Serializable -{ - - private TableBId id; - - private ATable tablea; - - public TableB() { - } - - /** full constructor */ - public TableB(TableBId id) { - this.id = id; - } - - // Property accessors - @EmbeddedId - @AttributeOverrides( { - @AttributeOverride(name = "firstId", column = @Column(name = "idcolumn", nullable = false)), - @AttributeOverride(name = "secondId", column = @Column(name = "idcolumn_second", nullable = false, length = 50)), - @AttributeOverride(name = "thirdId", column = @Column(name = "thirdcolumn", nullable = false, length = 20)) }) - public TableBId getId() { - return this.id; - } - - @Override - public int hashCode() - { - final int prime = 31; - int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((tablea == null) ? 0 : tablea.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TableB other = (TableB) obj; - if (id == null) - { - if (other.id != null) - return false; - } - else if (!id.equals(other.id)) - return false; - if (tablea == null) - { - if (other.tablea != null) - return false; - } - else if (!tablea.equals(other.tablea)) - return false; - return true; - } - - public void setId(TableBId id) { - this.id = id; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumns( { @JoinColumn(name = "idcolumn", referencedColumnName = "idcolumn", nullable = false, insertable = false, updatable = false) }) - public ATable getTablea() { - return tablea; - } - - public void setTablea(ATable tablea) { - this.tablea = tablea; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.collectionalias; + +import java.io.Serializable; + +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; + +/** + * @author Dave Stephan + */ +@Entity +public class TableB implements Serializable +{ + + private TableBId id; + + private ATable tablea; + + public TableB() { + } + + /** full constructor */ + public TableB(TableBId id) { + this.id = id; + } + + // Property accessors + @EmbeddedId + @AttributeOverrides( { + @AttributeOverride(name = "firstId", column = @Column(name = "idcolumn", nullable = false)), + @AttributeOverride(name = "secondId", column = @Column(name = "idcolumn_second", nullable = false, length = 50)), + @AttributeOverride(name = "thirdId", column = @Column(name = "thirdcolumn", nullable = false, length = 20)) }) + public TableBId getId() { + return this.id; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((tablea == null) ? 0 : tablea.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TableB other = (TableB) obj; + if (id == null) + { + if (other.id != null) + return false; + } + else if (!id.equals(other.id)) + return false; + if (tablea == null) + { + if (other.tablea != null) + return false; + } + else if (!tablea.equals(other.tablea)) + return false; + return true; + } + + public void setId(TableBId id) { + this.id = id; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumns( { @JoinColumn(name = "idcolumn", referencedColumnName = "idcolumn", nullable = false, insertable = false, updatable = false) }) + public ATable getTablea() { + return tablea; + } + + public void setTablea(ATable tablea) { + this.tablea = tablea; + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java index 6246621a1d..2efb187eda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/TableBId.java @@ -1,116 +1,116 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.collectionalias; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Embeddable; - -/** - * @author Dave Stephan - */ -@Embeddable -public class TableBId implements Serializable -{ - private static final long serialVersionUID = 1L; - - // Fields - - private Integer firstId; - - private String secondId; - - private String thirdId; - - // Constructors - - /** default constructor */ - public TableBId() { - } - - /** full constructor */ - public TableBId(Integer firstId, String secondId, String thirdId) { - this.firstId = firstId; - this.secondId = secondId; - this.thirdId = thirdId; - } - - // Property accessors - - @Column(name = "idcolumn", nullable = false) - public Integer getFirstId() { - return this.firstId; - } - - public void setFirstId(Integer firstId) { - this.firstId = firstId; - } - - @Column(name = "idcolumn_second", nullable = false, length = 50) - public String getSecondId() { - return this.secondId; - } - - public void setSecondId(String secondId) { - this.secondId = secondId; - } - - @Column(name = "thirdcolumn", nullable = false, length = 50) - public String getThirdId() { - return this.thirdId; - } - - public void setThirdId(String thirdId) { - this.thirdId = thirdId; - } - - @Override - public int hashCode() - { - final int prime = 31; - int result = 1; - result = prime * result + ((firstId == null) ? 0 : firstId.hashCode()); - result = prime * result + ((secondId == null) ? 0 : secondId.hashCode()); - result = prime * result + ((thirdId == null) ? 0 : thirdId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TableBId other = (TableBId) obj; - if (firstId == null) - { - if (other.firstId != null) - return false; - } - else if (!firstId.equals(other.firstId)) - return false; - if (secondId == null) - { - if (other.secondId != null) - return false; - } - else if (!secondId.equals(other.secondId)) - return false; - if (thirdId == null) - { - if (other.thirdId != null) - return false; - } - else if (!thirdId.equals(other.thirdId)) - return false; - return true; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.collectionalias; + +import java.io.Serializable; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +/** + * @author Dave Stephan + */ +@Embeddable +public class TableBId implements Serializable +{ + private static final long serialVersionUID = 1L; + + // Fields + + private Integer firstId; + + private String secondId; + + private String thirdId; + + // Constructors + + /** default constructor */ + public TableBId() { + } + + /** full constructor */ + public TableBId(Integer firstId, String secondId, String thirdId) { + this.firstId = firstId; + this.secondId = secondId; + this.thirdId = thirdId; + } + + // Property accessors + + @Column(name = "idcolumn", nullable = false) + public Integer getFirstId() { + return this.firstId; + } + + public void setFirstId(Integer firstId) { + this.firstId = firstId; + } + + @Column(name = "idcolumn_second", nullable = false, length = 50) + public String getSecondId() { + return this.secondId; + } + + public void setSecondId(String secondId) { + this.secondId = secondId; + } + + @Column(name = "thirdcolumn", nullable = false, length = 50) + public String getThirdId() { + return this.thirdId; + } + + public void setThirdId(String thirdId) { + this.thirdId = thirdId; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((firstId == null) ? 0 : firstId.hashCode()); + result = prime * result + ((secondId == null) ? 0 : secondId.hashCode()); + result = prime * result + ((thirdId == null) ? 0 : thirdId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TableBId other = (TableBId) obj; + if (firstId == null) + { + if (other.firstId != null) + return false; + } + else if (!firstId.equals(other.firstId)) + return false; + if (secondId == null) + { + if (other.secondId != null) + return false; + } + else if (!secondId.equals(other.secondId)) + return false; + if (thirdId == null) + { + if (other.thirdId != null) + return false; + } + else if (!thirdId.equals(other.thirdId)) + return false; + return true; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java index 03845bb1ce..bcb458e373 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.columntransformer; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.MySQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java index dcd6966a1a..ee6f25f4f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/Staff.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.columntransformer; import java.util.List; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.ColumnTransformer; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java index 18118abfa7..245c1ccee1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.comments; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java index 797e7abd0e..fafc868726 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/TestEntity2.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.comments; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java index 208d6ceb87..3432630b31 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.comments; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CompoundSelection; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java index 31884b6a00..9489173cc0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java @@ -1,15 +1,15 @@ package org.hibernate.orm.test.component; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import org.hibernate.orm.test.array.B; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java index f702d69b33..025cd64e8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.component.basic; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java index b1e2d3f0f9..be41e4d1a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Component.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.component.basic2; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java index 53fbae5467..2cd9723bf3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Name.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.component.basic2; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java index e47dd028f1..9f6939cd57 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/Person.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.component.basic2; import java.io.Serializable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java index d3c99a839e..0c56df9201 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbedded.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.component.empty; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class ComponentEmptyEmbedded { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java index bdf8459183..26e0317d22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/ComponentEmptyEmbeddedOwner.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.component.empty; -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; @Entity @Table(name = "comp_empty_owner") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java index 3c48789fae..ea2a4b13c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyEagerTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.component.empty; import java.io.Serializable; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; import org.hibernate.Hibernate; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java index a07f4f9de2..bb5b25bc82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeCollectionKeyLazyTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.component.empty; import java.io.Serializable; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.Hibernate; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeEquivalentToNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeEquivalentToNullTest.java index 314581290f..a2cad61f76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeEquivalentToNullTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeEquivalentToNullTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.component.empty; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Parent; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java index 612e2b75c5..35a836edfc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyCachedTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.component.empty; import java.io.Serializable; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SharedCacheMode; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyTest.java index e0f325c136..ddcd55c9b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/EmptyCompositeManyToOneKeyTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.component.empty; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java index 5c1ce14f0e..b19703ca21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.component.empty; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.EmptyInterceptor; import org.hibernate.annotations.SelectBeforeUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java index ec73b31487..b4cd1a6ae9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Adult.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.component.proxy; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Adult extends Person { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java index ee0eb1a4b6..e877517a53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/Person.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.component.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name = "person") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java index 2a3919e527..c40157e099 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.compositeelement; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java index d4fd839bba..a43d61552e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.compositefk; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java index df56240e98..cee45214c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.compositefk; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java index 72db48609e..a0eeac5f53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.compositefk; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java index 1df9ee4da0..c64096bb82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.compositefk; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java index c6b2068c32..45620ae136 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java @@ -10,12 +10,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.FailureExpected; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java index 1a7b56c251..c7a32b0398 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.connection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; @@ -57,4 +57,4 @@ public class DriverManagerConnectionProviderValidationConfigTest { private String name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java index f20e591736..a7aba0c29d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java @@ -13,11 +13,11 @@ import java.sql.Statement; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java index 5fe9fe6b84..d7ce221411 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/JdbcBatchingAgressiveReleaseTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.connections; import java.util.Map; -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; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java index cca08bc7e9..6f1616c4ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/LazyLoadingConnectionCloseTest.java @@ -1,362 +1,362 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.connections; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Query; -import javax.sql.DataSource; - -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; -import org.hibernate.annotations.LazyToOne; -import org.hibernate.annotations.LazyToOneOption; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl; -import org.hibernate.orm.test.jpa.connection.BaseDataSource; -import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; - -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.spy; - -/** - * @author Selaron - */ -@TestForIssue(jiraKey = "HHH-4808") -public class LazyLoadingConnectionCloseTest extends EntityManagerFactoryBasedFunctionalTest { - - private ConnectionProviderDecorator connectionProvider; - - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { SimpleEntity.class, ChildEntity.class }; - } - - @Override - protected void addConfigOptions(Map options) { - options.put( AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, "true" ); - - options.put( - AvailableSettings.CONNECTION_HANDLING, - PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT - ); - - options.put( AvailableSettings.AUTOCOMMIT, "false" ); - - connectionProvider = new ConnectionProviderDecorator( getDataSource() ); - options.put( AvailableSettings.CONNECTION_PROVIDER, connectionProvider ); - - } - - - @BeforeAll - public void setUp() { - inTransaction( entityManager -> { - final SimpleEntity entity = new SimpleEntity(); - entity.setId( 1L ); - entity.setName( "TheParent" ); - - final ChildEntity c1 = new ChildEntity(); - c1.setId( 1L ); - c1.setParent( entity ); - c1.setName( "child1" ); - - final ChildEntity c2 = new ChildEntity(); - c2.setId( 2L ); - c2.setParent( entity ); - c2.setName( "child2" ); - - entityManager.persist( entity ); - entityManager.persist( c1 ); - entityManager.persist( c2 ); - } ); - } - - @AfterAll - public void tearDown() { - inTransaction( entityManager -> { - entityManager.createQuery( "delete from ChildEntity" ).executeUpdate(); - entityManager.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } ); - } - - /** - * Tests connections get closed after transaction commit. - */ - @Test - public void testConnectionCloseAfterTx() { - connectionProvider.clear(); - inEntityManager( - entityManager -> { - entityManager.getTransaction().begin(); - try { - - final Query qry = entityManager.createQuery( "FROM SimpleEntity" ); - final List entities = qry.getResultList(); - final SimpleEntity entity = entities.get( 0 ); - assertEquals( 1, connectionProvider.getCurrentOpenConnections() ); - } - catch (Exception e) { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().rollback(); - } - throw e; - } - finally { - if ( entityManager.getTransaction().isActive() ) { - entityManager.getTransaction().commit(); - } - } - assertTrue( connectionProvider.areAllConnectionClosed() ); - } - ); - - } - - /** - * Tests connections get closed after lazy collection initialization. - */ - @Test - public void testConnectionCloseAfterLazyCollectionInit() { - connectionProvider.clear(); - inEntityManager( - entityManager -> { - final Query qry = entityManager.createQuery( "FROM SimpleEntity" ); - final List entities = qry.getResultList(); - final SimpleEntity entity = entities.get( 0 ); - - // assert no connection is open - assertTrue( connectionProvider.areAllConnectionClosed() ); - - final int oldOpenedConnections = connectionProvider.getTotalOpenedConnectionCount(); - final Set lazyChildren = entity.getChildren(); - - // this will initialize the collection and such trigger a query - lazyChildren.stream().findAny(); - - // assert a connection had been opened - assertTrue( oldOpenedConnections < connectionProvider.getTotalOpenedConnectionCount() ); - - // assert there's no remaining connection left. - assertTrue( connectionProvider.areAllConnectionClosed() ); - - } - ); - } - - /** - * Tests connections get closed after transaction commit. - */ - @Test - public void testConnectionCloseAfterLazyPojoPropertyInit() { - connectionProvider.clear(); - inEntityManager( - entityManager -> { - final Query qry = entityManager.createQuery( "FROM ChildEntity" ); - final List entities = qry.getResultList(); - final ChildEntity entity = entities.get( 0 ); - - // assert no connection is open - assertTrue( connectionProvider.areAllConnectionClosed() ); - - final int oldOpenedConnections = connectionProvider.getTotalOpenedConnectionCount(); - - final SimpleEntity parent = entity.getParent(); - // this will initialize the collection and such trigger a query - parent.getName(); - // assert a connection had been opened - assertTrue( oldOpenedConnections < connectionProvider.getTotalOpenedConnectionCount() ); - - - // assert there's no remaining connection left. - assertTrue( connectionProvider.areAllConnectionClosed() ); - } - ); - } - - /** - * Tests connections get closed after transaction commit. - */ - @Test - public void testConnectionCloseAfterQueryWithoutTx() { - connectionProvider.clear(); - inEntityManager( - entityManager -> { - final int oldOpenedConnections = connectionProvider.getTotalOpenedConnectionCount(); - final List childrenByQuery = entityManager.createQuery( "FROM ChildEntity" ) - .getResultList(); - assertTrue( childrenByQuery.size() > 0 ); - - // assert a connection had been opened - assertTrue( oldOpenedConnections < connectionProvider.getTotalOpenedConnectionCount() ); - // assert there's no remaining connection left. - assertTrue( connectionProvider.areAllConnectionClosed() ); - } - ); - } - - @Entity(name = "SimpleEntity") - public static class SimpleEntity { - private Long id; - - private String name; - - Set children = new HashSet<>(); - - @Id - public Long getId() { - return id; - } - - public void setId(final Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @OneToMany(targetEntity = ChildEntity.class, mappedBy = "parent") - @LazyCollection(LazyCollectionOption.EXTRA) - @Fetch(FetchMode.SELECT) - public Set getChildren() { - return children; - } - - public void setChildren(final Set children) { - this.children = children; - } - } - - @Entity(name = "ChildEntity") - public static class ChildEntity { - private Long id; - - private String name; - - private SimpleEntity parent; - - @Id - public Long getId() { - return id; - } - - public void setId(final Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn - @LazyToOne(LazyToOneOption.PROXY) - public SimpleEntity getParent() { - return parent; - } - - public void setParent(final SimpleEntity parent) { - this.parent = parent; - } - } - - private BaseDataSource getDataSource() { - final Properties connectionProps = new Properties(); - connectionProps.put( "user", Environment.getProperties().getProperty( Environment.USER ) ); - connectionProps.put( "password", Environment.getProperties().getProperty( Environment.PASS ) ); - - final String url = Environment.getProperties().getProperty( Environment.URL ); - return new BaseDataSource() { - @Override - public Connection getConnection() throws SQLException { - return DriverManager.getConnection( url, connectionProps ); - } - - @Override - public Connection getConnection(String username, String password) throws SQLException { - return DriverManager.getConnection( url, connectionProps ); - } - }; - } - - public static class ConnectionProviderDecorator extends UserSuppliedConnectionProviderImpl { - - private final DataSource dataSource; - - private int connectionCount; - private int openConnections; - - private Connection connection; - - public ConnectionProviderDecorator(DataSource dataSource) { - this.dataSource = dataSource; - } - - @Override - public Connection getConnection() throws SQLException { - connectionCount++; - openConnections++; - connection = spy( dataSource.getConnection() ); - return connection; - } - - @Override - public void closeConnection(Connection connection) throws SQLException { - connection.close(); - openConnections--; - } - - public int getTotalOpenedConnectionCount() { - return this.connectionCount; - } - - public int getCurrentOpenConnections() { - return openConnections; - } - - public boolean areAllConnectionClosed() { - return openConnections == 0; - } - - public void clear() { - connectionCount = 0; - openConnections = 0; - } - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.connections; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Query; +import javax.sql.DataSource; + +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; +import org.hibernate.annotations.LazyToOne; +import org.hibernate.annotations.LazyToOneOption; +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.cfg.Environment; +import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl; +import org.hibernate.orm.test.jpa.connection.BaseDataSource; +import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; + +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.spy; + +/** + * @author Selaron + */ +@TestForIssue(jiraKey = "HHH-4808") +public class LazyLoadingConnectionCloseTest extends EntityManagerFactoryBasedFunctionalTest { + + private ConnectionProviderDecorator connectionProvider; + + @Override + protected Class[] getAnnotatedClasses() { + return new Class[] { SimpleEntity.class, ChildEntity.class }; + } + + @Override + protected void addConfigOptions(Map options) { + options.put( AvailableSettings.ENABLE_LAZY_LOAD_NO_TRANS, "true" ); + + options.put( + AvailableSettings.CONNECTION_HANDLING, + PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT + ); + + options.put( AvailableSettings.AUTOCOMMIT, "false" ); + + connectionProvider = new ConnectionProviderDecorator( getDataSource() ); + options.put( AvailableSettings.CONNECTION_PROVIDER, connectionProvider ); + + } + + + @BeforeAll + public void setUp() { + inTransaction( entityManager -> { + final SimpleEntity entity = new SimpleEntity(); + entity.setId( 1L ); + entity.setName( "TheParent" ); + + final ChildEntity c1 = new ChildEntity(); + c1.setId( 1L ); + c1.setParent( entity ); + c1.setName( "child1" ); + + final ChildEntity c2 = new ChildEntity(); + c2.setId( 2L ); + c2.setParent( entity ); + c2.setName( "child2" ); + + entityManager.persist( entity ); + entityManager.persist( c1 ); + entityManager.persist( c2 ); + } ); + } + + @AfterAll + public void tearDown() { + inTransaction( entityManager -> { + entityManager.createQuery( "delete from ChildEntity" ).executeUpdate(); + entityManager.createQuery( "delete from SimpleEntity" ).executeUpdate(); + } ); + } + + /** + * Tests connections get closed after transaction commit. + */ + @Test + public void testConnectionCloseAfterTx() { + connectionProvider.clear(); + inEntityManager( + entityManager -> { + entityManager.getTransaction().begin(); + try { + + final Query qry = entityManager.createQuery( "FROM SimpleEntity" ); + final List entities = qry.getResultList(); + final SimpleEntity entity = entities.get( 0 ); + assertEquals( 1, connectionProvider.getCurrentOpenConnections() ); + } + catch (Exception e) { + if ( entityManager.getTransaction().isActive() ) { + entityManager.getTransaction().rollback(); + } + throw e; + } + finally { + if ( entityManager.getTransaction().isActive() ) { + entityManager.getTransaction().commit(); + } + } + assertTrue( connectionProvider.areAllConnectionClosed() ); + } + ); + + } + + /** + * Tests connections get closed after lazy collection initialization. + */ + @Test + public void testConnectionCloseAfterLazyCollectionInit() { + connectionProvider.clear(); + inEntityManager( + entityManager -> { + final Query qry = entityManager.createQuery( "FROM SimpleEntity" ); + final List entities = qry.getResultList(); + final SimpleEntity entity = entities.get( 0 ); + + // assert no connection is open + assertTrue( connectionProvider.areAllConnectionClosed() ); + + final int oldOpenedConnections = connectionProvider.getTotalOpenedConnectionCount(); + final Set lazyChildren = entity.getChildren(); + + // this will initialize the collection and such trigger a query + lazyChildren.stream().findAny(); + + // assert a connection had been opened + assertTrue( oldOpenedConnections < connectionProvider.getTotalOpenedConnectionCount() ); + + // assert there's no remaining connection left. + assertTrue( connectionProvider.areAllConnectionClosed() ); + + } + ); + } + + /** + * Tests connections get closed after transaction commit. + */ + @Test + public void testConnectionCloseAfterLazyPojoPropertyInit() { + connectionProvider.clear(); + inEntityManager( + entityManager -> { + final Query qry = entityManager.createQuery( "FROM ChildEntity" ); + final List entities = qry.getResultList(); + final ChildEntity entity = entities.get( 0 ); + + // assert no connection is open + assertTrue( connectionProvider.areAllConnectionClosed() ); + + final int oldOpenedConnections = connectionProvider.getTotalOpenedConnectionCount(); + + final SimpleEntity parent = entity.getParent(); + // this will initialize the collection and such trigger a query + parent.getName(); + // assert a connection had been opened + assertTrue( oldOpenedConnections < connectionProvider.getTotalOpenedConnectionCount() ); + + + // assert there's no remaining connection left. + assertTrue( connectionProvider.areAllConnectionClosed() ); + } + ); + } + + /** + * Tests connections get closed after transaction commit. + */ + @Test + public void testConnectionCloseAfterQueryWithoutTx() { + connectionProvider.clear(); + inEntityManager( + entityManager -> { + final int oldOpenedConnections = connectionProvider.getTotalOpenedConnectionCount(); + final List childrenByQuery = entityManager.createQuery( "FROM ChildEntity" ) + .getResultList(); + assertTrue( childrenByQuery.size() > 0 ); + + // assert a connection had been opened + assertTrue( oldOpenedConnections < connectionProvider.getTotalOpenedConnectionCount() ); + // assert there's no remaining connection left. + assertTrue( connectionProvider.areAllConnectionClosed() ); + } + ); + } + + @Entity(name = "SimpleEntity") + public static class SimpleEntity { + private Long id; + + private String name; + + Set children = new HashSet<>(); + + @Id + public Long getId() { + return id; + } + + public void setId(final Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + + @OneToMany(targetEntity = ChildEntity.class, mappedBy = "parent") + @LazyCollection(LazyCollectionOption.EXTRA) + @Fetch(FetchMode.SELECT) + public Set getChildren() { + return children; + } + + public void setChildren(final Set children) { + this.children = children; + } + } + + @Entity(name = "ChildEntity") + public static class ChildEntity { + private Long id; + + private String name; + + private SimpleEntity parent; + + @Id + public Long getId() { + return id; + } + + public void setId(final Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn + @LazyToOne(LazyToOneOption.PROXY) + public SimpleEntity getParent() { + return parent; + } + + public void setParent(final SimpleEntity parent) { + this.parent = parent; + } + } + + private BaseDataSource getDataSource() { + final Properties connectionProps = new Properties(); + connectionProps.put( "user", Environment.getProperties().getProperty( Environment.USER ) ); + connectionProps.put( "password", Environment.getProperties().getProperty( Environment.PASS ) ); + + final String url = Environment.getProperties().getProperty( Environment.URL ); + return new BaseDataSource() { + @Override + public Connection getConnection() throws SQLException { + return DriverManager.getConnection( url, connectionProps ); + } + + @Override + public Connection getConnection(String username, String password) throws SQLException { + return DriverManager.getConnection( url, connectionProps ); + } + }; + } + + public static class ConnectionProviderDecorator extends UserSuppliedConnectionProviderImpl { + + private final DataSource dataSource; + + private int connectionCount; + private int openConnections; + + private Connection connection; + + public ConnectionProviderDecorator(DataSource dataSource) { + this.dataSource = dataSource; + } + + @Override + public Connection getConnection() throws SQLException { + connectionCount++; + openConnections++; + connection = spy( dataSource.getConnection() ); + return connection; + } + + @Override + public void closeConnection(Connection connection) throws SQLException { + connection.close(); + openConnections--; + } + + public int getTotalOpenedConnectionCount() { + return this.connectionCount; + } + + public int getCurrentOpenConnections() { + return openConnections; + } + + public boolean areAllConnectionClosed() { + return openConnections == 0; + } + + public void clear() { + connectionCount = 0; + openConnections = 0; + } + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java index 9f6364bc44..0499de5a1e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.constraint; import java.util.Iterator; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.mapping.Column; @@ -116,13 +116,13 @@ public class ConstraintTest extends BaseNonConfigCoreFunctionalTestCase { public static class DataPoint { @Id @GeneratedValue - @javax.persistence.Column( nullable = false, unique = true) + @jakarta.persistence.Column( nullable = false, unique = true) public long id; - @javax.persistence.Column( nullable = false, unique = true) + @jakarta.persistence.Column( nullable = false, unique = true) public String foo1; - @javax.persistence.Column( nullable = true, unique = true) + @jakarta.persistence.Column( nullable = true, unique = true) public String foo2; public String explicit; @@ -144,7 +144,7 @@ public class ConstraintTest extends BaseNonConfigCoreFunctionalTestCase { public DataPoint explicit_native; @OneToOne - @JoinColumn(name = "explicit_jpa", foreignKey = @javax.persistence.ForeignKey(name = EXPLICIT_FK_NAME_JPA)) + @JoinColumn(name = "explicit_jpa", foreignKey = @jakarta.persistence.ForeignKey(name = EXPLICIT_FK_NAME_JPA)) public DataPoint explicit_jpa; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java index 2050921e54..76648913f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.constraint; import java.util.Iterator; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.mapping.Table; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java index 0ee7f15f88..381720a565 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintTest.java @@ -15,34 +15,34 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.ConstraintMode; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.SecondaryTable; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.SecondaryTable; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.mapping.Column; @@ -224,7 +224,7 @@ public class ForeignKeyConstraintTest { public static class Person { @Id @GeneratedValue - @javax.persistence.Column( nullable = false, unique = true) + @jakarta.persistence.Column( nullable = false, unique = true) public long id; @OneToMany @@ -249,7 +249,7 @@ public class ForeignKeyConstraintTest { @PrimaryKeyJoinColumn( name = "PERSON_ID", foreignKey = @ForeignKey( name = "FK_STUDENT_PERSON" ) ) public static class Student extends Person { - @javax.persistence.Column( name = "MATRICULATION_NUMBER" ) + @jakarta.persistence.Column( name = "MATRICULATION_NUMBER" ) public String matriculationNumber; @ManyToOne @@ -328,9 +328,9 @@ public class ForeignKeyConstraintTest { @Embeddable public static class VehicleId implements Serializable { - @javax.persistence.Column( name = "VEHICLE_VENDOR_NR" ) + @jakarta.persistence.Column( name = "VEHICLE_VENDOR_NR" ) public long vehicleVendorNumber; - @javax.persistence.Column( name = "VEHICLE_NR" ) + @jakarta.persistence.Column( name = "VEHICLE_NR" ) public long vehicleNumber; @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java index 80b84239aa..eb43df4b4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.constraint; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.boot.model.relational.Namespace; import org.hibernate.mapping.Table; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java index b438794cae..842b759cb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/NonRootTablePolymorphicTests.java @@ -8,18 +8,18 @@ package org.hibernate.orm.test.constraint; import java.util.Iterator; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.mapping.Column; import org.hibernate.mapping.ForeignKey; @@ -237,7 +237,7 @@ public class NonRootTablePolymorphicTests { @Inheritance( strategy = InheritanceType.JOINED ) public static class Root { @Id - @javax.persistence.Column( name = "root_id" ) + @jakarta.persistence.Column( name = "root_id" ) private Integer id; private String name; } @@ -265,7 +265,7 @@ public class NonRootTablePolymorphicTests { @Table( name = "sub_parent" ) public static class SubParent { @Id - @javax.persistence.Column( name = "parent_id" ) + @jakarta.persistence.Column( name = "parent_id" ) private Integer id; private String name; @ManyToOne @@ -278,7 +278,7 @@ public class NonRootTablePolymorphicTests { @Table( name = "sub_child" ) public static class SubChild { @Id - @javax.persistence.Column( name = "child_id" ) + @jakarta.persistence.Column( name = "child_id" ) private Integer id; private String name; } @@ -287,7 +287,7 @@ public class NonRootTablePolymorphicTests { @Table( name = "sub_group" ) public static class SubGroup { @Id - @javax.persistence.Column( name = "group_id" ) + @jakarta.persistence.Column( name = "group_id" ) private Integer id; private String name; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java index c58bf9ae77..97a4eca6e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2zDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQL81DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQL81DialectTestCase.java index e339f44d3e..f169141b35 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQL81DialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQL81DialectTestCase.java @@ -91,7 +91,7 @@ public class PostgreSQL81DialectTestCase extends BaseUnitTestCase { @Test public void testExtractConstraintName() { PostgreSQL81Dialect dialect = new PostgreSQL81Dialect(); - SQLException psqlException = new java.sql.SQLException("ERROR: duplicate key value violates unique constraint \"uk_4bm1x2ultdmq63y3h5r3eg0ej\" Detail: Key (username, server_config)=(user, 1) already exists.", "23505"); + SQLException psqlException = new SQLException("ERROR: duplicate key value violates unique constraint \"uk_4bm1x2ultdmq63y3h5r3eg0ej\" Detail: Key (username, server_config)=(user, 1) already exists.", "23505"); BatchUpdateException batchUpdateException = new BatchUpdateException("Concurrent Error", "23505", null); batchUpdateException.setNextException(psqlException); String constraintName = dialect.getViolatedConstraintNameExtractor().extractConstraintName(batchUpdateException); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java index f3310b2c35..06a1f63c70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.dialect.function; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.HSQLDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java index 8240bec3ce..8e34846e71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Category.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java index 636aaf15d1..19e758e28f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Contact.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java index 0a7fa28d31..6e745ee694 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Folder.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java index 96a786a595..cd64b8abac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANABooleanTest.java @@ -12,9 +12,9 @@ import static org.junit.Assert.assertTrue; import java.sql.PreparedStatement; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; import org.hibernate.Session; import org.hibernate.dialect.AbstractHANADialect; @@ -221,8 +221,8 @@ public class HANABooleanTest extends BaseCoreFunctionalTestCase { } @Override - protected java.lang.Class[] getAnnotatedClasses() { - return new java.lang.Class[]{ + protected Class[] getAnnotatedClasses() { + return new Class[]{ BooleanEntity.class, LegacyBooleanEntity.class }; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java index 6cb514ba88..79d6d94c7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java @@ -12,12 +12,12 @@ import static org.junit.Assert.assertEquals; import java.sql.PreparedStatement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.dialect.AbstractHANADialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java index 666c7e9011..572c8e1226 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANADecimalTest.java @@ -13,8 +13,8 @@ import java.math.BigDecimal; import java.sql.PreparedStatement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.dialect.AbstractHANADialect; @@ -233,8 +233,8 @@ public class HANADecimalTest extends BaseCoreFunctionalTestCase { } @Override - protected java.lang.Class[] getAnnotatedClasses() { - return new java.lang.Class[]{ + protected Class[] getAnnotatedClasses() { + return new Class[]{ DecimalEntity.class }; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java index 35ef8e67c8..ac8536f875 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANASearchTest.java @@ -11,8 +11,8 @@ import static org.junit.Assert.assertEquals; import java.sql.PreparedStatement; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.HANACloudColumnStoreDialect; import org.hibernate.dialect.HANAColumnStoreDialect; @@ -239,8 +239,8 @@ public class HANASearchTest extends BaseCoreFunctionalTestCase { } @Override - protected java.lang.Class[] getAnnotatedClasses() { - return new java.lang.Class[]{ SearchEntity.class }; + protected Class[] getAnnotatedClasses() { + return new Class[]{ SearchEntity.class }; } @Entity(name = ENTITY_NAME) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java index 41d1b8eea9..a44b0ac7f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/OracleFollowOnLockingTest.java @@ -7,15 +7,15 @@ package org.hibernate.orm.test.dialect.functional; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.LockModeType; -import javax.persistence.NamedQuery; -import javax.persistence.PersistenceException; -import javax.persistence.QueryHint; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.QueryHint; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java index b0e3c8bc46..6d90d5a7c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/Product2.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.dialect.functional; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Guenther Demetz diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java index bed70a79c3..cbfd87599b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectCollationTest.java @@ -12,10 +12,10 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.List; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java index 193eec2c34..976b85be56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SQLServerDialect; @@ -104,4 +104,4 @@ public class SQLServerDialectPaginationTest extends BaseEntityManagerFunctionalT this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java index 1a8fb0ed83..a23718824b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTempTableCollationTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.dialect.functional; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java index d04a8f8b0a..10a98365a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java @@ -10,13 +10,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.LockMode; import org.hibernate.LockOptions; @@ -401,8 +401,8 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { } @Override - protected java.lang.Class[] getAnnotatedClasses() { - return new java.lang.Class[] { + protected Class[] getAnnotatedClasses() { + return new Class[] { Product2.class, Category.class, Folder.class, Contact.class, KeyHolder.class }; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java index fd97a2c924..516cdd6f10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java @@ -13,13 +13,13 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java index 5b5718d945..706a2ba02b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.dialect.functional; import java.util.EnumSet; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java index 5c726f280b..a5634bc4e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/AbstractSequenceInformationExtractorTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.dialect.unit.sequence; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.Dialect; import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java index d0de2d73db..55261a2669 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/Thing.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.dirtiness; import java.util.*; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java index 46c3ac83d6..9a40484ad3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Account.java @@ -1,12 +1,12 @@ package org.hibernate.orm.test.discriminatedcollections; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity @DiscriminatorColumn(name = "account_type") @@ -89,4 +89,4 @@ class CreditAccount extends Account { public AccountType getType() { return AccountType.CREDIT; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java index ff742c8ac2..4c60c9517f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/Client.java @@ -1,11 +1,11 @@ package org.hibernate.orm.test.discriminatedcollections; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java index c4ad933a8a..8bd1e4d2af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.discriminatedcollections; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.query.criteria.JpaCriteriaQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java index 747e2827cd..d5bd0c474f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/CompositeIdAssociationsWithEmbeddedCompositeIdTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.ecid; import java.io.Serializable; import java.util.Iterator; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; @@ -176,4 +176,4 @@ public class CompositeIdAssociationsWithEmbeddedCompositeIdTest { this.index = index; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/UniversityCourse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/UniversityCourse.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java index 2066025a6b..5204057f7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/ExtraStateTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.engine.spi; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.EntityEntryExtraState; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java index 2b63858119..04fcc05aa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java @@ -11,16 +11,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.graph.GraphParser; import org.hibernate.graph.GraphSemantic; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java index 556ccb0d27..19bcdee55a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphNativeQueryTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.entitygraph; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.graph.GraphParser; import org.hibernate.graph.GraphSemantic; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java index 718b369850..1aeec700d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java @@ -9,21 +9,21 @@ package org.hibernate.orm.test.entitygraph; import java.util.Collection; import java.util.Date; import java.util.List; -import javax.persistence.AttributeNode; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Subgraph; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Subgraph; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.graph.GraphSemantic; import org.hibernate.metamodel.model.domain.EntityDomainType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java index 2c60a83a98..86450e0694 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphWithFetchAnnotationTest.java @@ -7,15 +7,15 @@ package org.hibernate.orm.test.entitygraph; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java index e0bceef924..15768ef053 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java @@ -1,10 +1,10 @@ package org.hibernate.orm.test.entitygraph; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.graph.RootGraph; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java index fc089d6aac..68ff40c116 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/InheritedEntityGraphTest.java @@ -10,16 +10,16 @@ import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Subgraph; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Subgraph; import org.hibernate.graph.GraphSemantic; import org.hibernate.internal.util.MutableLong; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java index dc84124f27..fd365864cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadAndFetchGraphTest.java @@ -2,17 +2,17 @@ package org.hibernate.orm.test.entitygraph; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.TypedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; import org.hibernate.graph.GraphSemantic; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java index ee7878a5bb..0b9ea2d6cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/CriteriaEntityGraphTest.java @@ -13,16 +13,16 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java index 3ac16c2ad1..e647fbc7c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java @@ -13,14 +13,14 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.LockOptions; import org.hibernate.engine.spi.EffectiveEntityGraph; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java index 379d7eade0..e72eb59d80 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/HqlEntityGraphTest.java @@ -13,14 +13,14 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java index eb2e7d57fd..28011e2083 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/LoadPlanBuilderTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.entitygraph.ast; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.LockOptions; import org.hibernate.NotYetImplementedFor6Exception; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java index 15356cf4fb..d5bbd0045b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java @@ -8,18 +8,18 @@ package org.hibernate.orm.test.entitygraph.mappedbyid; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java index a9cd673793..ee9c90813f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicAnnNamedEntityGraphTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.entitygraph.named.basic; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java index ce7bcc429a..6f40d74ce3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/BasicOrmNamedEntityGraphTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.entitygraph.named.basic; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java index d0df647b3f..2972ea7bff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/basic/Person.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.entitygraph.named.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedEntityGraph; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedEntityGraph; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java index aa1a30b7a4..9991ee2816 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/multiple/NamedEntityGraphsTest.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.entitygraph.named.multiple; import java.util.List; -import javax.persistence.AttributeNode; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedEntityGraphs; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedEntityGraphs; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java index adac675c86..46facf126b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/subgraph/SubgraphOrmNamedEntityGraphTest.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.entitygraph.named.subgraph; import java.util.List; -import javax.persistence.AttributeNode; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java index e90f16ee87..d55ba746dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.entitygraph.parser; import java.util.Collection; import java.util.List; import java.util.Map; -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.hibernate.graph.GraphParser; import org.hibernate.graph.spi.RootGraphImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java index ef75511a6f..d9e2541c6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/BasicEntityGraphTests.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.entitygraph.parser; import java.util.Set; -import javax.persistence.AttributeNode; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Subgraph; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Subgraph; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java index edc2fc4ec9..d44f51d3bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.entitygraph.parser; import java.util.List; import java.util.Map; -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.hibernate.engine.spi.SessionImplementor; import org.hibernate.graph.GraphParser; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java index 8733915ed8..804aef7885 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphsTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.entitygraph.parser; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; import org.hibernate.graph.EntityGraphs; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java index 4bc7a26704..3845de68db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestEntity.java @@ -1,14 +1,14 @@ package org.hibernate.orm.test.entitygraph.parser; import java.util.Map; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; @Entity( name = "GraphParsingTestEntity" ) public class GraphParsingTestEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java index 4a73f768f8..253ef7ad3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/GraphParsingTestSubEntity.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.entitygraph.parser; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity( name = "GraphParsingTestSubEntity" ) public class GraphParsingTestSubEntity extends GraphParsingTestEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/ProductLine.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/ProductLine.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java index 886c26c6a2..56e79d5aa0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/DuplicateEntityNameTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.entityname; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.DuplicateMappingException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java index b801a40ed3..a58bfbe7be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/EmbeddableCallbackTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.event; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrePersist; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java index 8cfc8585fe..92d7ef515d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java @@ -11,8 +11,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.junit.After; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java index 1f736da6ce..ac39c9d1e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.event; -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 jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.TransientObjectException; import org.hibernate.action.internal.EntityActionVetoException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java index 8acf2d0972..37a23f3be2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.event; -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 jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.action.internal.EntityActionVetoException; import org.hibernate.event.service.spi.EventListenerRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java index 1f129bcb06..0f5230c05a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java @@ -11,8 +11,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java index 31d3116f62..45de3f184e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java @@ -10,8 +10,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java index abfe1216e3..4070936163 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Alias.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.event.collection.detached; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java index 16b43b74e0..1350b607da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/Character.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.event.collection.detached; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java index 8102e05159..9fa503b36f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionEntity.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.event.collection.detached; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; @Entity public class MultipleCollectionEntity implements org.hibernate.orm.test.event.collection.Entity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java index f41d9196f0..17bbd8dafd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity1.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.event.collection.detached; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class MultipleCollectionRefEntity1 implements org.hibernate.orm.test.event.collection.Entity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java index 4180334892..ee6ef8f484 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MultipleCollectionRefEntity2.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.event.collection.detached; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class MultipleCollectionRefEntity2 implements org.hibernate.orm.test.event.collection.Entity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java index 8d3a278b9f..e8d45b6ecf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.event.entity; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.Session; import org.hibernate.event.service.spi.EventListenerRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java index 65cbdbebe6..7c8168a1f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.event.entity; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java index 29a554ea20..2321cdf506 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/AutoFlushEventListenerTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.events; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.FlushMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java index 3d6aa0380c..28540b2414 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/IsolatedEvictableEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.eviction; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java index f895de9892..6aae22a92e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java @@ -13,10 +13,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import javax.persistence.EntityManager; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.HibernateException; import org.hibernate.Interceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java index 5ece767e16..6764dcd454 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java index c9e4dcf1c0..4ba767d6d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ExceptionExpectations.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.exceptionhandling; import java.sql.SQLException; -import javax.persistence.NoResultException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; -import javax.persistence.RollbackException; +import jakarta.persistence.NoResultException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.RollbackException; import org.hibernate.StaleObjectStateException; import org.hibernate.TransactionException; @@ -57,7 +57,7 @@ interface ExceptionExpectations { @Override public void onGetSingleResultWithMultipleResults(RuntimeException e) { - assertThat( e, instanceOf( javax.persistence.NonUniqueResultException.class ) ); + assertThat( e, instanceOf( jakarta.persistence.NonUniqueResultException.class ) ); } @Override @@ -210,7 +210,7 @@ interface ExceptionExpectations { @Override public void onGetSingleResultWithMultipleResults(RuntimeException e) { - assertThat( e, instanceOf( javax.persistence.NonUniqueResultException.class ) ); + assertThat( e, instanceOf( jakarta.persistence.NonUniqueResultException.class ) ); } @Override @@ -281,4 +281,4 @@ interface ExceptionExpectations { void onTransactionExceptionOnCommit(RuntimeException e); void onExecuteUpdateWithConstraintViolation(RuntimeException e); -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java index a7c031ac56..bca313bc9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/IdentifierGenerationExceptionHandlingTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.Session; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java index aae51694a3..dfb03f364b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.exceptionhandling; import java.sql.SQLException; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.PersistenceException; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; import org.hibernate.JDBCException; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java index 258ea600aa..b016be0cf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/QueryExceptionHandlingTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java index d9a2933aa8..66900b2dfb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StateObjectStateExceptionHandlingTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.exceptionhandling; import static org.junit.Assert.fail; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java index b742ea4170..1ff133a923 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.exceptionhandling; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java index 382da64508..6d855ad741 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.exceptionhandling; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java index d8680ac106..2331b7a87a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java @@ -2,11 +2,11 @@ package org.hibernate.orm.test.extralazy; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java index d42b4e46e4..503cb1d11c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java @@ -4,11 +4,11 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Student.java index d45026af8a..e0189b8c34 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Student.java @@ -1,11 +1,11 @@ package org.hibernate.orm.test.extralazy; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "student") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java index 7dadf7c225..b207bab989 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.fetch.runtime.managed; import java.util.Collections; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java index c61d7c9a87..9921f3d229 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java @@ -14,11 +14,11 @@ package org.hibernate.orm.test.fetchmode.toone; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -333,4 +333,4 @@ public class EagerToOneWithJoinFetchModeTests { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java index b294d62b16..ecc8b61cfe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.fetchmode.toone; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -360,4 +360,4 @@ public class EagerToOneWithSelectFetchModeTests { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java index 005a9acb21..dd735a0399 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.fetchmode.toone; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -361,4 +361,4 @@ public class LazyToOneWithJoinFetchModeTests { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java index 6735d41de1..bd51f3d519 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.fetchmode.toone; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -325,4 +325,4 @@ public class LazyToOneWithSelectFetchModeTests { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java index 2187a04ce7..2b8303378b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/CollectionLoadedInTwoPhaseLoadTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.fetchprofiles; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.LazyInitializationException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java index dba8cdee6e..c5f8b399a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/EntityLoadedInTwoPhaseLoadTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.fetchprofiles; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.LazyInitializationException; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java index 6652dca22f..083d8de87e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.fetchprofiles.join; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java index bd1feab838..5d6aacb08d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/Employee.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.fetchprofiles.join.selfReferencing; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java index 8f58e1cf59..6011793edf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/selfReferencing/JoinSelfReferentialFetchProfileTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.fetchprofiles.join.selfReferencing; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java index 18b1dc2254..d3acb6a2e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/BatchFetchStrategyHelperTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.fetchstrategyhelper; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.junit.Test; @@ -189,7 +189,7 @@ public class BatchFetchStrategyHelperTest extends BaseCoreFunctionalTestCase { OtherEntity.class }; } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name="entity") public static class AnEntity { @Id @@ -229,7 +229,7 @@ public class BatchFetchStrategyHelperTest extends BaseCoreFunctionalTestCase { private Set colorsSubselect = new HashSet(); } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name="otherentity") @BatchSize( size = 5) public static class OtherEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java index b84dd4a23f..bb23820dce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/FetchStrategyHelperTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.fetchstrategyhelper; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.junit.Test; @@ -185,7 +185,7 @@ public class FetchStrategyHelperTest extends BaseCoreFunctionalTestCase { OtherEntity.class }; } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name="entity") public static class AnEntity { @Id @@ -221,7 +221,7 @@ public class FetchStrategyHelperTest extends BaseCoreFunctionalTestCase { private Set colorsSubselect = new HashSet(); } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name="otherentity") public static class OtherEntity { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/NoProxyFetchStrategyHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/NoProxyFetchStrategyHelperTest.java index 024f5fe345..0d55f5d528 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/NoProxyFetchStrategyHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchstrategyhelper/NoProxyFetchStrategyHelperTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.fetchstrategyhelper; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.junit.Test; @@ -107,7 +107,7 @@ public class NoProxyFetchStrategyHelperTest extends BaseCoreFunctionalTestCase { OtherEntity.class }; } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name="entity") public static class AnEntity { @Id @@ -128,7 +128,7 @@ public class NoProxyFetchStrategyHelperTest extends BaseCoreFunctionalTestCase { // @Fetch(FetchMode.SUBSELECT) is not allowed for ToOne associations } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name="otherentity") @Proxy(lazy = false) public static class OtherEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java index 555659f03e..4592f7e232 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.filter; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java index d94b14478d..5be7956086 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java @@ -13,12 +13,12 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java index 294093ef10..d18902aa91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDotNameTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.filter; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java index 09aff8e970..592e43be27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterWitSubSelectFetchModeTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.filter; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java index a704cea192..de9d1c8909 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java @@ -10,11 +10,11 @@ import java.io.Serializable; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java index a9cb6956d7..318d958ff7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java @@ -10,16 +10,16 @@ import java.sql.Timestamp; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java index bd4493ba7f..45add97f94 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.filter.hql; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java index 3c902dd26e..14da3217c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.filter.hql; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java index ec6f678e2d..e875f7aff9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/Account.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.filter.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java index 80e34cb370..4b743a1794 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/AccountGroup.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.filter.proxy; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Filter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java index acfa3e4805..4301e2f228 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/secondarytable/User.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.filter.secondarytable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java index 449b89403c..1d4f901a4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Animal.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.filter.subclass.MappedSuperclass; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java index 9a78cc2454..5b14cc6499 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Human.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.filter.subclass.MappedSuperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java index 1c3eb17a46..8a5cb6d8d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/MappedSuperclass/Mammal.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.filter.subclass.MappedSuperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.Type; @@ -32,4 +32,4 @@ public class Mammal extends Animal { public void setPregnant(boolean isPregnant) { this.isPregnant = isPregnant; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java index 5611966780..dde2d27a6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Animal.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.filter.subclass.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java index dc0b83cdd5..84135aba69 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Club.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.filter.subclass.joined; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java index 5add2c2df5..499daf6890 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Human.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.filter.subclass.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java index b33eedcacd..f2255b10d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/joined/Mammal.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.filter.subclass.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java index 879641d8e9..09cbf30257 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Animal.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.filter.subclass.singletable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java index 260712e167..b6076c1595 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Human.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.filter.subclass.singletable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java index 50e475f47a..423dcedec7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/singletable/Mammal.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.filter.subclass.singletable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java index c0a9ba190e..da9fba82b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Animal.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.filter.subclass.tableperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java index ba1380104a..98ffcf55e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Human.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.filter.subclass.tableperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java index 86ad39a8a8..8b35df5c5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/subclass/tableperclass/Mammal.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.filter.subclass.tableperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java index 9cfde555d2..4cdc0f5eb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Author.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.flush; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java index cf637ba76d..8c67c8c405 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Book.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.flush; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java index a3fa225715..7576b25a64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/BookStore.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.flush; 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; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java index 5ae3d93f0c..97c00431e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.flush; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java index 1f3a3a7ed3..c9e50a1fb1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.flush; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java index 9b4b94cb43..a7ce391010 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/Publisher.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.flush; 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.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java index c1b8d80e57..d9bb9151b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushJoinTransaction.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.flush; import java.util.Map; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java index ab51af3709..9deec2d99a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestFlushModeWithIdentitySelfReferenceTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.flush; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java index dd08d61f69..312115dafb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/UnrelatedEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.flush; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java index cb3a1ac46d..722c0e3426 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/HHH14230.java @@ -12,10 +12,10 @@ import static org.junit.Assert.assertTrue; import java.util.stream.StreamSupport; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -51,7 +51,7 @@ public class HHH14230 { } @Entity - @javax.persistence.Table(name = TABLE_NAME) + @jakarta.persistence.Table(name = TABLE_NAME) public static class TestEntity { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java index b28fc93236..ac12c5c8d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/DefaultConstraintModeTest.java @@ -11,10 +11,10 @@ import static org.junit.Assert.assertThat; import java.util.stream.StreamSupport; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -60,7 +60,7 @@ public class DefaultConstraintModeTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = TABLE_NAME) + @jakarta.persistence.Table(name = TABLE_NAME) public static class TestEntity { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java index 53092170c6..7266b1b0c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/InheritanceManyToManyForeignKeyTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.foreignkeys.disabled; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java index 8aaa96ca71..f05f656413 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyOwner.java @@ -7,16 +7,16 @@ package org.hibernate.orm.test.foreignkeys.disabled; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java index 9768054dc0..1114f6d0b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/ManyToManyTarget.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.foreignkeys.disabled; -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 Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java index 7e1e4884bf..1b1d7c6152 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/disabled/OneToManyBidirectionalForeignKeyTest.java @@ -13,14 +13,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.StreamSupport; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -61,7 +61,7 @@ public class OneToManyBidirectionalForeignKeyTest { } @Entity - @javax.persistence.Table(name = TABLE_NAME_PLAIN) + @jakarta.persistence.Table(name = TABLE_NAME_PLAIN) public static class PlainTreeEntity { @Id @@ -78,7 +78,7 @@ public class OneToManyBidirectionalForeignKeyTest { } @Entity - @javax.persistence.Table(name = TABLE_NAME_WITH_ON_DELETE) + @jakarta.persistence.Table(name = TABLE_NAME_WITH_ON_DELETE) public static class TreeEntityWithOnDelete { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java index 02d594f04f..a590c16a76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.generatedkeys.identity; -import javax.persistence.PersistenceException; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.TransactionRequiredException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java index 3d35fcfdae..c33b632ae3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/seqidentity/JoinedSequenceIdentityBatchTest.java @@ -9,18 +9,18 @@ package org.hibernate.orm.test.generatedkeys.seqidentity; import java.io.Serializable; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -119,4 +119,4 @@ public class JoinedSequenceIdentityBatchTest extends BaseNonConfigCoreFunctional type = "FOLDER"; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java index 9e80d66cc2..612badb97b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.graph; import java.util.Collection; import java.util.List; import java.util.Map; -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.hibernate.graph.GraphParser; import org.hibernate.graph.spi.RootGraphImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java index 7860aa9c8b..aaa061ceb3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.graph; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; import org.hibernate.graph.EntityGraphs; import org.hibernate.graph.spi.RootGraphImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java index f8be91706a..975c6c0457 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java @@ -1,14 +1,14 @@ package org.hibernate.orm.test.graph; import java.util.Map; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; @Entity public class GraphParsingTestEntity { @@ -78,4 +78,4 @@ public class GraphParsingTestEntity { public void setDescription(String description) { this.description = description; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java index e01d69f2ea..31687236f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.graph; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; @Entity public class GraphParsingTestSubentity extends GraphParsingTestEntity { @@ -17,4 +17,4 @@ public class GraphParsingTestSubentity extends GraphParsingTestEntity { this.sub = sub; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java index ae07234eea..acdd5ed601 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ForeignGeneratorTest.java @@ -1,10 +1,10 @@ package org.hibernate.orm.test.id; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java index b67c0f5ccb..9b9b55e3e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.id; 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; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java index aaa6e6cee1..81455418c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.id; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java index 920f039857..33aabe6397 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java @@ -25,10 +25,10 @@ package org.hibernate.orm.test.id; import java.sql.PreparedStatement; import java.util.List; -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; import org.hibernate.Session; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java index 53c6d8d866..361bfcd8e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/QuotedIdentifierTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.id; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java index 7c0425725a..975b983016 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RelatedEntity.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.id; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; -@javax.persistence.Entity -@javax.persistence.Table(name = "entity2") +@jakarta.persistence.Entity +@jakarta.persistence.Table(name = "entity2") public class RelatedEntity { @Id @@ -20,7 +20,7 @@ public class RelatedEntity { @Column(name = "universalid")// "uid" is a keywork in Oracle private long uid; - @javax.persistence.ManyToOne + @jakarta.persistence.ManyToOne private RootEntity linkedRoot; public long getUid() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java index 58c3d739f0..834ed1917b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/RootEntity.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.id; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; -@javax.persistence.Entity +@jakarta.persistence.Entity public class RootEntity implements Serializable { @Id @@ -24,7 +24,7 @@ public class RootEntity implements Serializable { public String description; - @javax.persistence.OneToMany(mappedBy = "linkedRoot") + @jakarta.persistence.OneToMany(mappedBy = "linkedRoot") private java.util.List linkedEntities = new java.util.ArrayList(); public long getUid() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java index 38e6ce14fa..2966caca59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SQLServer2012SequenceGeneratorAnnotationTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.id; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.dialect.SQLServerDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java index 09a31b6c32..d16a8f8ed2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.id.array; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java index a9e4dff94a..dbf5c08590 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.id.array; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java index a0bc56ec13..98b8142aa0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.id.array; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java index 5e82ae7587..0a7812edf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.id.array; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java index a26c0c53ea..3f2166311b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/enhanced/SharedSequenceTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.id.enhanced; import static org.junit.Assert.assertEquals; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.dialect.MySQLDialect; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java index be6777b98a..d63e78bf4d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java @@ -10,12 +10,12 @@ import java.io.StringReader; import java.sql.Statement; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -137,7 +137,7 @@ public class PostgreSQLSequenceGeneratorWithSerialTest extends EntityManagerFact public static class ApplicationConfiguration { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "application_configurations_id_seq", sequenceName = "application_configurations_id_seq" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java index e7c097239f..49c3c9e754 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.id.hhh12973; import java.util.EnumSet; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.MappingException; import org.hibernate.boot.MetadataSources; @@ -90,7 +90,7 @@ public class SequenceMismatchStrategyDefaultExceptionTest extends EntityManagerF public static class ApplicationConfigurationHBM2DDL { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "app_config_sequence", sequenceName = "app_config_sequence", allocationSize = 1 @@ -112,7 +112,7 @@ public class SequenceMismatchStrategyDefaultExceptionTest extends EntityManagerF public static class ApplicationConfiguration { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "app_config_sequence", sequenceName = "app_config_sequence" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java index 067159552b..a9812b7356 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.id.hhh12973; import java.util.EnumSet; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @@ -127,7 +127,7 @@ public class SequenceMismatchStrategyFixWithSequenceGeneratorTest extends Entity public static class ApplicationConfigurationHBM2DDL { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "app_config_sequence", sequenceName = "app_config_sequence", allocationSize = 1 @@ -149,7 +149,7 @@ public class SequenceMismatchStrategyFixWithSequenceGeneratorTest extends Entity public static class ApplicationConfiguration { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "app_config_sequence", sequenceName = "app_config_sequence" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java index cb4bf40462..8a936694ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.id.hhh12973; import java.util.EnumSet; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @@ -111,7 +111,7 @@ public class SequenceMismatchStrategyLogTest extends EntityManagerFactoryBasedFu public static class ApplicationConfigurationHBM2DDL { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "app_config_sequence", sequenceName = "app_config_sequence", allocationSize = 1 @@ -133,7 +133,7 @@ public class SequenceMismatchStrategyLogTest extends EntityManagerFactoryBasedFu public static class ApplicationConfiguration { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "app_config_sequence", sequenceName = "app_config_sequence" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java index f871a9c317..0897610474 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.id.hhh12973; import java.util.EnumSet; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @@ -125,7 +125,7 @@ public class SequenceMismatchStrategyWithoutSequenceGeneratorTest extends Entity public static class ApplicationConfigurationHBM2DDL { @Id - @javax.persistence.SequenceGenerator( + @jakarta.persistence.SequenceGenerator( name = "hibernate_sequence", sequenceName = "hibernate_sequence", allocationSize = 1 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java index 89c1f5d3f8..93e15a35fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.id.idClass; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity @IdClass( MyEntityId.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/LegacySequenceExportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/LegacySequenceExportTest.java index 0de654adac..d0b20a79c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/LegacySequenceExportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/LegacySequenceExportTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.id.sequence; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.model.relational.Namespace; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java index 78f9f53618..26452d88e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.id.sequence; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java index b002578bc7..a06d6434d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.id.sequence; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySequenceTest.java index 38ebd258bb..c58d6692b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySequenceTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.id.sequence; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.cfg.Environment; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java index 7ef1c73dc6..a63d9a5d59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/PostgreSQLIdentitySupportTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.id.sequence; -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; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java index acf5053ff3..127d4c0cc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java @@ -11,10 +11,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Comparator; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.HibernateException; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java index b19f806fea..f82251c195 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java @@ -10,10 +10,10 @@ import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.HibernateException; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java index 5ff6d696e8..49bd6f884d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.id.uuid; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java index b5be3208aa..382da8db8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.id.uuid; import java.util.List; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.query.NativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java index 19aff0cc17..02b42b8d58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorBinaryUniqueIdentifierIdTest.java @@ -2,12 +2,12 @@ package org.hibernate.orm.test.id.uuid.generator; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; import org.hibernate.annotations.GenericGenerator; import org.hibernate.dialect.SQLServerDialect; @@ -67,4 +67,4 @@ public class UUID2GeneratorBinaryUniqueIdentifierIdTest { final Set fooValues = new HashSet<>(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java index 9ddf1af270..8342ed7e7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java @@ -2,13 +2,13 @@ package org.hibernate.orm.test.id.uuid.generator; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.dialect.SQLServerDialect; @@ -91,4 +91,4 @@ public class UUID2GeneratorStringUniqueIdentifierIdTest extends BaseEntityManage } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java index 058e403c8d..592879f2e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorUniqueIdentifierIdTest.java @@ -3,12 +3,12 @@ package org.hibernate.orm.test.id.uuid.generator; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; import org.hibernate.annotations.GenericGenerator; import org.hibernate.dialect.SQLServerDialect; @@ -68,4 +68,4 @@ public class UUID2GeneratorUniqueIdentifierIdTest { final Set fooValues = new HashSet<>(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java index 6f37a3f2be..3eb4b9fa77 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/interpretation/UUIDBasedIdInterpretationTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.id.uuid.interpretation; import java.util.UUID; -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; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java index 4404d95956..cca565da7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.id.uuid.sqlrep.sqlbinary; import java.util.List; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Type; import org.hibernate.dialect.PostgreSQLDialect; @@ -51,7 +51,7 @@ public class UUIDBinaryTest { @Test public void testUsage(SessionFactoryScope scope) { final MappingMetamodel domainModel = scope.getSessionFactory().getDomainModel(); - final EntityPersister entityDescriptor = domainModel.findEntityDescriptor( UUIDBinaryTest.Node.class ); + final EntityPersister entityDescriptor = domainModel.findEntityDescriptor( Node.class ); final List identifierJdbcMappings = entityDescriptor.getIdentifierMapping().getJdbcMappings(); assertThat( identifierJdbcMappings, hasSize( 1 ) ); final JdbcMapping jdbcMapping = identifierJdbcMappings.get( 0 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java index e400419850..b8e9a953b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.id.uuid.sqlrep.sqlchar; import java.util.List; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Type; import org.hibernate.dialect.PostgreSQLDialect; @@ -51,7 +51,7 @@ public class UUIDCharTest { @Test public void testUsage(SessionFactoryScope scope) { final MappingMetamodel domainModel = scope.getSessionFactory().getDomainModel(); - final EntityPersister entityDescriptor = domainModel.findEntityDescriptor( UUIDCharTest.Node.class ); + final EntityPersister entityDescriptor = domainModel.findEntityDescriptor( Node.class ); final List identifierJdbcMappings = entityDescriptor.getIdentifierMapping().getJdbcMappings(); assertThat( identifierJdbcMappings, hasSize( 1 ) ); final JdbcMapping jdbcMapping = identifierJdbcMappings.get( 0 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java index c2c719d506..2317c852cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.id.uuid.strategy; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/Group.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java old mode 100755 new mode 100644 index e09debc644..7c006b492d --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.idbag; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/UserGroup.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java index 8256230898..2187634004 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.idclass; import java.io.Serializable; import java.util.Objects; -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.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java index cccf6a1565..f9f620ec3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.idclass; 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; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java index b7c3ce03f1..31ca84066b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.idclass; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java index d47db2f8ec..cac520393c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/IdGeneratorNameScopingTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.idgen; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java index bd90bd37a5..c01beb152c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java @@ -15,9 +15,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java index be7a0bba22..8438bb46cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.idgen.enhanced.auto; import java.util.Collection; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java index 50d1c6dd0c..39cffaceb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceMismatchStrategyTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.idgen.enhanced.sequence; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -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; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java index b2019a585f..e13847d3eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java @@ -10,23 +10,23 @@ import java.io.Serializable; import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java index 50344a98f4..682fd5b648 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.idgen.identity; -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; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java index 4ed0ae7f1b..62824b590e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh10429/IdentityGeneratorExtendsTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.idgen.identity.hhh10429; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java index 42f83bce6f..09c5f09220 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.idgen.identity.hhh9983; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java index 0988d49523..8a05ca5b1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Sub.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.idgen.identity.joinedSubClass; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Andrey Vlasov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java index 39ae31a4bb..80b039966a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/Super.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.idgen.identity.joinedSubClass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; -import static javax.persistence.GenerationType.IDENTITY; -import static javax.persistence.InheritanceType.JOINED; +import static jakarta.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.InheritanceType.JOINED; /** * @author Andrey Vlasov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java index c4f93bd990..181e33bac7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/UserDefinedGeneratorsTests.java @@ -18,10 +18,10 @@ import static org.mockito.Mockito.times; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; -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; import org.hibernate.annotations.GenericGenerator; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java index 4303133468..8227f55948 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInJoinedSubclassTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.idprops; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java index 9f03a51bd8..6b80f95108 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSingleTableSubclassTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.idprops; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java index b44bc45d26..b30c22f113 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInSubclassIdInMappedSuperclassTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.idprops; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.MappedSuperclass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java index 1057c2f8ed..baf4bd990f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdPropertyInTablePerClassSubclassTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.idprops; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java index b73b4d9936..866c49c8d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInEmbeddedIdTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.idprops; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java index aab7014184..b5bbc35c91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInIdClassTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.idprops; import java.io.Serializable; -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.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java index 89fa57802e..c2868c2b62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdInNonJpaCompositeIdTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.idprops; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java index 410377744e..8dac18f70d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfEmbeddedIdTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.idprops; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java index 7ce050d277..7e8e642f03 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfIdClassTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.idprops; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java index c080786b44..00acb6db20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/PropertyNamedIdOutOfNonJpaCompositeIdTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.idprops; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Contract.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java old mode 100755 new mode 100644 index ad5c5b820f..7201e11067 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.immutable; import java.util.Iterator; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java index 92bb5e6b3e..3a684ac967 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.immutable.entitywithmutablecollection; import java.util.Iterator; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.StaleObjectStateException; import org.hibernate.StaleStateException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java index c2321de718..07b3306f6e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.immutable.entitywithmutablecollection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityGraph; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.QueryException; import org.hibernate.StaleObjectStateException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/ContractVariation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/ContractVariation.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java index d19d422385..d3d8817d27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/DenormalizedTablePhysicalIncludedTableConstraintTest.java @@ -1,14 +1,14 @@ package org.hibernate.orm.test.inheritance; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java index c3f397870d..7302dcb6fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentJoined.java @@ -8,24 +8,24 @@ package org.hibernate.orm.test.inheritance; import java.util.Comparator; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java index db6f316b11..b28e086c40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclass.java @@ -7,25 +7,25 @@ package org.hibernate.orm.test.inheritance; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java index 6c9fded867..e01a9d3fdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTable.java @@ -7,24 +7,24 @@ package org.hibernate.orm.test.inheritance; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java index a3f4998b38..f897ddc93b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentTablePerClass.java @@ -8,24 +8,24 @@ package org.hibernate.orm.test.inheritance; import java.util.Comparator; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java index b6d7223e93..a6114e8a80 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java @@ -25,13 +25,13 @@ package org.hibernate.orm.test.inheritance.discriminator; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java index 991daa335d..435599812e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MappedSuperclassExtendsEntityTest.java @@ -25,14 +25,14 @@ package org.hibernate.orm.test.inheritance.discriminator; import java.io.Serializable; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java index 75a74b4e9e..10766b08a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/MultiSingleTableLoadTest.java @@ -7,16 +7,16 @@ package org.hibernate.orm.test.inheritance.discriminator; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java index 2d07c9d714..789789c844 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableInheritancePersistTest.java @@ -9,17 +9,17 @@ package org.hibernate.orm.test.inheritance.discriminator; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java index 6b4950d408..c1f738c838 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableNullNotNullDiscriminatorTest.java @@ -10,11 +10,11 @@ import java.sql.Statement; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java index d5f376e52d..61643bfacb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableRelationsTest.java @@ -7,18 +7,18 @@ package org.hibernate.orm.test.inheritance.discriminator; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java index 1bc744d0a0..61c9e368f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritancePersistTest.java @@ -9,17 +9,17 @@ package org.hibernate.orm.test.inheritance.discriminator; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java index fcd9550b51..758ee9c4b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.inheritance.discriminator; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java index 4de9bc7e76..ee438bcab8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java @@ -13,22 +13,22 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java index 3ad3fd08fe..1e93610407 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java @@ -13,22 +13,22 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java index a282bb70d1..ceec7101f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java @@ -13,22 +13,22 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java index f97cc5857f..f9f5346d6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedNullNotNullDiscriminatorTest.java @@ -10,12 +10,12 @@ import java.sql.Statement; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java index c2ea736e6e..384ca3dad2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java index cf81fd50bc..5fc245dc97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/RootEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java index 864eca0371..7c640c5291 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java index bfa1b5aa6b..d9f2ae551d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java index 849b6a1a0f..b7c1ea6f20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/SubSubSubEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java index 404cdf5d7c..1ea9320e2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityImpl.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import javax.persistence.Id; +import jakarta.persistence.Id; /** * @author Andrea Boriero */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class TestEntityImpl implements TestEntityInterface { @Id private Integer id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java index 92c4698c6f..934bfcebc8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/TestEntityInterface.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.inheritance.discriminator.joinedsubclass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Andrea Boriero */ -@javax.persistence.Entity +@jakarta.persistence.Entity @Inheritance(strategy = InheritanceType.JOINED) public interface TestEntityInterface extends Common { } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java index 61493a6970..dd932721ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.inheritance.relationship; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java index a103c32149..33cd760737 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/relationship/JoinedInheritanceWithOneToManyTest.java @@ -11,23 +11,23 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java index bedf028ebc..988104e710 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BatchSortingTest.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java index 8bf04a7640..ead7f1aec9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/ElementCollectionTest.java @@ -8,17 +8,17 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java index 666ada5256..4a4a2acd30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingDuplicateTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.insertordering; import java.math.BigDecimal; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java index d3da7abd2d..ae9b8fbc58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingHasParentTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java index 8e69b3ec72..dcd4ad4f4c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java @@ -1,13 +1,13 @@ package org.hibernate.orm.test.insertordering; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java index 3147a73e7c..19626d1671 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceSingleTableInheritance.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.insertordering; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java index a9d4f4ad45..895a3cb12c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java @@ -2,18 +2,18 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java index a6a027b41c..096040fae6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBaseClassReferencingSubclass.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.insertordering; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java index 6ec0e50e3b..61902cb176 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalManyToMany.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SequenceGenerator; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java index 83472e8903..35b87c58b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalMapsIdOneToOne.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.insertordering; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java index 715aedf0ff..df02ce17d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToMany.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java index 3108ffaa63..161401a5ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToManyFlushProblem.java @@ -8,19 +8,19 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; -import static javax.persistence.CascadeType.PERSIST; -import static javax.persistence.GenerationType.SEQUENCE; +import static jakarta.persistence.CascadeType.PERSIST; +import static jakarta.persistence.GenerationType.SEQUENCE; @TestForIssue(jiraKey = "HHH-12074") public class InsertOrderingWithBidirectionalOneToManyFlushProblem extends BaseInsertOrderingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java index 0900cf5c50..b1486c96d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOne.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.insertordering; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java index 35f7136139..6e8aa6608a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithBidirectionalOneToOneFlushProblem.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java index 24a8536b12..cfaae5975e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; -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.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.TableGenerator; +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.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TableGenerator; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java index a3c606811a..d06fb3fb21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCompositeTypeAssociation.java @@ -7,17 +7,17 @@ package org.hibernate.orm.test.insertordering; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java index 2ef2d06be8..2f7dd2abcb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java @@ -8,23 +8,23 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java index d164452405..3be974d784 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java @@ -9,21 +9,21 @@ package org.hibernate.orm.test.insertordering; import java.math.BigDecimal; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java index dbe254255a..f26ac89df5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithManyToOne.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.insertordering; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java index 8abe959cfd..205e9ded2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithMultipleManyToOne.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.insertordering; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java index bd6558a401..9242da24c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java @@ -8,25 +8,25 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; @@ -222,4 +222,4 @@ public class InsertOrderingWithSecondaryTable extends BaseInsertOrderingTest { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java index 35de5ae63e..580cde0c5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSingleTableInheritance.java @@ -8,23 +8,23 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java index 6b5e4b1506..8b41611cda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithTablePerClassInheritance.java @@ -8,23 +8,23 @@ package org.hibernate.orm.test.insertordering; import java.util.HashSet; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java index b897add45e..c54e52997b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOne.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.insertordering; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java index b3d64ff614..221a479afd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithUnidirectionalOneToOneJoinColumn.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.insertordering; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Query; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Query; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java index 7a9608c5b1..608b99262f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/UpdateOrderingIdentityIdentifierTest.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java index 02ef1b87de..4bf51c764c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ReflectHelperTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.internal.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.persistence.FetchType; +import jakarta.persistence.FetchType; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.spi.SessionFactoryOptions; @@ -162,10 +162,10 @@ public class ReflectHelperTest { public void test_getConstantValue_outerEnum() { when( sessionFactoryOptionsMock.isConventionalJavaConstants() ).thenReturn( true ); - when( classLoaderServiceMock.classForName( "javax.persistence.FetchType" ) ).thenReturn( (Class) FetchType.class ); - Object value = ReflectHelper.getConstantValue( "javax.persistence.FetchType.LAZY", sessionFactoryImplementorMock); + when( classLoaderServiceMock.classForName( "jakarta.persistence.FetchType" ) ).thenReturn( (Class) FetchType.class ); + Object value = ReflectHelper.getConstantValue( "jakarta.persistence.FetchType.LAZY", sessionFactoryImplementorMock); assertEquals( FetchType.LAZY, value ); - verify(classLoaderServiceMock, times(1)).classForName( eq("javax.persistence.FetchType") ); + verify(classLoaderServiceMock, times(1)).classForName( eq("jakarta.persistence.FetchType") ); } @Test @@ -242,4 +242,4 @@ public class ReflectHelperTest { assertEquals( OFF, value ); verify(classLoaderServiceMock, times(1)).classForName( eq("com.example.UStatus") ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java index 4161949c8f..0ba06def79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/ScrollableResultsObjectArrayCastingTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.internal.util; import java.util.stream.Stream; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.TypedQuery; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DialectFeatureChecks; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java index b65703b411..ae36affc32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/LobCreatorTest.java @@ -142,7 +142,7 @@ public class LobCreatorTest extends org.hibernate.testing.junit4.BaseUnitTestCas this.connection = connection; } - public T execute(LobCreationContext.Callback callback) { + public T execute(Callback callback) { try { return callback.executeOnConnection( connection ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java index 1b43e4ebfc..c46e6d35ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java @@ -47,7 +47,7 @@ public class AggressiveReleaseTest extends BaseSessionFactoryFunctionalTest { @Override protected void applySettings(StandardServiceRegistryBuilder builer) { builer.applySetting( - org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER, + AvailableSettings.CONNECTION_PROVIDER, connectionProvider ); builer.applySetting( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java index 895af48cfa..ac2084b836 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java @@ -10,8 +10,8 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java old mode 100755 new mode 100644 index 2fdb2122d0..eb0507c78c --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.join; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; /** * @author Gavin King diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java old mode 100755 new mode 100644 index 8bfe0328a3..efb260540b --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.join; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; /** * @author Gavin King diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java old mode 100755 new mode 100644 index b70b4b2bce..897873e1c1 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java @@ -11,9 +11,9 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java index 6e84eb569d..3675554023 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OuterJoinTest.java @@ -1,15 +1,15 @@ package org.hibernate.orm.test.join; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; -import javax.persistence.Tuple; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Tuple; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java old mode 100755 new mode 100644 index 07fb38e8a6..1e55f9e504 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java @@ -6,18 +6,18 @@ */ package org.hibernate.orm.test.join; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Transient; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.annotations.Fetch; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SecondaryTableTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java index 1700993c17..9c96ae6708 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/SubclassesWithSamePropertyNameTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.join; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java index b8609b8b20..9e501fd2ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/User.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.join; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; import org.hibernate.annotations.ColumnTransformer; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java old mode 100755 new mode 100644 index 5d78bb5603..7eb544e869 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.joinedsubclass; import java.math.BigDecimal; import java.util.Iterator; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.LockMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java index 206afdaf06..3bcd8c757a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithEmbeddableTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.joinedsubclass; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java index c013dfeb0e..5be6158df4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.joinedsubclass; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java index 0c3d8193d1..79e26aacf8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.joinedsubclass; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java index f72d83d6af..bff3d0213e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.joinedsubclass; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Ejb3DiscriminatorColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java index bed18a3066..711a7cd5df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeId.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.jpa; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java index d9dce38fe4..a699ab1306 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CompositeIdRowValueTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DialectFeatureChecks; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java index 9a72a89c0a..b4f5e3dfe7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/CountEntityWithCompositeIdTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java index 8cdc72d728..1e52afabad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java old mode 100755 new mode 100644 index c256d0bc18..a9dc6e74f5 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.jpa; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; @@ -55,8 +55,8 @@ public class EntityManagerFactoryUnwrapTest { @Test public void testEntityManagerCanBeUnwrappedToHibernateEntityManagerFactory(EntityManagerFactoryScope scope) { - org.hibernate.jpa.HibernateEntityManagerFactory hibernateEntityManagerFactory = scope.getEntityManagerFactory().unwrap( - org.hibernate.jpa.HibernateEntityManagerFactory.class ); + HibernateEntityManagerFactory hibernateEntityManagerFactory = scope.getEntityManagerFactory().unwrap( + HibernateEntityManagerFactory.class ); assertNotNull( hibernateEntityManagerFactory, "Unwrapping to SPI class HibernateEntityManagerFactory should be ok" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java index 318f85fa2d..cc2900a7f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityWithCompositeId.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.jpa; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java index 91a45e7ea0..1095343887 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java @@ -12,15 +12,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java index b81e14b17c..309cbfc506 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaqlStrictComplianceAliasTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java index fe888c37cd..12b7855cd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Incident.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.association; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java index 3acde532b6..0c833228a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/IncidentStatus.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.association; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java index f293323419..b5c842c2c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Kitchen.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.association; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java index 46aeb90809..43301f41bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/association/Oven.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.association; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java index 2f0bbbf2a4..37784f872d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java @@ -15,8 +15,8 @@ import org.hibernate.testing.orm.junit.Setting; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import javax.persistence.RollbackException; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.RollbackException; +import jakarta.validation.ConstraintViolationException; import java.math.BigDecimal; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java index ea1a50f647..14b0fd5653 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/CupHolder.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.beanvalidation; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java index c9707a6cf7..e9312848e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidTitle.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.jpa.beanvalidation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; -import javax.validation.constraints.Size; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jakarta.validation.constraints.Size; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java index 9d3df939e1..f3fd34a1b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/ValidatorFactory2PhaseInjectionTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.jpa.beanvalidation; import java.net.URL; import java.util.Collections; -import javax.persistence.EntityManagerFactory; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.persistence.EntityManagerFactory; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java index 5751bd7994..4e0b46c303 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/BootFailureTest.java @@ -13,8 +13,8 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.hibernate.cfg.AvailableSettings; import org.hibernate.service.spi.ServiceException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/DeprecatedProviderCheckerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/DeprecatedProviderCheckerTest.java index 442fc600c1..503966670d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/DeprecatedProviderCheckerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/DeprecatedProviderCheckerTest.java @@ -42,7 +42,7 @@ public class DeprecatedProviderCheckerTest { assertTrue( ProviderChecker.hibernateProviderNamesContain( DEPRECATED_PROVIDER_NAME ) ); triggerable.wasTriggered(); assertEquals( - "HHH015016: Encountered a deprecated javax.persistence.spi.PersistenceProvider [org.hibernate.ejb.HibernatePersistence]; [org.hibernate.jpa.HibernatePersistenceProvider] will be used instead.", + "HHH015016: Encountered a deprecated jakarta.persistence.spi.PersistenceProvider [org.hibernate.ejb.HibernatePersistence]; [org.hibernate.jpa.HibernatePersistenceProvider] will be used instead.", triggerable.triggerMessage() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java index 69c1354b6f..9cec747529 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/boot/NewBootProcessTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.boot; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.net.URL; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java index 36db0ff03a..f94428278b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ConfigurationTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.jpa.cacheable.annotation; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SharedCacheMode; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cache.spi.access.AccessType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java index aa106b090c..8d7aa15aa5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyCacheableEntity.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.cacheable.annotation; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * TODO : javadoc @@ -36,4 +36,4 @@ public class ExplicitlyCacheableEntity { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java index 3acdb73870..2515d01e8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/ExplicitlyNonCacheableEntity.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.cacheable.annotation; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java index a68fc1e7a2..6162f7f87f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/annotation/NoCacheableAnnotationEntity.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.cacheable.annotation; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * TODO : javadoc @@ -34,4 +34,4 @@ public class NoCacheableAnnotationEntity { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java index 8e24e90a3b..c5bde5db8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/JpaCacheApiUsageTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.cacheable.api; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java index f859e270ac..8d251609a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/api/Order.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.cacheable.api; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java index bf5aca9a20..d1ee5e9246 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SharedCacheModesTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.cacheable.cachemodes; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java index 49e2c13e45..49fe12219d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cacheable/cachemodes/SimpleEntity.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.cacheable.cachemodes; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java index e8a5cbb336..c6a3e1fbf2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.callbacks; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java index d726e25d44..0e63a1eacd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CommunicationSystem.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.EntityListeners; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java index 67daa09c86..6c66ff7336 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryChecker.java @@ -11,7 +11,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.persistence.EntityListeners; +import jakarta.persistence.EntityListeners; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java index 131219462d..073cae9e10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CountryNameCheckerListener.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.jpa.callbacks; import java.util.ArrayList; import java.util.List; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import org.hibernate.orm.test.jpa.callbacks.Translation; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java index 3ddd42613b..08117541d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Customer.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java index 0a60f31a33..c0dad3b315 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Employee.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java index 50d579dd32..87ee8d0c98 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ExceptionListener.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.PrePersist; +import jakarta.persistence.PrePersist; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java index 1c031ffa52..d0705c525b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/FirstOneListener.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.PreUpdate; +import jakarta.persistence.PreUpdate; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java index dc96d7c043..beac957ad1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/IncreaseListener.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.PreUpdate; +import jakarta.persistence.PreUpdate; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java index 5dc504f7ec..fa145b923e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Person.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard @@ -77,4 +77,4 @@ public class Person { public void setAddress(String address) { this.address = address; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java index 31e366a867..dab09fe5d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Plant.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrePersist; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java index 85ba1ef2bd..dcd0aa56bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java @@ -10,15 +10,15 @@ import java.nio.ByteBuffer; import java.time.Instant; import java.util.List; import java.util.Map; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java index 39e189bde7..5485ad77d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java @@ -10,15 +10,15 @@ import java.nio.ByteBuffer; import java.time.Instant; import java.util.List; import java.util.Map; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import org.hibernate.CustomEntityDirtinessStrategy; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java index c5158c0cbb..77a8dcb2db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java @@ -11,15 +11,15 @@ import java.nio.ByteBuffer; import java.time.Instant; import java.util.List; import java.util.Objects; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import org.hibernate.EmptyInterceptor; import org.hibernate.SessionBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java index d81a1cd7c7..7ec202c903 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewBidirectionalBagTest.java @@ -11,14 +11,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.PreUpdate; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PreUpdate; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java index ec4a63674c..3272debd40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalBagTest.java @@ -11,13 +11,13 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.PreUpdate; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PreUpdate; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java index 23561c4749..86a5defb36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateNewUnidirectionalIdBagTest.java @@ -11,14 +11,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.PreUpdate; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PreUpdate; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java index cb5750ff98..6123b53da5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.jpa.callbacks; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java index 977713327a..d6c4b78b30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java index 648c8a9e9e..94c6b5b2e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/ProtectedConstructorTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java index e414c0c5f8..c02287dd46 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/RemoteControl.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PrePersist; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java index 88ddd49e6d..e4289ef524 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Rythm.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java index dc6df95f9e..ef15147552 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Television.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java index 8b42350c87..9face5f655 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/Translation.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java index 22cef51889..6e26585724 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/VideoSystem.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.jpa.callbacks; -import javax.persistence.EntityListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.MappedSuperclass; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java index b6a5b5a9ff..11383f3ca4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/hbmxml/MappingClassMoreThanOnceTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.callbacks.hbmxml; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java index 97ac577ae7..2eca0d4a34 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Author.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.cascade; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java index da6d1d88d8..80e874da8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Conference.java @@ -12,18 +12,18 @@ import org.hibernate.annotations.DynamicUpdate; import java.io.Serializable; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard @@ -85,4 +85,4 @@ public class Conference implements Serializable { public int hashCode() { return ( date != null ? date.hashCode() : 0 ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java index 5e1d1c5805..57ba3659b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/DetachAndContainsTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.cascade; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -21,8 +21,8 @@ import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import static javax.persistence.CascadeType.DETACH; -import static javax.persistence.CascadeType.REMOVE; +import static jakarta.persistence.CascadeType.DETACH; +import static jakarta.persistence.CascadeType.REMOVE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java index dd2a0e2a5e..f4acd4beac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocument.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.jpa.cascade; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java index ad5bdba4aa..149b1286c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/ExtractionDocumentInfo.java @@ -15,17 +15,17 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.PreRemove; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PreRemove; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java index 8c332ff90e..47b5eb2445 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Grandson.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.jpa.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java index 815e52b9c1..9c57662a8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.cascade; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java index 93fbca1e66..734ea7e46f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.cascade; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.LockMode; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java index f31e163c3d..5a9a40d945 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Parent.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.jpa.cascade; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java index 142fc37c0b..bb2e98185c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.orm.test.jpa.cascade; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java index e53d9d31b5..7acbbaaf67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Soldier2.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.cascade; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java index 883be56842..294134750a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Son.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.jpa.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java index bfe5488e70..90e19bc846 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Song.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.jpa.cascade; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java index 875264edcd..ee7f33d4f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Student.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.jpa.cascade; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; -import javax.persistence.Access; +import jakarta.persistence.Access; @Entity @Access(AccessType.FIELD) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java index 5eddd7e016..49009b2943 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Teacher.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.jpa.cascade; import java.util.HashSet; import java.util.Set; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; -import javax.persistence.Access; +import jakarta.persistence.Access; @Entity @Access(AccessType.FIELD) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java index 093efaa2d2..ee2708c7b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop.java @@ -11,12 +11,12 @@ package org.hibernate.orm.test.jpa.cascade; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.OrderBy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java index 0bfc983da0..43ca9b29db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/Troop2.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.cascade; import java.io.Serializable; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java index ff0d17e1fc..9397bf81ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.jpa.cascade.multicircle; import java.io.Serializable; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java index ba480d30f1..047444e0e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/B.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.jpa.cascade.multicircle; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class B extends AbstractEntity { private static final long serialVersionUID = 325417243L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "b") private java.util.Set gCollection = new java.util.HashSet(); @@ -25,8 +25,8 @@ public class B extends AbstractEntity { /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private C c; @@ -35,8 +35,8 @@ public class B extends AbstractEntity { /** * No documentation */ - @javax.persistence.ManyToOne(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.ManyToOne(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , optional = false) private D d; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java index 7ccf97c2aa..7f93aef8f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/C.java @@ -11,15 +11,15 @@ import java.util.Set; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class C extends AbstractEntity { private static final long serialVersionUID = 1226955752L; - @javax.persistence.OneToMany(mappedBy = "c") + @jakarta.persistence.OneToMany(mappedBy = "c") private Set bCollection = new java.util.HashSet(); - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "c") private Set dCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java index 4865ab091f..8f4b54290b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/D.java @@ -9,21 +9,21 @@ package org.hibernate.orm.test.jpa.cascade.multicircle; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class D extends AbstractEntity { private static final long serialVersionUID = 2417176961L; - @javax.persistence.OneToMany(mappedBy = "d") + @jakarta.persistence.OneToMany(mappedBy = "d") private java.util.Set bCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private C c; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private E e; - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH}, + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH}, mappedBy = "d" ) private java.util.Set fCollection = new java.util.HashSet(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java index 3d97eb344c..d54bfb1504 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/E.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.jpa.cascade.multicircle; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class E extends AbstractEntity { private static final long serialVersionUID = 1226955558L; - @javax.persistence.OneToMany(mappedBy = "e") + @jakarta.persistence.OneToMany(mappedBy = "e") private java.util.Set dCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = true) + @jakarta.persistence.ManyToOne(optional = true) private F f; public java.util.Set getDCollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java index ceb60bb9db..88b324349e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/F.java @@ -9,22 +9,22 @@ package org.hibernate.orm.test.jpa.cascade.multicircle; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class F extends AbstractEntity { private static final long serialVersionUID = 1471534025L; /** * No documentation */ - @javax.persistence.OneToMany(cascade = { - javax.persistence.CascadeType.MERGE, javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.REFRESH} + @jakarta.persistence.OneToMany(cascade = { + jakarta.persistence.CascadeType.MERGE, jakarta.persistence.CascadeType.PERSIST, jakarta.persistence.CascadeType.REFRESH} , mappedBy = "f") private java.util.Set eCollection = new java.util.HashSet(); - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private D d; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private G g; public java.util.Set getECollection() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java index 136ed78679..d9327575f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/G.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.jpa.cascade.multicircle; /** * No Documentation */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class G extends AbstractEntity { private static final long serialVersionUID = 325417437L; - @javax.persistence.ManyToOne(optional = false) + @jakarta.persistence.ManyToOne(optional = false) private B b; - @javax.persistence.OneToMany(mappedBy = "g") + @jakarta.persistence.OneToMany(mappedBy = "g") private java.util.Set fCollection = new java.util.HashSet(); public B getB() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java index 8782c2da3d..4fc771c5dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/MultiCircleJpaCascadeTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.cascade.multicircle; -import javax.persistence.RollbackException; +import jakarta.persistence.RollbackException; import org.hibernate.TransientPropertyValueException; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.fail; *

            * All IDs are generated from a sequence. *

            - * JPA cascade types are used (javax.persistence.CascadeType).. + * JPA cascade types are used (jakarta.persistence.CascadeType).. *

            * This test uses the following model: * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java index a5683ca6b8..a26b96b07a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Bottom.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.cascade.multilevel; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "BOTTOM") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java index 20c9563062..e65867a198 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Middle.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.jpa.cascade.multilevel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "MIDDLE") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java index f4ea66c787..bead5c4d0a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionEmbeddableTest.java @@ -11,21 +11,21 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java index ea0581292d..7c59a0ea9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeCollectionIdClassTest.java @@ -11,20 +11,20 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java index 84d8e91c82..f8fff50c74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/MultiLevelCascadeRegularIdBasedParentChildAssociationTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.jpa.cascade.multilevel; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java index 8c65434225..afe9d0d9d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multilevel/Top.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.cascade.multilevel; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "T_TOP") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java index 09f86104d9..0c07bd3de0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/BasicCdiTest.java @@ -10,13 +10,13 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.Id; -import javax.persistence.PrePersist; -import javax.persistence.Table; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; @@ -172,7 +172,7 @@ public class BasicCdiTest { public static class Monitor { private final EventQueue eventQueue; - @javax.inject.Inject + @jakarta.inject.Inject public Monitor(EventQueue eventQueue) { this.eventQueue = eventQueue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java index 1707604d4a..b382a00c56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.cdi; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.testing.orm.junit.ClassLoadingIsolaterExtension; import org.junit.jupiter.api.Test; @@ -24,8 +24,8 @@ import static org.junit.jupiter.api.Assertions.fail; @ExtendWith(ClassLoadingIsolaterExtension.class) public class NoCdiAvailableTest implements ClassLoadingIsolaterExtension.IsolatedClassLoaderProvider { public static final String[] EXCLUDED_PACKAGES = new String[] { - "javax.enterprise.inject.", - "javax.enterprise.context." + "jakarta.enterprise.inject.", + "jakarta.enterprise.context." }; @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java index 658813413a..3771d81dc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cdi/NoCdiAvailableTestDelegate.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.cdi; import java.util.Collections; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java index ef521d6861..9ab9970eb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Child.java @@ -1,42 +1,42 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.jpa.collection; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -@Entity -public class Child { - - private Integer id; - private Parent daddy; - - public Child() { - - } - - @Id - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - - @ManyToOne - public Parent getDaddy() { - return daddy; - } - public void setDaddy(Parent daddy) { - this.daddy = daddy; - } - - -} - - +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.jpa.collection; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; + +@Entity +public class Child { + + private Integer id; + private Parent daddy; + + public Child() { + + } + + @Id + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + + @ManyToOne + public Parent getDaddy() { + return daddy; + } + public void setDaddy(Parent daddy) { + this.daddy = daddy; + } + + +} + + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java index d3c593af79..b2d6609365 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/collection/Parent.java @@ -1,57 +1,57 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.jpa.collection; - -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.PostLoad; -import javax.persistence.Transient; - -@Entity -public class Parent { - - private Integer id; - private Set children = new HashSet(); - private int nrOfChildren; - - public Parent() { - - } - - @Id - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - - @OneToMany(mappedBy="daddy", fetch=FetchType.EAGER, cascade=CascadeType.ALL) - public Set getChildren() { - return children; - } - public void setChildren(Set children) { - this.children = children; - } - - @PostLoad - public void postLoad() { - nrOfChildren = children.size(); - } - - @Transient - public int getNrOfChildren() { - return nrOfChildren; - } -} - +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.jpa.collection; + +import java.util.HashSet; +import java.util.Set; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PostLoad; +import jakarta.persistence.Transient; + +@Entity +public class Parent { + + private Integer id; + private Set children = new HashSet(); + private int nrOfChildren; + + public Parent() { + + } + + @Id + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + + @OneToMany(mappedBy="daddy", fetch=FetchType.EAGER, cascade=CascadeType.ALL) + public Set getChildren() { + return children; + } + public void setChildren(Set children) { + this.children = children; + } + + @PostLoad + public void postLoad() { + nrOfChildren = children.size(); + } + + @Transient + public int getNrOfChildren() { + return nrOfChildren; + } +} + diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java index 4d961e7f9f..ee377d7c9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/EntityTransactionTests.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import javax.persistence.RollbackException; +import jakarta.persistence.RollbackException; import org.hibernate.Transaction; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java index 94b5328a23..e1f9a134f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GeneratedValueTests.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.annotations.GenericGenerator; import org.hibernate.boot.Metadata; @@ -334,7 +334,7 @@ public class GeneratedValueTests extends BaseUnitTestCase { @Entity public static class ImplicitTableGeneratorEntity { /** - * This entity does not have explicit {@link javax.persistence.TableGenerator} defined + * This entity does not have explicit {@link jakarta.persistence.TableGenerator} defined */ @Id @GeneratedValue( strategy = GenerationType.TABLE, generator = "my_id_table" ) @@ -345,19 +345,19 @@ public class GeneratedValueTests extends BaseUnitTestCase { @Entity public static class ExplicitTableGeneratorImplicitNameEntity { /** - * This entity has an explicit {@link javax.persistence.TableGenerator} defined, - * but does not define {@link javax.persistence.TableGenerator#table()}. In + * This entity has an explicit {@link jakarta.persistence.TableGenerator} defined, + * but does not define {@link jakarta.persistence.TableGenerator#table()}. In * this case, the generator-name ("my_id_table") */ @Id @GeneratedValue( strategy = GenerationType.TABLE, generator = "my_id_table" ) - @javax.persistence.TableGenerator( name = "my_id_table", allocationSize = 25 ) + @jakarta.persistence.TableGenerator( name = "my_id_table", allocationSize = 25 ) public Integer id; public String name; } @Entity - @javax.persistence.TableGenerator( + @jakarta.persistence.TableGenerator( name = "my_id_table", table = "my_real_id_table", pkColumnName = "PK_COL", @@ -367,7 +367,7 @@ public class GeneratedValueTests extends BaseUnitTestCase { ) public static class ExplicitTableGeneratorEntity { /** - * This entity has an explicit {@link javax.persistence.TableGenerator} defined, + * This entity has an explicit {@link jakarta.persistence.TableGenerator} defined, * and specifies a table name. That table name ("my_real_id_table") should be used. */ @Id @@ -379,7 +379,7 @@ public class GeneratedValueTests extends BaseUnitTestCase { @Entity public static class ExplicitIncrementGeneratorEntity { /** - * This entity does not have explicit {@link javax.persistence.TableGenerator} defined + * This entity does not have explicit {@link jakarta.persistence.TableGenerator} defined */ @Id @GeneratedValue( strategy = GenerationType.AUTO, generator = "increment" ) @@ -391,7 +391,7 @@ public class GeneratedValueTests extends BaseUnitTestCase { @Entity public static class ImplicitIncrementGeneratorEntity { /** - * This entity does not have explicit {@link javax.persistence.TableGenerator} defined + * This entity does not have explicit {@link jakarta.persistence.TableGenerator} defined */ @Id @GeneratedValue( strategy = GenerationType.AUTO, generator = "increment" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java index 96886cd6b4..d9bfc4002b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/GetterAndIsMethodChecks.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java index 15dd59d3e9..ce888b7160 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/JpaPositionalParameterTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java index b0e974096e..63ae6c092d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/NonSelectQueryLockMode.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.test.jpa.AbstractJPATest; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java index 91adab377f..30aa499826 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryApiTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2; import java.util.Date; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Parameter; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Parameter; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.boot.MetadataSources; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java index a0d7040632..d3202e9e8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.transform.DistinctRootEntityResultTransformer; @@ -26,8 +26,8 @@ import org.junit.Test; import org.hamcrest.CoreMatchers; -import static javax.persistence.CascadeType.*; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.*; +import static jakarta.persistence.CascadeType.PERSIST; import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java index e5a91db226..05cf350fb1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/StoredProcedureApiTests.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.Table; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java index ee5ae2d08c..e255a210c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorMultipleDefinitionTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java index 710ad71764..e626ffbafd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/TableGeneratorVisibilityTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java index 0271976fe2..225a672d11 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/CachingWithSecondaryTablesTests.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.caching; import java.util.HashMap; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.SharedCacheMode; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java index f6b6655462..37d9ae5d5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/InheritedCacheableTest.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.caching; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.SharedCacheMode; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java index 1d0c7043a8..5101ae7749 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/caching/SubclassOnlyCachingTests.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.caching; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.SharedCacheMode; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java index a9a5e8f519..ee1550276a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Company.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.joincolumn; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java index 0972d196f0..1d6bcc3aca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/joincolumn/Location.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.compliance.tck2_2.joincolumn; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java index c6cd0d11c4..2c7fb986c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnBiDiOneToManyFKTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java index 923b031ad6..53c52193d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnElementCollectionTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java index 5ff143ec90..70e5e4a223 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnManyToManyTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java index 6e87ca55b3..0be636ceaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyFKTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java index f32f285374..6ca3c2bff1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/mapkeycolumn/MapKeyColumnOneToManyJoinTableTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.compliance.tck2_2.mapkeycolumn; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java index fc1893d26d..3276cc543e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/ConnectionsReleaseAutoCommitTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.jpa.connection; import java.sql.SQLException; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java index 35251f5d88..407ee422ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java index f136836115..a727b7e0aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Animal.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * Animal diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java index a2bbd3d590..6431ade719 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Book.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java index a4a7dbbc38..cc55ed8285 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Color.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.criteria; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java index 783be5e3ab..4053ad16fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java @@ -13,11 +13,11 @@ import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.util.Arrays; import java.util.List; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.CacheMode; import org.hibernate.ScrollMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java index 1db4f873fb..78b1e2017a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java @@ -16,18 +16,18 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.spi.QueryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java index 3eba903f78..3e959e8853 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ElementCollectionConverterTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java index efbbad81c8..63e72519eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Elephant.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.criteria; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * Elephant @@ -15,4 +15,4 @@ import javax.persistence.Table; @Entity @Table(name = "ELEPHANT") public class Elephant extends Animal { -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java index 8814789423..66596b6384 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java @@ -8,17 +8,17 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java index bcd054ea6b..acdcf79389 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Human.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.criteria; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * Human @@ -15,4 +15,4 @@ import javax.persistence.Table; @Entity @Table(name = "HUMAN") public class Human extends Animal { -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java index c7bc1fa8a6..48a46389c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Industry.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.criteria; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java index 6199e78a52..d7e35ac464 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Item.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java index cf19fb3145..67f85d7112 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ItemAttributeConverter.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.HashMap; import java.util.Map; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java index f8e066aad4..620f5b1553 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.jpa.criteria; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.dialect.MySQLDialect; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java index 051ef0062d..f28f5023d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/MultiTypedBasicAttributesEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.criteria; -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; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java index 00d5f609c1..a94e616b47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/OnKeywordTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.criteria; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.metamodel.LineItem; import org.hibernate.jpa.test.metamodel.LineItem_; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java index ec4c14c937..bc82169797 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.jpa.criteria; -import javax.persistence.EntityManager; -import javax.persistence.Parameter; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Parameter; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import java.util.Arrays; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java index 10d0e473d8..64ce5e97f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java @@ -11,15 +11,15 @@ import java.util.Arrays; import java.util.Date; import java.util.HashSet; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.dialect.CockroachDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.jpa.test.metamodel.Address; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java index 85e3337932..68e1c5cec1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/Store.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.criteria; -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 Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java index b3e99f5f65..72677467a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java @@ -8,19 +8,19 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java index c05f2c0c3f..8ffb667588 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java @@ -7,20 +7,20 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java index f351bffb63..3ec611d65b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.jpa.criteria; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.jpa.test.metamodel.Thing; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java index 85fcd3bb2a..9d4e4e05e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java @@ -6,21 +6,21 @@ */ package org.hibernate.orm.test.jpa.criteria; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java index 5982b388e2..55be83866a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java @@ -11,11 +11,11 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java index 5746b16f04..ced495276d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/AggregationResultTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.jpa.criteria.basic; import java.math.BigDecimal; import java.math.BigInteger; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import junit.framework.AssertionFailedError; import org.junit.After; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java index 6c84272318..e5cba4ce3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java @@ -13,14 +13,14 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CastTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CastTest.java index 92d06c5170..86a39c84c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CastTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CastTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.jpa.criteria.basic; import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.DerbyDialect; import org.hibernate.jpa.test.metamodel.Product; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java index 7a6e853ebf..6dd04337dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.jpa.criteria.basic; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.io.Serializable; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java index 3a06c4af68..fe205f4db4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java @@ -10,13 +10,13 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collections; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java index 8ceb8b006e..9c44277074 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java @@ -12,14 +12,14 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.H2Dialect; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java index a4e72c9352..61e94608fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ListIndexTest.java @@ -11,11 +11,11 @@ import static org.junit.Assert.assertNotNull; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Address; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java index b7fb19d252..1d6dabf268 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Payment.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.jpa.criteria.basic; import java.math.BigDecimal; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Francois Gerodez diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java index 5f7e8b86d6..ae6e4b4d82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/PredicateTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.jpa.criteria.basic; import java.util.List; -import javax.persistence.EntityManager; -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.EntityManager; +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.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.Oracle12cDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java index 321ff92c81..76c86db1b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/Wall.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.criteria.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java index 59624121a5..d607bbb1fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/ComponentInWhereClauseTest.java @@ -6,22 +6,22 @@ */ package org.hibernate.orm.test.jpa.criteria.components; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java index 1b6a8f5dee..87127811ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/EntitySuperclassComponentWithCollectionTest.java @@ -10,22 +10,22 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java index 31f716ce9a..db34e7b05a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/MappedSuperclassComponentWithCollectionTest.java @@ -10,22 +10,22 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java old mode 100755 new mode 100644 index 6a0aaf8942..3789bec1b9 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.jpa.criteria.components.joins; import java.util.List; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java old mode 100755 new mode 100644 index b1748ab384..98648d87a7 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.jpa.criteria.components.joins; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; /** * @author Matt Todd diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java old mode 100755 new mode 100644 index e2079c13a2..53700b7bc1 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.criteria.components.joins; -import javax.persistence.Embedded; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; -@javax.persistence.Entity +@jakarta.persistence.Entity public class Entity { @Id @GeneratedValue diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java old mode 100755 new mode 100644 index 3d0d9a9f7d..36371f658f --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.criteria.components.joins; -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 Matt Todd diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java index 7f170a114d..5b2d1ae607 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.criteria.enumcollection; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java index 322c48b36e..244902cc9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/User.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.jpa.criteria.enumcollection; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java index 315b295385..23232cf360 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java @@ -8,14 +8,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.query.Query; import org.hibernate.ScrollableResults; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java index a2832fa02b..ebbe55cf3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Customer.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "customers") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java index 96e096e486..82a1b6ac01 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Facility.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "facilities") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java index adaadcf6f1..df75f07e9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Order.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "order_headers") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java index 279941c1c3..d913be99a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderId.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; @Embeddable @MappedSuperclass diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java index 23668ad970..36fb03fcb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLine.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "order_lines") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java index 6e7dadf560..3fdb92db65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/OrderLineId.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; -import javax.persistence.*; +import jakarta.persistence.*; @Embeddable public class OrderLineId extends OrderId { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java index 2aaa6f4d78..1d4d26170a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Product.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "products") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java index e1ec025105..b28a450035 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/ProductId.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; @Embeddable public class ProductId implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java index 91c634938e..6ca606127e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/PurchaseOrg.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; import java.util.List; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "purchase_organizations") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java index a094351e8a..befd9ac282 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/Site.java @@ -2,7 +2,7 @@ package org.hibernate.orm.test.jpa.criteria.fetchscroll; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "sites") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java index 95de2aba1a..c007a369d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Helper.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.criteria.idclass; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; /** * @author Erich Heard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java index b7ae9b6c98..0c0c31be13 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/HelperId.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.jpa.criteria.idclass; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Id; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java index 91b22f50d0..46e595793e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/IdClassPredicateTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.criteria.idclass; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -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.EntityManager; +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 junit.framework.Assert; import org.junit.After; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java index a4882476ee..5b94966a6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Tool.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.criteria.idclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java index 86a5c530e1..d1e9ede2ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/Widget.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.criteria.idclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; /** * @author Erich Heard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java index 88397b8e78..33f910a45b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/idclass/WidgetId.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.jpa.criteria.idclass; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Id; /** * @author Erich Heard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java index 3eb62c1d0f..0e0ea19a61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.criteria.literal; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.criteria.HibernateCriteriaBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java index 2eed045ad3..9d10fadbf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralWithSingleQuoteTest.java @@ -1,12 +1,12 @@ package org.hibernate.orm.test.jpa.criteria.literal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -116,4 +116,4 @@ public class CriteriaLiteralWithSingleQuoteTest { this.aValue = value; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java index fc3b5b5aa2..4f0b36c5a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/Customer.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.jpa.criteria.mapjoin; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Customer { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java index d9fd99f519..b2a5813663 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/CustomerOrder.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.criteria.mapjoin; -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 CustomerOrder { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java index d809d7f507..def715b089 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java @@ -13,11 +13,11 @@ import static org.junit.Assert.assertTrue; import java.util.List; import java.util.Map; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java index af019ccad8..489fa631ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.criteria.mapjoin; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.MapEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java index c77f7330e5..7f32303b56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java @@ -9,23 +9,23 @@ package org.hibernate.orm.test.jpa.criteria.mapjoin; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Root; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java index 786e351c5d..851a3ac667 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java @@ -6,17 +6,17 @@ */ package org.hibernate.orm.test.jpa.criteria.nulliteral; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.io.Serializable; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java index 3cb603d520..ea348c5694 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java @@ -9,19 +9,19 @@ package org.hibernate.orm.test.jpa.criteria.nulliteral; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.H2Dialect; import org.hibernate.exception.SQLGrammarException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java index 02e82e96ad..a3e87fda99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.criteria.nulliteral; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java index 900e3fc644..7a04e64ffe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Person.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.criteria.nulliteral; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java index 9e7ae02937..2285a324df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/Subject.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.criteria.nulliteral; -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 Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java index 665af19dc8..99ebeb6b21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/AbstractPathImplTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.criteria.paths; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.junit.After; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java index 44840a6300..582dd28218 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/FetchAndJoinTest.java @@ -23,13 +23,13 @@ */ package org.hibernate.orm.test.jpa.criteria.paths; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java index 8b56e5b866..541eaa5fbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/ImplicitJoinTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.criteria.paths; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java index 64a1ac76db..736c3cf51f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/LineItem.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.criteria.paths; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "LINEITEM_TABLE") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java index 5803fc94c9..e7aa526592 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/Order.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.criteria.paths; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "ORDER_TABLE") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java index 9444f5612b..7fc3070296 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/PluralAttributeExpressionsTest.java @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Address; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java old mode 100755 new mode 100644 index 53f24d09c0..5e04d2e8a7 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.criteria.paths; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Path; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Path; import org.hibernate.cfg.AvailableSettings; @@ -35,7 +35,7 @@ public class SingularAttributeJoinTest { entityManager -> { CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(); - javax.persistence.metamodel.EntityType distributionEntity = getEntityType(scope, "Distribution"); + jakarta.persistence.metamodel.EntityType distributionEntity = getEntityType(scope, "Distribution"); From distributionFrom = criteriaQuery.from(distributionEntity); From policyJoin = distributionFrom.join("policy"); Path policyId = policyJoin.get("policyId"); @@ -45,8 +45,8 @@ public class SingularAttributeJoinTest { ); } - private javax.persistence.metamodel.EntityType getEntityType(EntityManagerFactoryScope scope, String entityName) { - for(javax.persistence.metamodel.EntityType entityType : scope.getEntityManagerFactory().getMetamodel().getEntities()) { + private jakarta.persistence.metamodel.EntityType getEntityType(EntityManagerFactoryScope scope, String entityName) { + for(jakarta.persistence.metamodel.EntityType entityType : scope.getEntityManagerFactory().getMetamodel().getEntities()) { if (entityType.getName().equals("Distribution")) { return entityType; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java index 1cff5c2c37..4eff882bbe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.criteria.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java index 78cdef84e9..65f7c3c01e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/NonSelectCriteriaTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.criteria.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaDelete; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaDelete; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java index 1156bcce1c..70ff1411b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.jpa.criteria.selectcase; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.orm.test.jpa.metadata.Person_; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java index 614c062571..112e33af3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.criteria.selectcase; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java index d368b91f62..d03d1b9b43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java @@ -24,15 +24,15 @@ package org.hibernate.orm.test.jpa.criteria.selectcase; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; -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.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; @@ -116,7 +116,7 @@ public class SelectCaseTest extends BaseEntityManagerFunctionalTestCase { entityManager.createQuery( query ).getResultList(); } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name = "entity") public static class Entity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java index 015cc0b812..a3fab036b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java @@ -12,20 +12,20 @@ import static org.junit.Assert.assertNull; import java.util.List; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaBuilder.SimpleCase; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder.SimpleCase; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java index ba4f6f1459..e004b981bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/size/CriteriaSelectSizeCollectionTest.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.jpa.criteria.size; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java index 852a955795..7b89549e74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java @@ -11,13 +11,13 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java index dd63069c27..58a6519993 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/CorrelatedSubqueryTest.java @@ -10,13 +10,13 @@ import static org.junit.Assert.assertEquals; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java index a9e4f2efbc..1c344b5011 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseJpaComplianceTest.java @@ -10,13 +10,13 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import java.util.Map; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java index 138dea8928..526ea2dd4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/SubqueryInSelectClauseTest.java @@ -11,13 +11,13 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java index ca9efce02c..58b83371a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/UncorrelatedSubqueryTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.criteria.subquery; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Customer; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java index 94eb01e921..aed7d6b1c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/tuple/TupleCriteriaTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.criteria.tuple; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Tuple; -import javax.persistence.criteria.CompoundSelection; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.junit.Test; @@ -235,7 +235,7 @@ public class TupleCriteriaTest extends AbstractMetamodelSpecificTest { tuple.get( 1, Integer.class ); try { - tuple.get( 0, java.util.Date.class ); + tuple.get( 0, Date.class ); fail( "Date is invalid type" ); } catch (IllegalArgumentException expected) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java index f0b0ad51a9..72cd105c90 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/Bell.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.ejb3configuration; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java index 37a74efd59..1d2436cc50 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.jpa.ejb3configuration; import java.util.Collections; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; import org.hibernate.HibernateException; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java index def8c055c0..ea5916dc76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java @@ -12,8 +12,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.util.Date; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java index c65c62b09b..5db174943b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java @@ -13,7 +13,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.jpa.test.Cat; @@ -93,4 +93,4 @@ public class EntityManagerSerializationTest { em.close(); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java index 1386708857..c2bb6e1cfe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.ejb3configuration; import java.util.Arrays; import java.util.Map; import java.util.function.Supplier; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Interceptor; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java index b8db321be7..bd38c8d5ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.ejb3configuration; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.util.Collections; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java index 2732fb2b69..ea197b1ff3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java @@ -13,8 +13,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.function.Consumer; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; import org.hibernate.EntityMode; import org.hibernate.HibernateException; @@ -112,7 +112,7 @@ public class PersisterClassProviderTest { @SuppressWarnings( {"UnusedParameters"}) public GoofyProvider( - org.hibernate.mapping.PersistentClass persistentClass, + PersistentClass persistentClass, EntityDataAccess entityDataAccessstrategy, NaturalIdDataAccess naturalIdRegionAccessStrategy, PersisterCreationContext creationContext) { @@ -716,7 +716,7 @@ public class PersisterClassProviderTest { } @Override - public java.util.List getAttributeMappings() { + public List getAttributeMappings() { return null; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java index 138316d46d..a0c856131c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/SessionFactoryObserverTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.ejb3configuration; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/Cable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/Cable.java index e930699085..491e66569d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/Cable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/Cable.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.ejb3configuration.id; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java index 0251707908..d31b8b3814 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.ejb3configuration.id; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import java.util.Collections; import java.util.HashMap; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java index 242e0cc480..159e11417b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Cat.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance( strategy = InheritanceType.JOINED ) @@ -23,4 +23,4 @@ public class Cat extends Pet { public void setLives(int lives) { this.lives = lives; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java index 0270181505..0c0973b037 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Category.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java index 2492e5dfaa..beba946423 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Colony.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java index 437b851af6..90d789baad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competition.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.jpa.emops; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.orm.test.jpa.emops.Competitor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java index 6053841a6f..3fa693fa6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Competitor.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java index 1398fad795..7f6839b9f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Decorate.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Decorate implements java.io.Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java index 51798ca3cd..13d2ca2448 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dog.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance( strategy = InheritanceType.JOINED ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java index ac7be45480..f0e8a15ac1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Dress.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java index 01d9ff6ed4..56802edbc7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Empire.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.jpa.emops; 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.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java index 2b79fe84b3..3b89af11be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/FlushTest.java @@ -11,8 +11,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java index d97f81fb97..6edf42a3aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Hoarder.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.emops; 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.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java index e1f9b0e179..c1c2f2f42c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Item.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java index 45e140a59c..cad1c11647 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Mail.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java index d5a881f187..42871f9bde 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Music.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java index 2d2c6343ea..acefeb5519 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Pet.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance( strategy = InheritanceType.JOINED ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java index d175e0fb74..3ff9c519d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/Race.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.jpa.emops; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.orm.test.jpa.emops.Competitor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java index 74f72a3f19..83f15e58ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RefreshTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java index 52dfc8e6b0..b433179e73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/RemoveTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.emops; -import javax.persistence.EntityManager; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.OptimisticLockException; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java index 1f0469ebae..d08ac92a74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/A.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.jpa.emops.cascade; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class A { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java index 16b6143003..3092c52b21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B1.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.jpa.emops.cascade; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; @Entity @@ -59,4 +59,4 @@ public class B1 { public void setC1List(Set list) { c1List = list; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java index d922f29440..82b2ba2302 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B2.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.jpa.emops.cascade; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; @Entity public class B2 { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java index 7fd28f1eb6..7e4e417fe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B3.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.orm.test.jpa.emops.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class B3 { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java index d5de71489a..ed17ecdbc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/B4.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.orm.test.jpa.emops.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class B4 { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java index 718282f29c..7e1e7d780e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C1.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.orm.test.jpa.emops.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class C1 { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java index aed75898e4..c259e8ed03 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/cascade/C2.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.orm.test.jpa.emops.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class C2 { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java index 052700707e..30f1727bd9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java @@ -17,14 +17,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PreUpdate; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Table; import java.util.Arrays; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java index a8f3596e3f..19b782a5e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.exception; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import org.hibernate.cfg.AvailableSettings; import org.hibernate.exception.ConstraintViolationException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java index eda62c1213..e02d39fd71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Instrument.java @@ -8,10 +8,10 @@ // $Id:$ package org.hibernate.orm.test.jpa.exception; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PrePersist; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java index 50c2a36624..e29695734b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Music.java @@ -8,10 +8,10 @@ // $Id$ package org.hibernate.orm.test.jpa.exception; import java.io.Serializable; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java index f17111e7f7..293619dc95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/Musician.java @@ -8,10 +8,10 @@ // $Id$ package org.hibernate.orm.test.jpa.exception; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java index 73f688bada..b048416827 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/SynchronizationTypeTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.factory; -import javax.persistence.SynchronizationType; +import jakarta.persistence.SynchronizationType; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java index 8cd5628114..39ffadd8d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/LegacyEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.factory.puUtil; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity(name = "LegacyEntity") @IdClass(LegacyEntityPk.class) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java index be602ca589..0c977cecab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/ModernEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.factory.puUtil; -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(name = "ModernEntity") public class ModernEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java index 47278c0af9..475d7ff99a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/factory/puUtil/NestedLegacyEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.factory.puUtil; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; @Entity(name = "NestedLegacyEntity") @IdClass(NestedLegacyEntityPk.class) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java index 636f326bd1..3dc898e072 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.jpa.graphs; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java index b43ef35424..f38f6f7d64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.graphs; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java index 03d4509378..39c989e277 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.jpa.graphs; import java.util.ArrayList; import java.util.List; -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; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java index e586e7bc29..656362ee4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.jpa.graphs; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java index adb1caee2a..3b1c592fd2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java @@ -4,21 +4,21 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.Table; import org.hibernate.graph.GraphSemantic; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java index 201a3cc737..1da461308a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java @@ -10,21 +10,21 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Subgraph; -import javax.persistence.Table; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Subgraph; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java index 7499d2a965..a952004095 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphUsingFetchGraphForLazyTest.java @@ -9,17 +9,17 @@ package org.hibernate.orm.test.jpa.graphs; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java index 2597237d6a..0248505e70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/FetchGraphTest.java @@ -2,16 +2,16 @@ package org.hibernate.orm.test.jpa.graphs; import java.util.Arrays; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java index 7d5c2ae042..b7e397a4e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java @@ -10,17 +10,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.TypedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; import org.hibernate.Hibernate; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java index 97101156e1..621af1ec62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.graphs; -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 Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java index 3238bc7f9d..c74ba94ac8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.graphs; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java index 9a0414a6df..17f2e59714 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java @@ -8,18 +8,19 @@ package org.hibernate.orm.test.jpa.graphs; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedEntityGraphs; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedEntityGraphs; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java index caaf475d5e..89bde00f4c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java @@ -16,9 +16,9 @@ import org.hibernate.testing.TestForIssue; import org.junit.Before; import org.junit.Test; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Subgraph; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Subgraph; import java.util.Collections; import java.util.Iterator; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java index 679ea2283d..8fd22c80cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java @@ -10,10 +10,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.Subgraph; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.Subgraph; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java index 320871da1a..332951af48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.jpa.identifier; import java.sql.ResultSet; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java index bc153bd8bf..b1107f6649 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.jpa.identifier; import java.sql.ResultSet; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java index cd4031fe06..3bef57bfea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Fruit.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.jpa.inheritance; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java index cf0f668089..c8c21ca063 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/inheritance/Strawberry.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.jpa.inheritance; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java index ac101fb74e..b83828bbc2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/integrationprovider/Person.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.integrationprovider; -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 Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java index 60e57ed469..50dcbe8f58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Address.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.jointable; -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 Christian Beikov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java index c6ca1f781a..aa9c8543c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jointable/Person.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.jointable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java index 96c243d0aa..6d88d47be1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/BlobTest.java @@ -12,7 +12,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java index a0f1900d60..586668dd4c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lob/ImageReader.java @@ -10,11 +10,11 @@ package org.hibernate.orm.test.jpa.lob; import java.io.Serializable; import java.sql.Blob; import java.sql.Clob; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java index 46373bd03d..10370c74b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lock.java @@ -7,13 +7,13 @@ //$Id$ package org.hibernate.orm.test.jpa.lock; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Version; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java index a20d7ad778..4f18d38c4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.jpa.lock; import java.util.Collections; -import javax.persistence.LockModeType; -import javax.persistence.LockTimeoutException; -import javax.persistence.PessimisticLockException; +import jakarta.persistence.LockModeType; +import jakarta.persistence.LockTimeoutException; +import jakarta.persistence.PessimisticLockException; import org.hibernate.LockOptions; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java index 7eec3c80e3..ab5de5e79c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java @@ -14,13 +14,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.persistence.LockModeType; -import javax.persistence.LockTimeoutException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; -import javax.persistence.PessimisticLockException; -import javax.persistence.Query; -import javax.persistence.QueryTimeoutException; +import jakarta.persistence.LockModeType; +import jakarta.persistence.LockTimeoutException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PessimisticLockException; +import jakarta.persistence.Query; +import jakarta.persistence.QueryTimeoutException; import org.hibernate.LockOptions; import org.hibernate.Session; import org.hibernate.TransactionException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java index a369dfdd8c..c86f16a7c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.jpa.lock; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java index 67ddb3aaf6..d76389684e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.lock; -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; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java index 188f06b5a4..0e7f6c3023 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Person.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.jpa.lock; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java index 49638e569f..4490b4a696 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/PessimisticWriteWithOptionalOuterJoinBreaksRefreshTest.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.jpa.lock; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.LockModeType; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.LockModeType; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java index 8b98ae3bbc..925e29a66b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java @@ -8,17 +8,17 @@ package org.hibernate.orm.test.jpa.lock; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.Query; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; import org.hibernate.LockMode; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.SQLServerDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java index f07b2df059..1d9108e6b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java @@ -10,7 +10,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.Session; import org.hibernate.dialect.CockroachDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java index 68438ef8f7..2f99ea8530 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UnversionedLock.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.orm.test.jpa.lock; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java index 7dc9d2b3f6..c5ad57d505 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/UpgradeLockTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.jpa.lock; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; @@ -93,11 +93,11 @@ public class UpgradeLockTest { } catch (Throwable expectedToFail) { while ( expectedToFail != null && - !( expectedToFail instanceof javax.persistence.OptimisticLockException ) ) { + !( expectedToFail instanceof jakarta.persistence.OptimisticLockException ) ) { expectedToFail = expectedToFail.getCause(); } assertTrue( - expectedToFail instanceof javax.persistence.OptimisticLockException, + expectedToFail instanceof jakarta.persistence.OptimisticLockException, "upgrade to OPTIMISTIC_FORCE_INCREMENT is expected to fail at end of transaction1 since transaction2 already updated the entity" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java index 76dd31b466..9269e97cd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/BidirectionalOneToManyNotNullableColumnTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.mapping; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.JiraKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java index a271cc6935..86829e6a21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/ColumnWithExplicitReferenceToPrimaryTableTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.mapping; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java index e4474efdd3..40de96016f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/DefaultCascadeTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.mapping; import java.util.Arrays; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java index 2f1593fe4e..7a5fe4e8f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyIndexColumnTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.mapping; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.IndexColumn; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java index f5b6ead01d..986c8f3969 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyOrderColumnTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.jpa.mapping; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.JiraKey; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java index 934dc14fbf..98de37fa22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/mapping/UnidirectionalOneToManyUniqueConstraintOrderColumnTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.jpa.mapping; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.FailureExpected; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java index 06ead6ff2c..300124f4c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Address.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java index 0b231f95b5..472be50b5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Animal.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java index f367d88bde..810adbfecc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Being.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java index eaa7930bc3..575d61fe3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cat.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java index e59c2c3f7e..53e4a2f320 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Cattish.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java index cc94db9f0b..beeba003f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Child.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java index d1993ef37a..3c071789da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/DeskWithRawType.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.jpa.metadata; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java index fabc3cf407..a67142ea16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Dog.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java index 93123cbd22..50915a132c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/EmployeeWithRawType.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.metadata; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** * @author Emmanuel Bernard @@ -54,4 +54,4 @@ public class EmployeeWithRawType implements java.io.Serializable { public void setDesks(Collection desks) { this.desks = desks; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java index d748b847e1..d34a0b7c2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Feline.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java index b101aaa2b7..37e6a15fb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Flower.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java index 258ff2894b..3c18ee19c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/FoodItem.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java index ba3e792cfb..8bca1751a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Fridge.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java index 503e6f9bf4..82aeb040ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Garden.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.jpa.metadata; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java index 5a7d524597..e5b27e809a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Giant.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java index b86d532f3b..1fc027db7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/House.java @@ -9,11 +9,11 @@ import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.MapKeyColumn; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OrderColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java index 0fcda92b08..7e4e0302dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/JoinedManyToOneOwner.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; /** * An entity that defines a @ManyToOne @JoinTable diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java index 18da5e8aa0..ba45fa5d04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/MetadataTest.java @@ -8,20 +8,20 @@ package org.hibernate.orm.test.jpa.metadata; import java.util.Locale; import java.util.Set; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Bindable; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.MappedSuperclassType; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.MappedSuperclassType; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java index cf79c8cccc..8884920086 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Parent.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.jpa.metadata; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java index 7e53a1f012..e4ba1fbab8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Person.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.metadata; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java index 96f0c5c947..c53bfee65c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Room.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metadata; import java.math.BigDecimal; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java index ea12500adc..e0099cc04a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SecondMetadataTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java index e191ffe6e4..e1926bb11c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimpleMedicalHistory.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.jpa.metadata; import java.io.Serializable; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java index fcd60e81d9..6665665999 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/SimplePerson.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java index 1ff7e8a994..5e6b20b57a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/StaticMetadataTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.metadata; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Bindable; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.Type; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java index dc576430a9..37da775476 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/Thing.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.metadata; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java index ae51448fc4..06cc8868d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metadata/WithGenericCollection.java @@ -7,15 +7,15 @@ package org.hibernate.orm.test.jpa.metadata; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * This class has a List of mapped entity objects that are themselves parameterized. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java index 36d8153b0e..39f48e5be2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/AbstractNameable.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.attribute; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java index bef962c7da..29795580c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.attribute; import java.util.Arrays; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java index 95c9453969..f4eb1981a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/Product.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.attribute; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java index 4bdcf4d891..db6a49e417 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/AbstractAddressable.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java index bb43a751c8..c7b0c4ac4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Address.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java index 5be29791bb..6438af3942 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/Company.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java index 4bbaa3d2f1..bf017c24bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.util.Arrays; import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java index c1c59f6737..31deb64f14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/AbstractProduct.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.MappedSuperclass; /** * @author Justin Wesley diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java index 509c519c07..3088bf7294 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.util.Arrays; import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java index d1999ba812..6527aa4fde 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/Product.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Justin Wesley diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java index a4d18f5172..6b9ec75dcb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embeddedid/ProductId.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Justin Wesley diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java index d1e706b0e4..02d9a3be6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttribute.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; /** * @author Alexis Bataille diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java index 941250e02f..2dbc8a28dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/AbstractAttributeId.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass; import java.io.Serializable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java index 11fed92ee6..5410fb00dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.util.Arrays; import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java index 106507e475..df62402bc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/ProductAttribute.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity @IdClass(value = ProductAttributeId.class) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java index 68e3ee0d30..f163786add 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/AbstractProduct.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Oliver Breidenbach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java index ee669cdf34..c3a41cb50b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden; import java.util.Arrays; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java index 5977b2697c..9bb13262af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product1.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Oliver Breidenbach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java index 1adf7a4383..80f4c6a3e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/Product2.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.overridden; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Oliver Breidenbach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java index 2de81d0c24..d74d2bf26d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/GenericsTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import javax.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EmbeddableType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java index 894a1389b6..6867818205 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.ManagedType; import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java index ce8ff70827..d446dd083f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassTypeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java index 10d225a212..83aacbb077 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MixedIdAndIdClassHandling.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java index 2b200107c1..50ae1ed1e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/Person.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.jpa.test.metamodel.BaseEmbeddedEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java index 25835b5acf..ca0a53c219 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/PersonId.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.jpa.metamodel; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Christian Beikov diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java index 87b31366e7..dda68dc38a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclass.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java index 50b2b94b94..fb2b552f42 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/SomeMappedSuperclassSubclass.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metamodel; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java index eedce9dd62..940f84e17a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/AbstractEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; -import javax.persistence.Embedded; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Embedded; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java index 663712f7b7..ecfffd4095 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java index 1925296809..b8842723dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/EmbeddableInSuperClassTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -42,4 +42,4 @@ public class EmbeddableInSuperClassTest { attribute = managedType.getAttribute( "embedded" ); assertNotNull( attribute ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java index d9b50b081f..d215279525 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/Entity.java @@ -9,6 +9,6 @@ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; /** * @author Hardy Ferentschik */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class Entity extends AbstractEntity { } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java index 3e3aad3df1..b67ccece08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/FunkyExtendedEmbeddedIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; -import javax.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EmbeddableType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java index 3fafe96d38..69c60ad494 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrder.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; import java.io.Serializable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; -@javax.persistence.Entity +@jakarta.persistence.Entity public class WorkOrder implements Serializable { @EmbeddedId private WorkOrderId id; @@ -21,4 +21,4 @@ public class WorkOrder implements Serializable { @OrderBy("operation, bomItemNumber") private Set components; /* other stuffs */ -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java index 9cd9249c37..90717d3ccb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponent.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; -import javax.persistence.EmbeddedId; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class WorkOrderComponent { @EmbeddedId private WorkOrderComponentId id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java index 737ebbf4a9..06df895882 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderComponentId.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole @@ -15,4 +15,4 @@ import javax.persistence.Embeddable; public class WorkOrderComponentId extends WorkOrderId { private Long lineNumber; /* other stuffs */ -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java index 057c352f48..a083ef18f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/attributeInSuper/WorkOrderId.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.jpa.metamodel.attributeInSuper; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.MappedSuperclass; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java index 8793514aa5..d1f7908b74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Animal.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.jpa.ops; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java index 6b9a452a64..3ec8c13283 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/ContainsTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.ops; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java index 1e3c94023e..fd3ff5942b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.jpa.ops; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java index 87d5ddd7e5..984b81feb8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.ops; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java index 4434936b13..496f4ed12a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Mammal.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.jpa.ops; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java index 7143f6062c..1cc5cbe3f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java @@ -4,14 +4,14 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Node.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/NumberedNode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/NumberedNode.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java old mode 100755 new mode 100644 index 3d8c76dcc4..254dcc0123 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java @@ -11,8 +11,8 @@ package org.hibernate.orm.test.jpa.ops; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.PersistenceException; -import javax.persistence.RollbackException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.RollbackException; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java index 69635789ae..816d63009e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.ops; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java index 89103c3e29..61c5274ddd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Reptile.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.orm.test.jpa.ops; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java index c4fcf4ff80..b43f3a363d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Workload.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.orm.test.jpa.ops; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java index 999c19a163..bd87399889 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/DeleteSharedOneToManyOrphansTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.orphan.onetomany; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java index f3e00d8e97..de9a2c43db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Feature.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.orphan.onetomany; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="feature") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java index 03ea696393..2a6dbcf751 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/Product.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.orphan.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="product") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java index 8703aa39c7..317e1f2917 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/A.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.jpa.orphan.onetoone; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Martin Simka diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java index 33d5b7a6c3..0f9194b537 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/B.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.jpa.orphan.onetoone; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; /** * @author Martin Simka diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java index ee0bd5cbfc..319ea8cf9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java index 43824d850e..0b6ddd529c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Preisregelung { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java index adba14240c..eb43e4f64e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; @Entity public class Tranche { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java index 80200fdd16..bc5a5303fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; @Entity public class Tranchenmodell { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java index 8d77c78149..a4ed736746 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java index 455d2552bc..7663aa0d36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java index 53f77d7e06..a1598661de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Query; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Query; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java index a21fe7a835..c82ea89fc4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryFlushModeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.FlushMode; import org.hibernate.Session; @@ -45,7 +45,7 @@ public class NamedQueryFlushModeTest { Query query = s.getNamedQuery( queryName ); assertEquals( FlushMode.MANUAL, query.getHibernateFlushMode() ); // JPA flush mode is an approximation - assertEquals( javax.persistence.FlushModeType.COMMIT, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.COMMIT, query.getFlushMode() ); } ); } @@ -58,7 +58,7 @@ public class NamedQueryFlushModeTest { Session s = entityManager.unwrap( Session.class ); Query query = s.getNamedQuery( queryName ); assertEquals( FlushMode.COMMIT, query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.COMMIT, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.COMMIT, query.getFlushMode() ); } ); } @@ -71,7 +71,7 @@ public class NamedQueryFlushModeTest { Session s = entityManager.unwrap( Session.class ); Query query = s.getNamedQuery( queryName ); assertEquals( FlushMode.AUTO, query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.AUTO, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.AUTO, query.getFlushMode() ); } ); } @@ -85,7 +85,7 @@ public class NamedQueryFlushModeTest { Query query = s.getNamedQuery( queryName ); assertEquals( FlushMode.ALWAYS, query.getHibernateFlushMode() ); // JPA flush mode is an approximation - assertEquals( javax.persistence.FlushModeType.AUTO, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.AUTO, query.getFlushMode() ); } ); } @@ -104,22 +104,22 @@ public class NamedQueryFlushModeTest { s.setHibernateFlushMode( FlushMode.MANUAL ); query = s.getNamedQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.COMMIT, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.COMMIT, query.getFlushMode() ); s.setHibernateFlushMode( FlushMode.COMMIT ); query = s.getNamedQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.COMMIT, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.COMMIT, query.getFlushMode() ); s.setHibernateFlushMode( FlushMode.AUTO ); query = s.getNamedQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.AUTO, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.AUTO, query.getFlushMode() ); s.setHibernateFlushMode( FlushMode.ALWAYS ); query = s.getNamedQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.AUTO, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.AUTO, query.getFlushMode() ); } ); } @@ -186,22 +186,22 @@ public class NamedQueryFlushModeTest { s.setHibernateFlushMode( FlushMode.MANUAL ); query = s.getNamedNativeQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.COMMIT, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.COMMIT, query.getFlushMode() ); s.setHibernateFlushMode( FlushMode.COMMIT ); query = s.getNamedNativeQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.COMMIT, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.COMMIT, query.getFlushMode() ); s.setHibernateFlushMode( FlushMode.AUTO ); query = s.getNamedNativeQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.AUTO, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.AUTO, query.getFlushMode() ); s.setHibernateFlushMode( FlushMode.ALWAYS ); query = s.getNamedNativeQuery( queryName ); assertNull( query.getHibernateFlushMode() ); - assertEquals( javax.persistence.FlushModeType.AUTO, query.getFlushMode() ); + assertEquals( jakarta.persistence.FlushModeType.AUTO, query.getFlushMode() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java index f623898dd1..4acf22ccf1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersWithDisabledValidationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.query; -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; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java index ad94cb56d6..6bfa8ed8e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithInParamListAndNamedEntityGraphTest.java @@ -8,15 +8,15 @@ package org.hibernate.orm.test.jpa.query; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.Table; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java index 39ee67e039..ccb13e29c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleQueryTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.jpa.query; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; +import jakarta.persistence.TypedQuery; import java.util.List; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java index 641fca64c3..6c3536f889 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TypedValueParametersTest.java @@ -13,12 +13,12 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Query; -import javax.persistence.Table; -import javax.persistence.TypedQuery; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Query; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; import org.hibernate.HibernateException; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java index 47be362895..464b52da4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/refresh/TestEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.refresh; -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 Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java index 747cfd1c95..213495286e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Document.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.schemagen; -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 Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java index 3c3c695aa3..4337a73efb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/Item.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.schemagen; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.io.Serializable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java index 02086d19c9..9151a0f691 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.jpa.schemagen; import java.net.URL; import java.util.Map; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java index 1e5379b6d2..1c5ac64cc2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.schemagen; -import javax.persistence.TypedQuery; +import jakarta.persistence.TypedQuery; import java.util.List; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java index d829783722..52a997ee6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java @@ -12,10 +12,10 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.cfg.Environment; import org.hibernate.jpa.boot.spi.Bootstrap; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java index 7bc590e79c..f27853a7b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java @@ -14,10 +14,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Map; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java index 16b4c2a2a2..5124c56dab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java @@ -12,10 +12,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Map; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; @@ -110,8 +110,8 @@ public class SchemaScriptFileGenerationFailureTest { private Map getConfig() { final Map config = Environment.getProperties(); - config.put( org.hibernate.cfg.AvailableSettings.HBM2DDL_SCRIPTS_DROP_TARGET, writer ); - config.put( org.hibernate.cfg.AvailableSettings.HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); + config.put( AvailableSettings.HBM2DDL_SCRIPTS_DROP_TARGET, writer ); + config.put( AvailableSettings.HBM2DDL_SCRIPTS_ACTION, "drop-and-create" ); config.put( AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true" ); ArrayList classes = new ArrayList<>(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java index 68ff91b39a..c0f74211fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.schemagen; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java index 0f512e23ab..63710d06e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.secondarytable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.SecondaryTable; import org.hibernate.annotations.Table; @@ -138,4 +138,4 @@ public class JoinedTableNullNonOptionalSecondaryTableTest extends AbstractNonOpt super( id ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java index aa9793d078..73304ccf99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.jpa.secondarytable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; import org.hibernate.annotations.Table; @@ -172,4 +172,4 @@ public class SingleTableNullNonOptionalSecondaryTableTest extends AbstractNonOpt super( id ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java index bb66987b6d..6a664277f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/serialization/EntityManagerDeserializationTest.java @@ -11,13 +11,13 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java index 7f60801d57..853e3feb03 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/statistics/SessionCloseCountTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.statistics; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java index f3d8d0671a..3bd2e4ab23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.jpa.temporal; import java.util.Calendar; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Query; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Query; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java index 0f258dbe9f..cdcc6929d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Alias.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.test.components; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * TODO : javadoc diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java index 227184da6e..b40b4beb28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Client.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.test.components; import java.io.Serializable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * The client domain entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java index bab86a7177..4f86432640 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.jpa.test.components; import java.util.ArrayList; import java.util.List; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java index 7873df65c4..0a2e25cf35 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/Name.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.jpa.test.components; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToMany; /** * The name component @@ -60,4 +60,4 @@ public class Name implements Serializable { public void setAliases(Set aliases) { this.aliases = aliases; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java index 8ac98863f3..15975e1741 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java @@ -7,11 +7,12 @@ //$Id$ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Version; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java index 762043c910..dac69d8793 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java @@ -9,19 +9,19 @@ package org.hibernate.orm.test.jpa.transaction; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java index c86e6d8d50..ee133cdd18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithJpaTransactionComplianceTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java index 06b246ab84..87b3bb8568 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/ClosedEntityManagerWithoutJpaTransactionComplianceTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java index 110c680fb7..0c940bb98c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.jpa.transaction; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; -import javax.persistence.Query; -import javax.persistence.RollbackException; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Query; +import jakarta.persistence.RollbackException; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java index a0f0ba23fb..0b94817127 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/GetTransactionTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityTransaction; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java index 136a01e949..f35e5ef25c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaGetTransactionThrowsExceptionTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; @@ -24,8 +24,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @Jpa( integrationSettings = { @Setting(name = AvailableSettings.JPA_TRANSACTION_TYPE, value = "JTA"), - @Setting(name = org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER, value = "org.hibernate.testing.jta.JtaAwareConnectionProviderImpl"), - @Setting( name = org.hibernate.cfg.AvailableSettings.JPA_TRANSACTION_COMPLIANCE, value = "true") + @Setting(name = AvailableSettings.CONNECTION_PROVIDER, value = "org.hibernate.testing.jta.JtaAwareConnectionProviderImpl"), + @Setting( name = AvailableSettings.JPA_TRANSACTION_COMPLIANCE, value = "true") }, nonStringValueSettingProviders = { JtaPlatformNonStringValueSettingProvider.class } ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java index c8768c82ca..0fd5399faa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/JtaReusingEntityTransactionTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.jpa.transaction; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityTransaction; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java index fdf54e972a..8c7d8a4b94 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.SynchronizationType; -import javax.persistence.TransactionRequiredException; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaUpdate; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.SynchronizationType; +import jakarta.persistence.TransactionRequiredException; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SharedSessionContractImplementor; @@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.fail; annotatedClasses = { Book.class }, integrationSettings = { @Setting(name = AvailableSettings.JPA_TRANSACTION_TYPE, value = "JTA"), - @Setting(name = org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER, value = "org.hibernate.testing.jta.JtaAwareConnectionProviderImpl"), + @Setting(name = AvailableSettings.CONNECTION_PROVIDER, value = "org.hibernate.testing.jta.JtaAwareConnectionProviderImpl"), }, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java index fdaad29b2d..bda6d88e8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java @@ -13,9 +13,9 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.RollbackException; import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java index 36f91a1425..87aed6d11a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoinHandlingChecker.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.EntityManager; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.internal.SessionImpl; @@ -86,4 +86,4 @@ public class TransactionJoinHandlingChecker { throw e; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java index 527a3e565f..4a8452f43b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.jpa.transaction; import java.util.concurrent.CountDownLatch; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; -import javax.persistence.SynchronizationType; -import javax.persistence.TransactionRequiredException; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.SynchronizationType; +import jakarta.persistence.TransactionRequiredException; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java index dcb3e85608..013e6647d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRollbackTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.Session; import org.hibernate.engine.transaction.spi.TransactionObserver; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java index 0e000b8f1f..45798d5cc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionRolledBackInDifferentThreadTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.jpa.transaction; -import javax.persistence.EntityManager; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.hibernate.HibernateException; @@ -70,7 +70,7 @@ public class TransactionRolledBackInDifferentThreadTest { transactionManager.setRollbackOnly(); transactionManager.commit(); } - catch (javax.persistence.PersistenceException e) { + catch (jakarta.persistence.PersistenceException e) { if ( e.getCause() instanceof HibernateException && e.getCause().getMessage().equals( "Transaction was rolled back in a different thread!" ) ) { /* @@ -109,7 +109,7 @@ public class TransactionRolledBackInDifferentThreadTest { em.joinTransaction(); transactionManager.commit(); } - catch (javax.persistence.PersistenceException e) { + catch (jakarta.persistence.PersistenceException e) { if ( e.getCause() instanceof HibernateException && e.getCause().getMessage().equals( "Transaction was rolled back in a different thread!" ) ) { /* diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java index c31af66618..d7821d6e63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/AbstractJtaBatchTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.jpa.transaction.batch; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java index 4730e62625..adcfe97513 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithFailingBatchTest.java @@ -10,9 +10,9 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.persistence.FlushModeType; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.FlushModeType; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; @@ -141,7 +141,7 @@ public class JtaWithFailingBatchTest extends AbstractJtaBatchTest { @Override public Object getValue() { - return JtaWithFailingBatchTest.TestBatchBuilder.class.getName(); + return TestBatchBuilder.class.getName(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java index c2f70d4114..aa85db9d9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/batch/JtaWithStatementsBatchTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.jpa.transaction.batch; import java.sql.PreparedStatement; import java.util.ArrayList; import java.util.List; -import javax.persistence.FlushModeType; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.FlushModeType; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl; @@ -169,7 +169,7 @@ public class JtaWithStatementsBatchTest extends AbstractJtaBatchTest { @Override public Object getValue() { - return JtaWithStatementsBatchTest.TestBatchBuilder.class.getName(); + return TestBatchBuilder.class.getName(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java index c4ce44f940..209bb28d97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/txn/ResourceLocalTransactionJoiningTest.java @@ -42,9 +42,9 @@ public class ResourceLocalTransactionJoiningTest extends AbstractJPATest { @TestForIssue( jiraKey = "HHH-9859" ) public void testExpectations() { // JPA spec is very vague on what should happen here. It does vaguely - // imply that javax.persistence.EntityManager.joinTransaction() should only be used + // imply that jakarta.persistence.EntityManager.joinTransaction() should only be used // for JTA EMs, however it does not enforced that nor does the TCK check that. - // And the TCK in fact does test calls to javax.persistence.EntityManager.isJoinedToTransaction() + // And the TCK in fact does test calls to jakarta.persistence.EntityManager.isJoinedToTransaction() // from resource-local EMs, so lets make sure those work.. Session session = sessionFactory().openSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java index 578dee824f..4c30282cdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.jpa.userguide.util; import java.io.Serializable; -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 Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java index 96c7e92c9f..a7a3c76c91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java @@ -5,10 +5,11 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.userguide.util; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java index 1c3b6c79d3..6f1edea5d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java @@ -5,9 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.userguide.util; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java index 6076047557..a651c22f2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java @@ -5,9 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.jpa.userguide.util; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; + +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java index 17012efa81..2a5f54ea33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.userguide.util; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java index f316768d6b..d39288c22f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.userguide.util; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java index 53048fe6a6..04359d27be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.userguide.util; -import javax.persistence.spi.LoadState; +import jakarta.persistence.spi.LoadState; import org.hibernate.engine.spi.PersistentAttributeInterceptable; import org.hibernate.engine.spi.PersistentAttributeInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java index 5a55a736d7..2a16e0327c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.userguide.util; -import javax.persistence.Persistence; -import javax.persistence.spi.LoadState; +import jakarta.persistence.Persistence; +import jakarta.persistence.spi.LoadState; import org.hibernate.jpa.internal.util.PersistenceUtilHelper; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java index 2c693a6f59..73c5154a90 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.jpa.userguide.util; import java.io.Serializable; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Temporal; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Temporal; /** * @author Emmanuel Bernard @@ -41,7 +41,7 @@ public class Sickness { } - @Temporal(javax.persistence.TemporalType.DATE) + @Temporal(jakarta.persistence.TemporalType.DATE) public Date getBeginTime() { return beginTime; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java index 8a7c836c87..7b5f4cb4e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.userguide.util; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java index 8c180ce788..fdc0591e16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.jpa.version; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java index 566e827aa2..e20649ea98 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.jpa.version; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java index 32203d4ed5..01bf78b8d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Article.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.orm.test.jpa.xml; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java index aa814a0631..9f848a2d10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/CounterListener.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.xml; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java index cb63b83cbf..0c3d4a7213 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/Employee.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.orm.test.jpa.xml; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard @@ -69,4 +69,4 @@ public class Employee { public void setMailAddress(Address mailAddress) { this.mailAddress = mailAddress; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java index 0fd88452cb..f9f0d63588 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/JpaEntityNameTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.jpa.xml; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java index 6159e84c2b..c63b14799a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.jpa.xml; import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java index 565b8b0116..17b79d62e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.jpa.xml; -import javax.persistence.EntityManager; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.EntityManager; +import jakarta.persistence.SharedCacheMode; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java index 96288e85ff..a4f3fab950 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Article.java @@ -7,14 +7,14 @@ //$Id: $ package org.hibernate.orm.test.jpa.xml.sequences; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java index bb97295bee..9f2ddc84f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/Employee.java @@ -7,8 +7,8 @@ //$Id: $ package org.hibernate.orm.test.jpa.xml.sequences; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard @@ -69,4 +69,4 @@ public class Employee { public void setMailAddress(Address mailAddress) { this.mailAddress = mailAddress; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java index 2a072790e6..12ce70ae9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/sequences/XmlTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.xml.sequences; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java index fa086230c4..d4fabf34ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java @@ -11,13 +11,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Properties; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.AnnotationException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java index 814a5d7585..916b8cd023 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.keymanytoone.bidir.component; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.HibernateException; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java index 1ec616e12f..555ca2d355 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.keymanytoone.bidir.embedded; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.stat.spi.StatisticsImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java index f68bcd17af..43b30c1e1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.lazydetachedpersist; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java index c1335b8b28..27f3f43146 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Child.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.lazyload; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Oleksander Dukhno diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java index 4f220c082d..2f0b11acc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.lazyload; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.LazyInitializationException; import org.hibernate.internal.AbstractSharedSessionContract; @@ -193,4 +193,4 @@ public class LazyLoadingLoggingTest { this.address = address; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java index e67de54d25..efffe9d76a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.lazyload; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java index 9cf7b1bdef..e86c0a8c86 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/ManyToOneLazyLoadingByIdTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.lazyload; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.LazyInitializationException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java index aef8328d9a..a88af434aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/Parent.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.lazyload; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Oleksander Dukhno diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java index 5f75f90aa1..8ff681ca95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java @@ -314,7 +314,7 @@ public class Baz implements Named, Serializable, Comparable { } /** - * @see java.lang.Comparable#compareTo(java.lang.Object) + * @see Comparable#compareTo(Object) */ public int compareTo(Object o) { return ( (Baz) o ).code.compareTo(code); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java index 6c6535d0c6..f24caaa253 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java @@ -10,25 +10,25 @@ package org.hibernate.orm.test.legacy; /** * @author hbm2java */ -public class Company extends org.hibernate.orm.test.legacy.Party { +public class Company extends Party { - java.lang.String id; - java.lang.String president; + String id; + String president; - java.lang.String getId() { + String getId() { return id; } - void setId(java.lang.String newValue) { + void setId(String newValue) { id = newValue; } - java.lang.String getPresident() { + String getPresident() { return president; } - void setPresident(java.lang.String newValue) { + void setPresident(String newValue) { president = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java index 69f0e22ff9..cd45751db5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java @@ -46,7 +46,7 @@ public class CompositeElement implements Comparable, Serializable { } /** - * @see java.lang.Comparable#compareTo(java.lang.Object) + * @see Comparable#compareTo(Object) */ public int compareTo(Object o) { return ( (CompositeElement) o ).foo.compareTo(foo); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java index f05a67468c..8082623c00 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java @@ -9,16 +9,16 @@ package org.hibernate.orm.test.legacy; /** * @author hbm2java */ -public class Drug extends org.hibernate.orm.test.legacy.Resource { +public class Drug extends Resource { - java.lang.String id; + String id; - java.lang.String getId() { + String getId() { return id; } - void setId(java.lang.String newValue) { + void setId(String newValue) { id = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java index 7db3d55577..f2b2f23ad2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java @@ -21,7 +21,7 @@ public class Foo implements Lifecycle, FooProxy, Serializable { private static int count=0; - public static class Struct implements java.io.Serializable { + public static class Struct implements Serializable { String name; int count; public boolean equals(Object other) { @@ -60,8 +60,8 @@ public class Foo implements Lifecycle, FooProxy, Serializable { float _zero; byte[] _bytes; boolean yesno; - java.io.Serializable blob; - java.io.Serializable nullBlob; + Serializable blob; + Serializable nullBlob; byte[] binary; FooComponent component; char _char; @@ -153,17 +153,17 @@ public class Foo implements Lifecycle, FooProxy, Serializable { //if (_foo!=null) _foo.setString(string); } - public java.util.Date getDate() { + public Date getDate() { return _date; } - public void setDate(java.util.Date date) { + public void setDate(Date date) { _date = date; } - public java.util.Date getTimestamp() { + public Date getTimestamp() { return _timestamp; } - public void setTimestamp(java.util.Date timestamp) { + public void setTimestamp(Date timestamp) { _timestamp = timestamp; } @@ -295,19 +295,19 @@ public class Foo implements Lifecycle, FooProxy, Serializable { this.yesno = yesno; } - public java.io.Serializable getBlob() { + public Serializable getBlob() { return blob; } - public void setBlob(java.io.Serializable blob) { + public void setBlob(Serializable blob) { this.blob = blob; } - public java.io.Serializable getNullBlob() { + public Serializable getNullBlob() { return nullBlob; } - public void setNullBlob(java.io.Serializable nullBlob) { + public void setNullBlob(Serializable nullBlob) { this.nullBlob = nullBlob; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java index 65e431e483..4aba74d832 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java @@ -12,16 +12,16 @@ package org.hibernate.orm.test.legacy; */ public class Intervention { - java.lang.String id; + String id; long version; String description; - java.lang.String getId() { + String getId() { return id; } - void setId(java.lang.String newValue) { + void setId(String newValue) { id = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java index 3fff16fedb..05d5fefcff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java @@ -10,16 +10,16 @@ package org.hibernate.orm.test.legacy; /** * @author hbm2java */ -public class Medication extends org.hibernate.orm.test.legacy.Intervention { +public class Medication extends Intervention { - org.hibernate.orm.test.legacy.Drug prescribedDrug; + Drug prescribedDrug; - org.hibernate.orm.test.legacy.Drug getPrescribedDrug() { + Drug getPrescribedDrug() { return prescribedDrug; } - void setPrescribedDrug(org.hibernate.orm.test.legacy.Drug newValue) { + void setPrescribedDrug(Drug newValue) { prescribedDrug = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java index 58f595b164..56073e032f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java @@ -127,7 +127,7 @@ public class NonReflectiveBinderTest { assertEquals( "wicked level", propertyAttribute.getValues().get(1) );*/ assertThat( propertyAttribute.getValue(), is( "monetaryamount level" ) ); - org.hibernate.mapping.Component component = (Component) property.getValue(); + Component component = (Component) property.getValue(); property = component.getProperty( "x" ); propertyAttribute = property.getMetaAttribute( "globalmutated" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java index 84b2dae6c8..dd50d89107 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java @@ -12,32 +12,32 @@ package org.hibernate.orm.test.legacy; */ public class Party { - java.lang.String id; - java.lang.String name; - java.lang.String address; + String id; + String name; + String address; - java.lang.String getId() { + String getId() { return id; } - void setId(java.lang.String newValue) { + void setId(String newValue) { id = newValue; } - java.lang.String getName() { + String getName() { return name; } - void setName(java.lang.String newValue) { + void setName(String newValue) { name = newValue; } - java.lang.String getAddress() { + String getAddress() { return address; } - void setAddress(java.lang.String newValue) { + void setAddress(String newValue) { address = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java index 87abc88d08..e1edd78dd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java @@ -10,43 +10,43 @@ package org.hibernate.orm.test.legacy; /** * @author hbm2java */ -public class Person extends org.hibernate.orm.test.legacy.Party { +public class Person extends Party { - java.lang.String id; - java.lang.String givenName; - java.lang.String lastName; - java.lang.String nationalID; + String id; + String givenName; + String lastName; + String nationalID; - java.lang.String getId() { + String getId() { return id; } - void setId(java.lang.String newValue) { + void setId(String newValue) { id = newValue; } - java.lang.String getGivenName() { + String getGivenName() { return givenName; } - void setGivenName(java.lang.String newValue) { + void setGivenName(String newValue) { givenName = newValue; } - java.lang.String getLastName() { + String getLastName() { return lastName; } - void setLastName(java.lang.String newValue) { + void setLastName(String newValue) { lastName = newValue; } - java.lang.String getNationalID() { + String getNationalID() { return nationalID; } - void setNationalID(java.lang.String newValue) { + void setNationalID(String newValue) { nationalID = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java index 18ba569044..2c2cc45f33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java @@ -12,32 +12,32 @@ package org.hibernate.orm.test.legacy; */ public class Resource { - java.lang.String id; - java.lang.String name; - java.lang.String userCode; + String id; + String name; + String userCode; - java.lang.String getId() { + String getId() { return id; } - void setId(java.lang.String newValue) { + void setId(String newValue) { id = newValue; } - java.lang.String getName() { + String getName() { return name; } - void setName(java.lang.String newValue) { + void setName(String newValue) { name = newValue; } - java.lang.String getUserCode() { + String getUserCode() { return userCode; } - void setUserCode(java.lang.String newValue) { + void setUserCode(String newValue) { userCode = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java index c636c7de90..31112b641a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java @@ -15,7 +15,7 @@ import java.util.Set; public class Role { long id; - java.lang.String name; + String name; Set interventions = new HashSet(); private List bunchOfStrings; @@ -27,11 +27,11 @@ private List bunchOfStrings; id = newValue; } - java.lang.String getName() { + String getName() { return name; } - void setName(java.lang.String newValue) { + void setName(String newValue) { name = newValue; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java index 49c8bdcb83..13f959487f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.loading; import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java index 0f0b4574bc..2354fc63f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/ReadonlyHintTest.java @@ -1,8 +1,8 @@ package org.hibernate.orm.test.loading; import java.util.Collections; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.QueryHints; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java index fdb3b09c6a..0aaf6741ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadSubSelectCollectionTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.loading.multiLoad; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.CacheMode; import org.hibernate.Hibernate; @@ -34,7 +34,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static javax.persistence.GenerationType.AUTO; +import static jakarta.persistence.GenerationType.AUTO; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java index 21c7d42a45..3fc437bd15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.loading.multiLoad; import java.util.List; import java.util.Objects; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SharedCacheMode; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.Table; import org.hibernate.CacheMode; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java index da734a2d9b..6e451e06e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/A.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.locking; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java index 11c3bc2f37..aeb28e8e12 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/AbstractSkipLockedTest.java @@ -3,8 +3,8 @@ package org.hibernate.orm.test.locking; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java index dfc20ae3fa..4814a8cc91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.locking; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Version; import org.hibernate.dialect.HANAColumnStoreDialect; import org.hibernate.dialect.HANARowStoreDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java index 98ef4c67da..61dd9186e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.locking; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.LockModeType; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Version; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java index 128d2ff747..7f7287fe2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.locking; import java.util.Collections; import java.util.concurrent.CountDownLatch; -import javax.persistence.LockModeType; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.LockModeType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java index d5c45bf644..11407ac0ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.locking; import java.util.Arrays; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Version; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java index 8f9c313493..9bb983ac68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/Door.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.locking.paging; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java index 547afc6688..bef64c48c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.locking.paging; import java.util.List; -import javax.persistence.LockModeType; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.LockModeType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.LockMode; import org.hibernate.query.NativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java index 712af02d17..b9da8efe4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.locking.warning; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.LockMode; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java index 210f45e16a..85cfbe6927 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Advertisement.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.manytomany; import org.hibernate.annotations.Where; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; import java.util.Set; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java index 4dc26d5d04..221eddd75e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Attachment.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.manytomany; -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; import java.util.Set; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Group.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java index bf8312da1b..c2d6feff11 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.manytomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java old mode 100755 new mode 100644 index 1c7121e5f0..e1cb5ccd05 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.manytomany; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java index 810be8eb21..63454d8c8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/PageAdvertisement.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.manytomany; -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 Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java index 7536adda60..1656015534 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/SubjectAdvertisement.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.manytomany; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; /** * @author Chris Cranford diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/UserGroup.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java index 176e75fcf1..8c7ade4a5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/mapkey/ManyToManyWithMaykeyAndSchemaDefinitionTest.java @@ -16,13 +16,13 @@ package org.hibernate.orm.test.manytomany.mapkey; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java index 9f29a5b9e2..e68ee1d8f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.manytomany.ordered; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java index 740033fc3d..faaada38ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.manytomanyassociationclass.surrogateid.generated; import java.util.HashSet; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.exception.ConstraintViolationException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/Group.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/SessionAttribute.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/SessionAttribute.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/map/UserGroup.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/Group.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/UserGroup.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java index fc15943d0a..9bc12cdbd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SecondaryTableTests.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.mapping; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java index 8ee52dc40e..75e65d9f5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java @@ -8,17 +8,17 @@ package org.hibernate.orm.test.mapping; import java.sql.Statement; import java.sql.Types; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.ModelPart; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java index 938b63df83..377c050440 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java @@ -1,11 +1,11 @@ package org.hibernate.orm.test.mapping.array; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.stat.spi.StatisticsImplementor; @@ -113,7 +113,7 @@ public class ArrayTests { public void setUp(SessionFactoryScope scope) { scope.inTransaction( session -> { - ArrayTests.Employee employee = new ArrayTests.Employee( 1, "Koen" ); + Employee employee = new Employee( 1, "Koen" ); employee.setToDoList( new String[] { "metro", "boulot", "dodo" } ); session.save( employee ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java index 482afb9c67..8062d16cfe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheComponent.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.attrorder; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java index d4a9f2201b..bc23c0d415 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attrorder/TheEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.attrorder; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java index 782ef55839..926742b1fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/aggregated/SmokeTests.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.mapping.cid.aggregated; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java index 425c50fefb..9b94e13d6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.mapping.cid.nonaggregated; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java index b94afa7902..244228bdcb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SortNaturalByDefaultTests.java @@ -4,12 +4,12 @@ import java.util.Arrays; import java.util.Objects; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hamcrest.collection.IsIterableContainingInOrder; @@ -31,7 +31,7 @@ import static org.hamcrest.MatcherAssert.assertThat; *

          • {@link org.hibernate.annotations.SortNatural @SortNatural}
            • *
          • {@link org.hibernate.annotations.SortComparator @SortComparator}
            • *
          • {@link org.hibernate.annotations.OrderBy @OrderBy(from hibernate)}
            • - *
          • {@link javax.persistence.OrderBy @OrderBy(from JPA)}
            • + *
          • {@link jakarta.persistence.OrderBy @OrderBy(from JPA)}
            • *
          * * @author Nathan Xu diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java index bc735de1cd..114a78b138 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/BasicContributorTests.java @@ -10,9 +10,9 @@ import java.io.InputStream; import java.util.Collection; import java.util.Collections; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.jaxb.Origin; import org.hibernate.boot.jaxb.SourceType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java index 34ee555dfe..f98cbc2da8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndLobTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.sql.Types; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java index e4015f0203..d078e0b6e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AndNationalizedTests.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java index d7d957cba3..0f0ddf3373 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java @@ -10,13 +10,13 @@ import java.sql.Clob; import java.sql.Timestamp; import java.sql.Types; import java.time.Instant; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.IrrelevantEntity; import org.hibernate.Session; @@ -64,7 +64,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; /** - * Tests the principle of adding "AttributeConverter" to the mix of {@link org.hibernate.type.Type} resolution + * Tests the principle of adding "AttributeConverter" to the mix of {@link Type} resolution * * @author Steve Ebersole */ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java index 045473fc30..202f51c055 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.net.MalformedURLException; import java.util.Date; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java index fed1a44024..6aa5c72f4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java index 7e2879dda6..ee7972b3a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java index a638cc3e5f..61cee019ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.net.MalformedURLException; import java.util.Date; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java index 9627cf70c4..1ceb106fae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.net.MalformedURLException; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java index 3931de33ac..7e5c683707 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitJavaTypeDescriptorTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.sql.Types; import java.util.Locale; -import javax.persistence.AttributeConverter; -import javax.persistence.Cacheable; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Immutable; import org.hibernate.boot.MetadataBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java index e98bb7b232..4ec695cf26 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitlyNamedConverterClassesTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java index 543dd5b591..5e382563c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/LongToDateConversionTest.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.io.Serializable; import java.util.Date; import java.util.stream.Stream; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TemporalType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TemporalType; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java index 7cd34d6789..8547d15796 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java @@ -10,11 +10,11 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Locale; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.jdbc.Work; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java index 9901f819b1..76b56c5733 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterEntityManagerFactoryTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java index 246e073301..f33dd80e80 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/PackagePrivateAttributeConverterSessionFactoryTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java index 8c5c80b4e6..358b68490a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.HibernateException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java index 51b3efa434..d1f90ee26b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SillyStringConverter.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java index ff0ebc1ea3..0034c960bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.net.MalformedURLException; import java.net.URL; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java index c630555b96..b815bb61ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.net.MalformedURLException; import java.net.URL; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Converts; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Converts; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java index 3df4800007..b77d0d3d58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleEmbeddableOverriddenConverterTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.Convert; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.CompositeType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java index 14fa93337f..b8b60e8d3a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleOverriddenConverterTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.StringType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java index 9902f4fa54..5602489d6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.converted.converter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java index b1138b46c1..a0fb7dcdd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/StringClobConverter.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.sql.Clob; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java index 77902dadf4..1ed0cc4976 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.mapping.converted.converter; import java.net.MalformedURLException; import java.util.Date; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; @@ -28,7 +28,7 @@ import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.junit.Assert.assertTrue; /** - * Jira HHH-8812 claims that explicit {@link javax.persistence.Convert} annotations are not processed when a orm.xml + * Jira HHH-8812 claims that explicit {@link jakarta.persistence.Convert} annotations are not processed when a orm.xml * file is used - specifically that the mixed case is not handled properly. * * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java index d32a08c0c2..1e70dbf869 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/Address.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.converted.converter.caching; -import javax.persistence.Cacheable; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java index 3761296d11..e7f1f15196 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/PostalAreaConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.converted.converter.caching; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyCustomConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyCustomConverter.java index fde63ae69f..20e3dd266a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyCustomConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyCustomConverter.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.mapping.converted.converter.custom; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java index a31e374b9f..c7968ebec8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.converted.converter.custom; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java index a20b0d056c..91c3a9f1f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementConversionTest.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.mapping.converted.converter.elementCollection; import java.util.HashSet; import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.CollectionTable; -import javax.persistence.Converter; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Converter; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java index 61a6d24c71..c2c4c54aef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionCompositeElementExplicitConversionTest.java @@ -10,17 +10,17 @@ import java.io.Serializable; import java.lang.reflect.Field; import java.util.HashSet; import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.CollectionTable; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java index a5533f6c21..222b58a6a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java @@ -10,15 +10,15 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Converter; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Converter; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java index cb44001dc3..11e8fd7955 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementExplicitConversionTest.java @@ -8,18 +8,18 @@ package org.hibernate.orm.test.mapping.converted.converter.elementCollection; import java.util.HashSet; import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java index 1e9f33e6cb..86d30465b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java @@ -11,18 +11,18 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Converts; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converts; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.mapping.Collection; import org.hibernate.mapping.IndexedCollection; @@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull; /** * Test for {@link org.hibernate.cfg.CollectionPropertyHolder}. * - * Tests that {@link javax.persistence.AttributeConverter}s are considered correctly for {@link javax.persistence.ElementCollection}. + * Tests that {@link jakarta.persistence.AttributeConverter}s are considered correctly for {@link jakarta.persistence.ElementCollection}. * * @author Markus Heiden * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java index 3f55f9b1fd..236d8acc0c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.mapping.converted.converter.generics; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java index 0622e76df1..8ae6dd524e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/inheritence/AttributeConverterOnSuperclassTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.mapping.converted.converter.inheritence; import java.util.List; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.model.convert.internal.ClassBasedConverterDescriptor; import org.hibernate.cfg.AttributeConverterDefinition; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java index 73355e15dd..2c4ae01d64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/literal/QueryLiteralTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.mapping.converted.converter.literal; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java index e784c71ca3..ee4eb21154 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/Address.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.converted.converter.lob; -import javax.persistence.Cacheable; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java index b7840df508..8ba19ba54b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/PostalAreaConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.converted.converter.lob; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java index 0977e08a92..6d15fe6a48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/ColorTypeConverter.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.mapping.converted.converter.map; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Steve Ebersole @@ -24,4 +24,4 @@ public class ColorTypeConverter implements AttributeConverter public ColorType convertToEntityAttribute(String dbData) { return dbData == null ? null : ColorType.fromExternalForm( dbData ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java index ae81b97cd4..35c6809aad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapElementConversionTest.java @@ -8,17 +8,17 @@ package org.hibernate.orm.test.mapping.converted.converter.map; import java.util.HashMap; import java.util.Map; -import javax.persistence.AttributeConverter; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.Converter; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.Converter; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java index 8aa39b9cc3..7859b76822 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyAttributeConverterTest.java @@ -8,21 +8,21 @@ package org.hibernate.orm.test.mapping.converted.converter.map; import java.util.HashMap; import java.util.Map; -import javax.persistence.AttributeConverter; -import javax.persistence.CascadeType; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java index e2e1d904ed..0e5242c46f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.mapping.converted.converter.map; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java index 764bce856d..102b52b25b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.converted.enums; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java index c9963955da..e6f6b81c4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/InvalidEnumeratedJavaTypeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.converted.enums; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.AnnotationException; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java index 2867b28110..237b5546c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.converted.enums; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.type.descriptor.JdbcBindingLogging; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java index 36490be355..fce269df36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.formula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java index a3e3fff3ac..e1e133ad22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.mapping.formula; import java.util.Collections; import java.util.List; -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; import org.hibernate.annotations.Formula; import org.hibernate.query.NativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java index e39f7e6b9f..ed59f05b1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.formula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java old mode 100755 new mode 100644 index 5c880b8bda..7836c6e0d8 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.mapping.formula; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; -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; import org.hibernate.annotations.Formula; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java index ae3999303f..a0491a5c3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithColumnTypesTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.mapping.formula; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.annotations.Formula; import org.hibernate.cfg.Configuration; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** - * Test that the queries generated by {@link org.hibernate.annotations.Formula} properly ignore type names when escaping identifiers. + * Test that the queries generated by {@link Formula} properly ignore type names when escaping identifiers. *

          * Created by Michael Hum on 17/07/2015. */ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java index 079ea81166..c93a8f3a69 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.mapping.formula; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java index da59fc7800..8961e008ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java @@ -21,9 +21,9 @@ import java.time.ZonedDateTime; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.NotImplementedYet; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java index 281d880b4b..ff840d9ba1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java @@ -20,10 +20,10 @@ import java.time.YearMonth; import java.time.ZonedDateTime; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.CreationTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java index f2fcf0ab71..739c9a847a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CurrentTimestampAnnotationTests.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.mapping.generated; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CurrentTimestamp; import org.hibernate.tuple.GenerationTiming; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java index c5242ffffe..580785f755 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java @@ -22,11 +22,11 @@ import java.time.YearMonth; import java.time.ZonedDateTime; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.ColumnDefault; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java index 4e4d6052c6..b1a778c21f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java @@ -20,10 +20,10 @@ import java.time.YearMonth; import java.time.ZonedDateTime; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.ColumnDefault; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java index a51d2964de..be51879da9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.mapping.generated; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Generated; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java index 27d2cc5ba9..0ac84fad94 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.generated; import java.sql.Timestamp; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java index f053171751..9c20d0a7e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.generated; import java.sql.Timestamp; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java index 918239e8d7..09be7abdc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.mapping.generated; import java.sql.Date; import java.sql.Timestamp; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java index 6032a4e556..7e41b0f382 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.generated; import java.sql.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java index a6adab2f04..339cbe297d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.mapping.generated; import java.sql.Date; import java.sql.Timestamp; import java.util.Calendar; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java index a25d2b3a69..c5e053d70c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.mapping.generated; import java.sql.Time; import java.sql.Timestamp; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.NotImplementedYet; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java index b8dd087d32..83cfd5ae29 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedInstantTests.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.mapping.generated.temporals; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CurrentTimestamp; import org.hibernate.tuple.GenerationTiming; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java index bf55c37dbc..a27fc26afd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/GeneratedUuidTests.java @@ -12,10 +12,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.ValueGenerationType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java index 50a911d92a..56e6500ab5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/MultipleGeneratedValuesTests.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.mapping.generated.temporals; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.CurrentTimestamp; import org.hibernate.dialect.SybaseASEDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java index e95201e1ac..2f8e507516 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedTests.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.mapping.generated.temporals; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.tuple.GenerationTiming; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java index baed59585e..c82b038680 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java index 1e281f47de..4a963fff40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java index d6d7389827..387549a72a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.mapping.inheritance; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java index 2da91a0ecc..68f248afa4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.mapping.inheritance; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java index 929313687e..c1083ead11 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.inheritance.discriminator; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java old mode 100755 new mode 100644 index 87eb5ff4e3..23e1daa427 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.mapping.inheritance.discriminator; import java.math.BigDecimal; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.proxy.HibernateProxy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java index 0e23010bb1..0cc304db78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.mapping.inheritance.discriminator; import java.math.BigDecimal; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.proxy.HibernateProxy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java index f64da8cbb1..e73f5054f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.inheritance.discriminator.joined; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java index 8c9390dea9..6f81f50fe5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.mapping.inheritance.joined; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java index b4e32b19df..66b9b01891 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.mapping.inheritance.joined; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java index c47ca07008..712fa552b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.mapping.inheritance.joined; import java.sql.Statement; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java index 33f71cff2f..7d2e7d74b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.mapping.inheritance.joined; import java.sql.Statement; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java index eb044e4455..15f772f18a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.mapping.inheritance.tableperclass; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java index bca95b0400..ef4a0501c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.inheritance.tableperclass; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.UnionSubclassEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java index d98df0e630..2bc39feade 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.inheritance.tableperclass; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.UnionSubclassEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java index 533f9251b2..ca3ff19705 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Company.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Company { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java index c47eccf766..b4b9614a7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/CostCenter.java @@ -1,8 +1,8 @@ package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CostCenter { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java index 676d77305b..57e896f2ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/Offer.java @@ -1,10 +1,10 @@ package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; @Entity public class Offer { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java index 20fdaa9661..cdb8f98f5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/User.java @@ -2,12 +2,12 @@ package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity @Table(name = "users") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java index 5386fa65ab..c23a6a8f33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/UserAuthorization.java @@ -1,8 +1,8 @@ package org.hibernate.orm.test.mapping.lazytoone.collectioninitializer; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class UserAuthorization { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java index ee9fa171be..d6fcfabadd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.mapping.manytomany; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java index 32261c8487..d454ee236b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java @@ -14,20 +14,20 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java index b5eef2dd6e..ed207079ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.mapping.manytomany; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.TypedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.TypedQuery; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java index 1640195ced..00e777d01c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.manytoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java index cdb80b9c0e..68a3796ead 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.manytoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneJoinTableTest.java index 21af6f22fd..f5220aeaa9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneJoinTableTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.mapping.manytoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.ModelPart; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java index 0f5c29582b..bb3924ac23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.manytoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.ModelPart; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java index a6dc9d29cf..4ad2483baf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java @@ -1,8 +1,8 @@ package org.hibernate.orm.test.mapping.naturalid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java index dba7e93940..18075ed749 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java @@ -10,10 +10,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.NaturalIdLoadAccess; import org.hibernate.NaturalIdMultiLoadAccess; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java index 91b7bce645..7cae3af85d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.naturalid.cid; -import javax.persistence.Basic; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java index 906ae11db5..b9a18fda21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.naturalid.cid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Donnchadh O Donnabhain diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java index 6ada3415b5..af916ac62c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCarrier.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.naturalid.composite; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java index c3b734f6d3..50651d10fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/PostalCode.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.naturalid.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java index 55c577cbc5..8fae34626b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.mapping.naturalid.compound; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java index 591a3618ae..8c61f88a2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.naturalid.compound; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java index 69d31bfb33..ea48d9b7de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Child.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.mapping.naturalid.immutable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java index 9bda5a0541..670cbd386a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.naturalid.immutable; -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; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java index 96305d9185..c53d84ec9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.naturalid.immutable; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.cfg.Environment; import org.hibernate.metamodel.RuntimeMetamodels; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java index dfd995a2ae..2d9f35be1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.naturalid.immutable; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java index 342d1fbe30..ba8f2f1f77 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/Parent.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.mapping.naturalid.immutable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Alex Burgel diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java index 3248ec04cf..fa6e86410c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/Building.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.orm.test.mapping.naturalid.immutableentity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java index 2894501941..1325205f4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/MappedSuperclassOverrideTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.naturalid.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java index 8441d41d31..f6b3f1d510 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/Principal.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.mapping.naturalid.inheritance; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java index e2c7c9e66e..af76f07396 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/System.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.mapping.naturalid.inheritance; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java index 983449eb74..cca1e574a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/User.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.naturalid.inheritance; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java index 37f01895e1..693d2b933a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/ExtendedEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.mapping.naturalid.inheritance.cache; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity public class ExtendedEntity extends MyEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java index 8888751f89..b59e3dd4cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/MyEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.naturalid.inheritance.cache; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java index 0e4d72c63b..ca8f7ccf10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/Principal.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.mapping.naturalid.inheritance.spread; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java index 5d6b1c0e26..a386662c73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/spread/User.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.mapping.naturalid.inheritance.spread; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java index bb63ed5d46..c07eed3f0a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.naturalid.lazy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java index 00d709ab0b..4cd200f72d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.mapping.naturalid.lazy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java index a209977b22..0473b18e31 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/A.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.mapping.naturalid.mutable.cached; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.HashSet; import java.util.Set; @@ -32,4 +32,4 @@ public class A { @OneToMany(mappedBy="assA") public Set assB = new HashSet(); -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java index 373f1fea45..7346444aaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/AllCached.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.naturalid.mutable.cached; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java index 41ab2b4f7e..1e7bfcd486 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/Another.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.naturalid.mutable.cached; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java index 1baeeb9869..a1d0ee9a55 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/B.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.naturalid.mutable.cached; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java index 655f9711e5..1497a6daeb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/SubClass.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.naturalid.mutable.cached; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Guenther Demetz diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java index e6b88c578b..7d3f6f13b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/A.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.mapping.naturalid.nullable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java index b2949e2b9f..1bd8b6f3c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/B.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.naturalid.nullable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java index 020487f3fd..85eed66199 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/C.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.mapping.naturalid.nullable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java index b0eb634a43..57ae6d9c72 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/D.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.naturalid.nullable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java index 416dcfad1b..37168edee7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.mapping.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java index 1a8a44d5c3..b7b655cbae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.mapping.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.collection.internal.PersistentBag; import org.hibernate.stat.spi.StatisticsImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java index 4795593aab..28a8a4f077 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java @@ -14,21 +14,21 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java index cdbf01e541..bc2907c855 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.mapping.onetomany; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TypedQuery; import org.hibernate.Hibernate; import org.hibernate.collection.internal.PersistentSet; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java index db538085e7..a34d003280 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.mapping.onetomany; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.orm.test.mapping.onetomany.OneToManyTest.Card; import org.hibernate.orm.test.mapping.onetomany.OneToManyTest.CardField; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java index b2d754af89..0cb44ce760 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithBidirectionalAssociationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.ModelPart; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java index b5b6b8fe61..c8ef8cae61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/EntityWithOneBidirectionalJoinTableAssociationTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.ModelPart; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java index 4ae5077419..fb180a0177 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.PropertyValueException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java index b3d759f031..5a23ac80f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java index ed6c8b7f01..8d9b28945e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java index ee82da10ae..d36d0ee643 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.AbstractEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java index eb808cb683..348c874714 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdJoinColumnTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java index 36fe446486..aa02c87292 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java index 0780083cd6..998d4c77ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/ToOneSelfReferenceTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.mapping.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.jdbc.SQLStatementInspector; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java index dc95d56102..db601fd2a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Item.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.onetoone.hhh9798; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class Item { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java index 0a93f51ce3..4c98c7e23a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.mapping.onetoone.hhh9798; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Transaction; import org.hibernate.exception.ConstraintViolationException; @@ -69,4 +69,4 @@ public class OneToOneJoinTableTest { } ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java index 3bd7f879b8..88d29ada6a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/Shipment.java @@ -7,15 +7,15 @@ package org.hibernate.orm.test.mapping.onetoone.hhh9798; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.validation.constraints.NotNull; @Entity public class Shipment { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java index 1129f89f42..b926d52f48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Address.java @@ -7,9 +7,9 @@ //$Id: A320.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $ package org.hibernate.orm.test.mapping.onetoone.primarykey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Address { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java index 186a437e0f..42308e3049 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/Person.java @@ -7,11 +7,11 @@ //$Id: A320.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $ package org.hibernate.orm.test.mapping.onetoone.primarykey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; @Entity public class Person { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java index 8108411306..51746e4c4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.mapping.quote; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java index 97afcca3e3..2fb19229f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/readwrite/ReadWriteEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.mapping.readwrite; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.ColumnTransformer; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java index 78b1859e7d..525ab06d1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.mapping.type.java; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Arrays; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/math/Math.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/math/Math.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java index 0f2f6e3455..4d796cba07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Address.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.metamodel; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Address implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java index 26771be127..2009acbd75 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Company.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.metamodel; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java index a460898e9d..63ef53470d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/LocalizedValue.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.metamodel; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class LocalizedValue implements ILocalizable { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java index c944deec93..207a7d8728 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/MetamodelTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.metamodel; import java.util.Arrays; 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; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java index 0ad773706e..0d1f538a7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/Person.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.metamodel; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java index 8386ee79a7..b062467b33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/ProductEntity.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.metamodel; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; @Entity public class ProductEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java index 4fad4ce190..11a912e4e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/WildcardTypeAttributeMetaModelTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.metamodel; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java index 772a657713..0aa7ec0537 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.metamodel.wildcardmodel; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java index 6648ff5980..36b985d8aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/AbstractOwner.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.metamodel.wildcardmodel; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java index 2095946e2d..2c47c656bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/EntityOne.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.metamodel.wildcardmodel; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EntityOne extends AbstractEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java index e8f458b596..5e2f57f3ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/wildcardmodel/OwnerOne.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.metamodel.wildcardmodel; import java.util.List; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OwnerOne extends AbstractOwner { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java index eb6e0dc39c..a9ca953734 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.nationalized; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java index dfeac8787d..4ac30a758f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/SimpleNationalizedTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.nationalized; import java.sql.NClob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java index 2b2ac0881a..0696864054 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.nationalized; import java.util.List; -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; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java index 7f6381bf3c..f1f709e4df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/UseNationalizedCharDataSettingTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.nationalized; -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; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -32,7 +32,7 @@ import org.junit.Test; import static org.junit.Assert.assertSame; /** - * Test the use of {@link org.hibernate.cfg.AvailableSettings#USE_NATIONALIZED_CHARACTER_DATA} + * Test the use of {@link AvailableSettings#USE_NATIONALIZED_CHARACTER_DATA} * to indicate that nationalized character data should be used. * * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java index 6a79a09520..a36924f50f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nonpkassociation/NonPkManyToOneAssociationTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.nonpkassociation; import java.io.Serializable; 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.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java index f450d05637..732c7de844 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java @@ -1,19 +1,19 @@ package org.hibernate.orm.test.notfound; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; @@ -914,4 +914,4 @@ public class OptionalEagerInEmbeddableNotFoundTest { } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java index 6db0393320..c0f5f4cd5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java @@ -1,13 +1,13 @@ package org.hibernate.orm.test.notfound; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; @@ -321,4 +321,4 @@ public class OptionalEagerMappedByNotFoundTest { this.person = person; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java index 83a0fb27e7..d789f84fe2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java @@ -1,18 +1,18 @@ package org.hibernate.orm.test.notfound; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; @@ -643,4 +643,4 @@ public class OptionalEagerNotFoundTest { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java index 109746fac0..fd5dccac7d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java @@ -1,18 +1,18 @@ package org.hibernate.orm.test.notfound; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; @@ -1002,4 +1002,4 @@ public class OptionalEagerRefNonPKNotFoundTest { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java index ac061657c6..35e850db1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java @@ -1,19 +1,19 @@ package org.hibernate.orm.test.notfound; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.ObjectNotFoundException; @@ -745,4 +745,4 @@ public class OptionalLazyNotFoundTest { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java index 616c81a13f..7529c91c5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java @@ -1,19 +1,19 @@ package org.hibernate.orm.test.notfound; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.ObjectNotFoundException; @@ -454,4 +454,4 @@ public class RequiredLazyNotFoundTest { this.name = name; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Salesperson.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Salesperson.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java index 8b208335b5..163d1ddd01 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteTest.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.ondelete.toone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -124,4 +124,4 @@ public class ToOneOnDeleteTest { @OnDelete(action = OnDeleteAction.CASCADE) private Child parent; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java index 7487e8ce39..c6fbc6084e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Inventory.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.ondemandload; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import java.math.BigDecimal; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java index 46cabbd064..5ce3b6112c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Product.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.ondemandload; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.io.Serializable; import java.math.BigDecimal; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java index 22148101dc..90b48a5d75 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/Store.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.ondemandload; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java index 8466b0d9d5..d2db7d84b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java @@ -9,16 +9,16 @@ package org.hibernate.orm.test.ondemandload.cache; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java index e2fb768bf1..7de266fcaa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.onetomany; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java index de94ed36c7..8cdb27c9dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.onetomany.inheritance.joined; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="BOOKTABJO") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java index 6b0b91fe60..8d5ecd2a7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Library.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.onetomany.inheritance.joined; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="LIBRARYJO") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java index 8b30387379..e67619d661 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/Product.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.onetomany.inheritance.joined; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Table(name="PRODTABJO") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java index 92e13c2a09..c4eb30492b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Book.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.onetomany.inheritance.perclass; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="BOOKTABPC") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java index 68050dc495..d47d495bdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Library.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.onetomany.inheritance.perclass; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="LIBRARYPC") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java index d5b1ee01cc..f536db0d32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/Product.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.onetomany.inheritance.perclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Table(name="PRODTABPC") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java index 0312c2d594..86cfbe226b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.onetomany.inheritance.single; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java index c453eec41a..4118cb9d63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Library.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.onetomany.inheritance.single; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java index 06a7db6a12..45103f796a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/Product.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.onetomany.inheritance.single; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Table(name="PRODTABSG") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java index 4f65b976ac..3c3e67e066 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Child.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.onetoone.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * @author Florian Rampp diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java index 1268e2161c..450e65f15f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/basic/Parent.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.onetoone.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Florian Rampp diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java index e6d2f5a3ca..50ffe98d48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java @@ -25,12 +25,12 @@ package org.hibernate.orm.test.onetoone.bidirectional; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.engine.internal.StatisticalLoggingSessionEventListener; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java index 4f9caa439d..7d72206ba1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheEnableSelectingTest.java @@ -1,14 +1,14 @@ package org.hibernate.orm.test.onetoone.cache; import java.util.concurrent.atomic.AtomicLong; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java old mode 100755 new mode 100644 index 411776155b..603e8529fd --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.onetoone.formula; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Entity.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Org.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Org.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java index 8b1d62221a..0246a3feec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/ABlockableEntity.java @@ -7,20 +7,20 @@ package org.hibernate.orm.test.onetoone.jointable; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; /** * @author Christian Beikov @@ -120,4 +120,4 @@ public abstract class ABlockableEntity { public void setOneToMany2(Set oneToMany2) { this.oneToMany2 = oneToMany2; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java index 58666686f3..afcd2e7e50 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Event.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.onetoone.jointable; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Christian Beikov @@ -31,4 +31,4 @@ public class Event extends ABlockableEntity { public void setDescription(String description) { this.description = description; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java index edaa079a93..b31dd039cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/Message.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.onetoone.jointable; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Christian Beikov @@ -31,4 +31,4 @@ public class Message extends ABlockableEntity { public void setDescription(String description) { this.description = description; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java index 85520488ed..2be9931d7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OtherEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.onetoone.jointable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Christian Beikov @@ -32,4 +32,4 @@ public class OtherEntity { this.id = id; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java index 99817d5343..b17c377193 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/lazy/LazyToOneTest.java @@ -7,16 +7,16 @@ package org.hibernate.orm.test.onetoone.lazy; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java index 59173f58a6..ad3cf96dc2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/BidirectionalOptionalOneToOneTest.java @@ -6,17 +6,17 @@ */ package org.hibernate.orm.test.onetoone.optional; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Entity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Entity.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Org.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Org.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java old mode 100755 new mode 100644 index 13aa71af62..3f1e71f8ee --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.ops; import java.util.ArrayList; import java.util.Collection; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.PersistentObjectException; import org.hibernate.dialect.AbstractHANADialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java index 843ca4c055..5ee11fa234 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeManagedAndCopiesAllowedTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.ops; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java index b0304498b0..f3d949c9ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.ops; import java.util.List; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Hibernate; import org.hibernate.StaleObjectStateException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java old mode 100755 new mode 100644 index 125d6d388b..f9fc275c60 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.ops; import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.NonUniqueObjectException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/NumberedNode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/NumberedNode.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java index 695b869aec..a9281f51f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToOneMergeTest.java @@ -7,15 +7,15 @@ package org.hibernate.orm.test.ops; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -124,4 +124,4 @@ public class OneToOneMergeTest { } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java index 3a43994219..5d3a996479 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.ops; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java old mode 100755 new mode 100644 index f3ab91c6b1..b8810fbcf5 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.ops; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java index 42b941f8de..8cb5259321 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.ops.genericApi; import java.util.NoSuchElementException; import java.util.Optional; -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; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java index 315c5a9c69..45f0272f0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.ops.genericApi; -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; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java old mode 100755 new mode 100644 index adde484b17..2d6768a804 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.optlock; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.JDBCException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java index c15a5f1b85..be59b76e9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.optlock; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Version; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java index 128a8fbaec..221a77150d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java @@ -1,10 +1,10 @@ package org.hibernate.orm.test.optlock; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Version; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/PublicationDate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/PublicationDate.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java index 1d7c8a11dc..d8fa6052e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.orderby; import java.util.List; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; @@ -113,4 +113,4 @@ public class OrderByTest { super( id, name ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/HqlOrderByIdsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/HqlOrderByIdsTest.java index a7fbf02427..2db2b61ff9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/HqlOrderByIdsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/HqlOrderByIdsTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.ordered; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.MySQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java old mode 100755 new mode 100644 index 6a9681b2fd..4eb2e08538 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.ordered; import java.util.Iterator; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java index 17dccef099..38b464dce9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/UseReservedKeywordInOrderByTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.ordered; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Part.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Part.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java index e108a94ac0..46c01161e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/EnrollableClass.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.orphan.elementcollection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "ENROLLABLECLASS") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java index f04a573134..546c1d7aab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java @@ -1,99 +1,99 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.orphan.manytomany; - -import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; - -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.DomainModel; -import org.hibernate.testing.orm.junit.SessionFactory; -import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -@DomainModel( - xmlMappings = "org/hibernate/orm/test/orphan/manytomany/UserGroup.hbm.xml" -) -@SessionFactory -public class ManyToManyOrphanTest { - - @AfterEach - public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from User" ).executeUpdate(); - session.createQuery( "delete from Group" ).executeUpdate(); - } - ); - } - - @Test - @TestForIssue(jiraKey = "HHH-8749") - public void testManyToManyWithCascadeDeleteOrphan(SessionFactoryScope scope) { - scope.inTransaction( - s -> { - User bob = new User( "bob", "jboss" ); - Group seam = new Group( "seam", "jboss" ); - seam.setGroupType( 1 ); - Group hb = new Group( "hibernate", "jboss" ); - hb.setGroupType( 2 ); - bob.getGroups().put( seam.getGroupType(), seam ); - bob.getGroups().put( hb.getGroupType(), hb ); - s.persist( bob ); - s.persist( seam ); - s.persist( hb ); - } - ); - - scope.inTransaction( - s -> { - User b = s.get( User.class, "bob" ); - assertEquals( 2, b.getGroups().size() ); - Group sG = s.get( Group.class, "seam" ); - assertEquals( (Integer) 1, sG.getGroupType() ); - Group hbG = s.get( Group.class, "hibernate" ); - assertEquals( (Integer) 2, hbG.getGroupType() ); - } - ); - - scope.inTransaction( - s -> { - User b = s.get( User.class, "bob" ); - assertEquals( 2, b.getGroups().size() ); - Group hG = s.get( Group.class, "hibernate" ); - b.getGroups().remove( hG.getGroupType() ); - assertEquals( 1, b.getGroups().size() ); - } - ); - - scope.inTransaction( - s -> { - User b = s.get( User.class, "bob" ); - assertEquals( 1, b.getGroups().size() ); - } - ); - - // Verify orphan group was deleted - scope.inTransaction( - s -> { - CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); - CriteriaQuery criteria = criteriaBuilder.createQuery( Group.class ); - criteria.from( Group.class ); - List groups = s.createQuery( criteria ).list(); - -// List groups = s.createCriteria( Group.class ).list(); - assertEquals( 1, groups.size() ); - assertEquals( "seam", groups.get( 0 ).getName() ); - } - ); - - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.orphan.manytomany; + +import java.util.List; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; + +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@DomainModel( + xmlMappings = "org/hibernate/orm/test/orphan/manytomany/UserGroup.hbm.xml" +) +@SessionFactory +public class ManyToManyOrphanTest { + + @AfterEach + public void tearDown(SessionFactoryScope scope) { + scope.inTransaction( + session -> { + session.createQuery( "delete from User" ).executeUpdate(); + session.createQuery( "delete from Group" ).executeUpdate(); + } + ); + } + + @Test + @TestForIssue(jiraKey = "HHH-8749") + public void testManyToManyWithCascadeDeleteOrphan(SessionFactoryScope scope) { + scope.inTransaction( + s -> { + User bob = new User( "bob", "jboss" ); + Group seam = new Group( "seam", "jboss" ); + seam.setGroupType( 1 ); + Group hb = new Group( "hibernate", "jboss" ); + hb.setGroupType( 2 ); + bob.getGroups().put( seam.getGroupType(), seam ); + bob.getGroups().put( hb.getGroupType(), hb ); + s.persist( bob ); + s.persist( seam ); + s.persist( hb ); + } + ); + + scope.inTransaction( + s -> { + User b = s.get( User.class, "bob" ); + assertEquals( 2, b.getGroups().size() ); + Group sG = s.get( Group.class, "seam" ); + assertEquals( (Integer) 1, sG.getGroupType() ); + Group hbG = s.get( Group.class, "hibernate" ); + assertEquals( (Integer) 2, hbG.getGroupType() ); + } + ); + + scope.inTransaction( + s -> { + User b = s.get( User.class, "bob" ); + assertEquals( 2, b.getGroups().size() ); + Group hG = s.get( Group.class, "hibernate" ); + b.getGroups().remove( hG.getGroupType() ); + assertEquals( 1, b.getGroups().size() ); + } + ); + + scope.inTransaction( + s -> { + User b = s.get( User.class, "bob" ); + assertEquals( 1, b.getGroups().size() ); + } + ); + + // Verify orphan group was deleted + scope.inTransaction( + s -> { + CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); + CriteriaQuery criteria = criteriaBuilder.createQuery( Group.class ); + criteria.from( Group.class ); + List groups = s.createQuery( criteria ).list(); + +// List groups = s.createCriteria( Group.class ).list(); + assertEquals( 1, groups.size() ); + assertEquals( "seam", groups.get( 0 ).getName() ); + } + ); + + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java index 2fccbf182a..347214f63f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java index 44c80d01d4..90d44bfa2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java index 9b98edd0cd..a8d3f7ae6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java index 6d91611383..ee646f42d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java index 6f6ccba3ff..bd9a03d7b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.orphan.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java index 21c52ad919..5bac9d9e64 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Preisregelung.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Preisregelung { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java index b4c9c8d70e..843225bd9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranche.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Tranche { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java index f2976718ce..b8f5d13277 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Tranchenmodell.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java index 6abb2b43e8..23bc906db4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/X.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java index d851f5ebda..cbd09a9110 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/Y.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.orphan.one2one.fk.bidirectional.multilevelcascade; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java index 852ee4bc60..4a9084b4da 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Preisregelung.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilevelcascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class Preisregelung { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java index fa9520046d..32da35e398 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranche.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilevelcascade; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Tranche { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java index 9bcba83f41..de54ccd1bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/Tranchenmodell.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.orphan.one2one.fk.reversed.bidirectional.multilev import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; @Entity public class Tranchenmodell { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java index 19adab08fb..c43999ac48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Feature.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.orphan.onetomany; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name="feature") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java index 9eddfdd933..d229eb191a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/Product.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.orphan.onetomany; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name="product") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java index 693c8c2b97..06720c7c77 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java @@ -2,14 +2,14 @@ package org.hibernate.orm.test.pagination; import java.io.Serializable; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.OracleDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java index 712d8cfd32..11f613bd4c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.pagination; import java.math.BigDecimal; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.query.NativeQuery; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java index c8e90f034c..57f201353b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Product.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.pagination.hhh9965; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Created on 17/12/17. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java index 235bf3068b..1950ffa63a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/hhh9965/Shop.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.pagination.hhh9965; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java index 909f815f10..8d71414b3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/AbstractSchemaSubstitutionFormulaTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.persister.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Formula; import org.hibernate.persister.entity.AbstractEntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java index d052973775..f96816936c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.persister.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Loader; import org.hibernate.annotations.NamedNativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java index 8743da7926..d61ca3a99f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.persister.entity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Loader; import org.hibernate.annotations.NamedNativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java index e298eda14e..682d15c63e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/JoinFormulaImplicitJoinTest.java @@ -1,14 +1,14 @@ package org.hibernate.orm.test.persister.entity; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinColumnsOrFormulas; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java index 06bf1486cb..facf079425 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/internal/ProcedureCallImplTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.procedure.internal; import java.util.stream.Stream; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java index 26cff8ef1a..a3a34adea4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.property; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.MappingException; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java index d139e1e808..50d3105e20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.property; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java index 2b56a672d0..0e102eb7aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Item.java @@ -10,8 +10,8 @@ package org.hibernate.orm.test.property; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Michael Rudolf diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java index 73d1c8cd7c..b9229956e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/Order.java @@ -12,11 +12,11 @@ package org.hibernate.orm.test.property; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Michael Rudolf diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java index c6c96f1319..cfac5c35de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWork.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.propertyref; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java index ec852f14f7..897f6b7190 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkPk.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.propertyref; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java index 5890f875ef..a43ce2dbae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.propertyref.basic; import java.util.Iterator; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java index 0ac6d908c7..2751239c5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.Hibernate; import org.hibernate.ObjectNotFoundException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java index 972bbcb5bc..84e47c55a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.proxy; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java index 84d2cf37e5..34afc9ef9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.proxy; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java index d34ff4fd64..cdf3e4008b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/AbstractEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.proxy.narrow; -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 Yoann Rodière diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java index 8682936344..75fd12e017 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ConcreteEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.proxy.narrow; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Yoann Rodière diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java index 117e14e15b..634fb860e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/LazyAbstractEntityReference.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.proxy.narrow; -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 Yoann Rodière diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java index 7c0036d836..baf88ccf85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Query; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; /** - * Tests for {@link javax.persistence.EntityManagerFactory#addNamedQuery} handling. + * Tests for {@link jakarta.persistence.EntityManagerFactory#addNamedQuery} handling. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java index 5114300623..66c9c6927a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.query; import java.sql.SQLException; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.SybaseDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java index 77ddb11ad5..d683b2a7a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/BasicCriteriaExecutionTests.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.criteria; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java index 1874456192..b8cdb38eec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaParameterTests.java @@ -10,11 +10,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.query.spi.QueryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java index 84640179bb..3e469c11b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.query.criteria; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java index 0089791281..af10f3e55e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java @@ -6,7 +6,8 @@ */ package org.hibernate.orm.test.query.criteria.internal; -import javax.persistence.criteria.Order; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Order; import org.hibernate.query.sqm.tree.expression.SqmExpression; import org.hibernate.query.sqm.tree.select.SqmSortSpecification; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java index 57b8f069d7..30e08b6938 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java @@ -7,16 +7,16 @@ package org.hibernate.orm.test.query.criteria.internal.expression; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.hibernate.testing.TestForIssue; @@ -148,4 +148,4 @@ public class SearchedCaseExpressionTest extends BaseCoreFunctionalTestCase { TYPE1, TYPE2, TYPE3 } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java index c0dc1ce649..06f5154f87 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java @@ -1,10 +1,10 @@ package org.hibernate.orm.test.query.criteria.internal.hhh11877; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class Foo { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java index 0d8239af61..5428b1eb46 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.query.criteria.internal.hhh11877; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java index 98aff270c4..b4c9464d08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java @@ -4,12 +4,12 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.From; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java index 15aec4cb9f..8055373ee7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java @@ -1,11 +1,11 @@ package org.hibernate.orm.test.query.criteria.internal.hhh13058; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Archie Cobbs diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java index bf0fcdb69c..5c231dddf7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java @@ -1,9 +1,9 @@ package org.hibernate.orm.test.query.criteria.internal.hhh13058; -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 Archie Cobbs diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java index d72d9dc3f3..da7ef5eb74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java @@ -1,12 +1,12 @@ package org.hibernate.orm.test.query.criteria.internal.hhh13058; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Archie Cobbs diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java index 3f4868f19b..4b33875293 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.criteria.internal.hhh13151; -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 SideEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java index 46207f9eb5..8b62e9e9ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.query.criteria.internal.hhh13151; import org.hibernate.annotations.*; import org.hibernate.annotations.CascadeType; -import javax.persistence.*; -import javax.persistence.Entity; +import jakarta.persistence.*; +import jakarta.persistence.Entity; @Entity @Inheritance(strategy = InheritanceType.JOINED) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java index 1847cb436f..dcc6261382 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.criteria.internal.hhh13151; -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 SuperEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java index 55b8950b2a..e47cc73638 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java @@ -14,9 +14,9 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java index 1123f8078e..b0db8bf7ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java @@ -1,8 +1,8 @@ package org.hibernate.orm.test.query.criteria.internal.hhh13908; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity(name = "Foo") @Table(name = "Foo") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java index 51be523f29..5284fd30a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java @@ -1,8 +1,8 @@ package org.hibernate.orm.test.query.criteria.internal.hhh13908; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.MySQLDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java index b2b12c88a4..4707e4174f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java @@ -1,10 +1,10 @@ package org.hibernate.orm.test.query.criteria.internal.hhh14197; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Archie Cobbs diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java index 87c622a74d..1bfda91fcf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java @@ -2,8 +2,8 @@ package org.hibernate.orm.test.query.criteria.internal.hhh14197; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; /** * @author Archie Cobbs diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java index e9414bce03..68b775274d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java @@ -5,16 +5,16 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Archie Cobbs diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java index f67e256e19..6c77c8c420 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java @@ -1,10 +1,11 @@ package org.hibernate.orm.test.query.criteria.internal.hhh14197; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java index 1adc27a2d8..63dcbe58b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.query.hql; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java index a0db4dbb60..bd092ba500 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.query.hql; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.SingularPersistentAttribute; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java index 91e78229b9..8188d1d675 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.query.hql; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java index deff19cecc..c86f356e23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastFunctionTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.query.hql; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java index 2aace44fea..0e7c39f034 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.query.hql; -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; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java index 786b03e838..1c543dcd9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.query.hql; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java index 1db7ca7fe5..8398292125 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.query.hql; import java.util.Date; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java index 8371076643..ce48886bc8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.query.hql; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java index 1f309000ff..4fa5c8bf51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java @@ -2,11 +2,11 @@ package org.hibernate.orm.test.query.hql; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java index f67342884e..fc845cd67e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java @@ -1,11 +1,11 @@ package org.hibernate.orm.test.query.hql; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java index d50dadce3e..f983eaac97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.query.hql; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.SybaseDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java index ede1c09619..a5b9dfdb5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FetchNonRootRelativeElementCollectionAndAssociationTest.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.query.hql; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Query; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; @@ -23,7 +23,7 @@ import org.hibernate.testing.orm.junit.Jpa; import org.junit.jupiter.api.Test; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; /** * @author Moritz Becker diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java index 350e7fece7..599a3ac32f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.query.hql; import java.time.LocalDate; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInspector; @@ -126,4 +126,4 @@ public class GroupByTest { } ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java index c743b39d69..aedc59ecb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.query.hql; import java.util.List; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.query.Query; import org.hibernate.query.criteria.HibernateCriteriaBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java index 9d72511a89..ba6fcce387 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertWithSubSelectTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.hql; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java index 655c5bd3f6..86ed890a2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.query.hql; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java index f75d0351aa..7776bc2230 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JoinOrderTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.hql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInspector; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java index 04b374b0c9..66282cef1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java @@ -10,8 +10,8 @@ import java.time.LocalDate; import java.time.Month; import java.util.List; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.NamedQueries; import org.hibernate.annotations.NamedQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java index 37bb738e20..3c8e874ed8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.query.hql; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Date; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.Session; import org.hibernate.orm.test.query.sqm.BaseSqmUnitTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java index b764373ac4..a7d4def17c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java @@ -13,11 +13,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.Arrays; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; import org.hibernate.query.NativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java index 1804deead9..acae336350 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.query.hql; -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; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java index 23c36d044d..cee803c5a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.query.hql; -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; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java index 58ef6a9aab..19446d7706 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SizeAttributeReferenceTest.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.query.hql; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java index a694ca93f8..fa646a5016 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java @@ -12,17 +12,17 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java index fa04645ab4..cd313e5cbe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.query.hql.mutation; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java index 76182ffa42..1472114a34 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/ExampleEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.hql.nullPrecedence; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Nathan Xu diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java index 644cece1c7..bcb7d173d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.hql.set; import java.util.List; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; import org.hibernate.query.SemanticException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java index 02084e309f..17e669775b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.query.hql.size; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.Hibernate; import org.hibernate.dialect.DerbyDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java index 36c885db61..1571a24514 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.query.hql.size; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java index b0efe90422..6ee809437d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.query.hql.size; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.dialect.DerbyDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java index 5aa70e3836..6157149dbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Skill.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.query.hql.size; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java index a55b01c404..3d0f797bb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Student.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.query.hql.size; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java index 9d3af47107..0bdfdc592e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/Teacher.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.query.hql.size; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java index 4793ef3872..d1ac4682a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.query.hql.treat; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.sqm.StrictJpaComplianceViolation; @@ -51,7 +51,7 @@ public class DiscriminatedTreatSmokeTesting { "where v.strategy = 'noneya'"; try { - session.createQuery( qryString, DiscriminatedTreatSmokeTesting.Volume.class ).list(); + session.createQuery( qryString, Volume.class ).list(); fail( "This should fail with strict compliance enabled" ); } catch (IllegalArgumentException e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java index ac9945ff34..e4fb04284c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.query.hql.treat; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.sqm.StrictJpaComplianceViolation; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java index e1e2b5a5bf..7672b2485b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.query.hql.treat; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.sqm.StrictJpaComplianceViolation; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java index d5fc899d96..99dc144a2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.query.hql.treat; import java.util.List; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.query.sqm.StrictJpaComplianceViolation; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java index 889207584e..ae2ad26ad9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleEntityWithNamedQueries.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.named.simple; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java index 73ca842a30..b8bcbd6a23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/named/simple/SimpleNamedQueryTests.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.query.named.simple; -import javax.persistence.FlushModeType; +import jakarta.persistence.FlushModeType; import org.hibernate.CacheMode; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java index 31d193fede..e31cbd4bd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/AggregateEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.query.resultcache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java index a422169ad4..00a58fe7bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/TestEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.query.resultcache; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java index 432df1ba4d..87997c2f92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedRoot.java @@ -6,18 +6,18 @@ */ package org.hibernate.orm.test.query.resultmapping; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java index cda82f816a..4bff2f4c47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType1.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.resultmapping; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java index 4584fb1be2..af17743689 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/DiscriminatedSubType2.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.query.resultmapping; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java index 0eb93c5c53..991ddaeafd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityWithEmbedded.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.query.resultmapping; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; import static org.hibernate.orm.test.query.resultmapping.EntityWithEmbedded.IMPLICIT; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java index c8743ea509..f1f7f5c157 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.query.resultmapping; -import javax.persistence.Basic; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FetchType; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Basic; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FetchType; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java index b546f36131..3a8ba44b5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.query.results; import java.util.List; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.JpaMetamodel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java index f53fc120a9..c9d203b5d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.query.results; import java.util.List; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java index 472594a6fe..00dcb66879 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleComposite.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.query.results; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java index 09d6de8eac..a8368586b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/SimpleEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.query.results; -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 Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java index 4a1d65395d..ade1265789 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.query.returns; import java.util.List; import java.util.function.Consumer; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; import org.hibernate.query.Query; import org.hibernate.query.spi.QueryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java index a7c12eb9af..14b99d4346 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.query.returns; import java.util.function.Consumer; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java index 52ce5b5c9f..3659725fce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryParameterTests.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.query.sql; import java.time.Instant; import java.time.temporal.ChronoUnit; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.boot.Metadata; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java index f98fa36118..78e9fa24d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java @@ -10,14 +10,14 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.Id; -import javax.persistence.Query; -import javax.persistence.QueryHint; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.Id; +import jakarta.persistence.Query; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -374,11 +374,11 @@ public class SynchronizedSpaceTests extends BaseNonConfigCoreFunctionalTestCase query = "select * from non_cached_entity", querySpaces = "non_cached_entity" ) - @javax.persistence.NamedNativeQuery( + @jakarta.persistence.NamedNativeQuery( name = "NonCachedEntity_raw_jpa", query = "select * from non_cached_entity" ) - @javax.persistence.NamedNativeQuery( + @jakarta.persistence.NamedNativeQuery( name = "NonCachedEntity_hint_jpa", query = "select * from non_cached_entity", hints = { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java index 2d73b924ef..8503976d61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/CrazyHqlKeywordEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.query.sqm.domain; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java index 7102b14195..2b6d155105 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/domain/Person.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.query.sqm.domain; import java.time.Instant; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java index e38c436708..4fd2a42ac5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.query.sqm.exec; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java index 6bce82bbaa..bbc924d32a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.query.sqm.param; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.Path; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.JpaMetamodel; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java index 6189c29114..b54dad3fd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/CompositeKey.java @@ -1,55 +1,55 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.querycache; - -import java.io.Serializable; - -import javax.persistence.Embeddable; - -@Embeddable -public class CompositeKey implements Serializable { - - private static final long serialVersionUID = 7950910288405475131L; - - public int a; - - public int b; - - public CompositeKey() { - } - - public CompositeKey(int a, int b) { - this.a = a; - this.b = b; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + a; - result = prime * result + b; - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - CompositeKey other = (CompositeKey) obj; - if (a != other.a) - return false; - if (b != other.b) - return false; - return true; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.querycache; + +import java.io.Serializable; + +import jakarta.persistence.Embeddable; + +@Embeddable +public class CompositeKey implements Serializable { + + private static final long serialVersionUID = 7950910288405475131L; + + public int a; + + public int b; + + public CompositeKey() { + } + + public CompositeKey(int a, int b) { + this.a = a; + this.b = b; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + a; + result = prime * result + b; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CompositeKey other = (CompositeKey) obj; + if (a != other.a) + return false; + if (b != other.b) + return false; + return true; + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java index 5d2e810cc1..eb329b13c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCompositeKey.java @@ -1,25 +1,25 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.querycache; - -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; - -@Entity -public class EntityWithCompositeKey { - - @EmbeddedId - public CompositeKey pk; - - public EntityWithCompositeKey() { - } - - public EntityWithCompositeKey(CompositeKey pk) { - this.pk = pk; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.querycache; + +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; + +@Entity +public class EntityWithCompositeKey { + + @EmbeddedId + public CompositeKey pk; + + public EntityWithCompositeKey() { + } + + public EntityWithCompositeKey(CompositeKey pk) { + this.pk = pk; + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java index 7158fbe7fc..694a11a0e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithStringCompositeKey.java @@ -1,29 +1,29 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.querycache; - -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - -@Entity -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) -public class EntityWithStringCompositeKey { - - private StringCompositeKey pk; - - @EmbeddedId - public StringCompositeKey getPk() { - return pk; - } - - public void setPk(StringCompositeKey pk) { - this.pk = pk; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.querycache; + +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +@Entity +@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) +public class EntityWithStringCompositeKey { + + private StringCompositeKey pk; + + @EmbeddedId + public StringCompositeKey getPk() { + return pk; + } + + public void setPk(StringCompositeKey pk) { + this.pk = pk; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java index 19af044f1a..3925dc0b55 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheJoinFetchTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.querycache; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.SessionFactory; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java index f7969f0bf0..16b4ef192b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StringCompositeKey.java @@ -1,65 +1,65 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.querycache; - -import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; - -@Embeddable -public class StringCompositeKey implements Serializable { - - private static final long serialVersionUID = 1L; - - private String substation; - - private String deviceType; - - private String device; - - private String analog; - - // For some dialects, the sum of a primary key column lengths cannot - // be larger than 255 (DB2). Restrict them to a sufficiently - // small size. See HHH-8085. - - @Column( length = 50 ) - public String getSubstation() { - return substation; - } - - public void setSubstation(String substation) { - this.substation = substation; - } - - @Column( length = 50 ) - public String getDeviceType() { - return deviceType; - } - - public void setDeviceType(String deviceType) { - this.deviceType = deviceType; - } - - @Column( length = 50 ) - public String getDevice() { - return device; - } - - public void setDevice(String device) { - this.device = device; - } - - @Column( length = 50 ) - public String getAnalog() { - return analog; - } - - public void setAnalog(String analog) { - this.analog = analog; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.querycache; + +import java.io.Serializable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +@Embeddable +public class StringCompositeKey implements Serializable { + + private static final long serialVersionUID = 1L; + + private String substation; + + private String deviceType; + + private String device; + + private String analog; + + // For some dialects, the sum of a primary key column lengths cannot + // be larger than 255 (DB2). Restrict them to a sufficiently + // small size. See HHH-8085. + + @Column( length = 50 ) + public String getSubstation() { + return substation; + } + + public void setSubstation(String substation) { + this.substation = substation; + } + + @Column( length = 50 ) + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + @Column( length = 50 ) + public String getDevice() { + return device; + } + + public void setDevice(String device) { + this.device = device; + } + + @Column( length = 50 ) + public String getAnalog() { + return analog; + } + + public void setAnalog(String analog) { + this.analog = analog; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java index bfc91c1eb5..a091fc049b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.querycache; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.cfg.AvailableSettings; @@ -179,4 +179,4 @@ public class StructuredQueryCacheTest { this.id = id; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java index ca386793e7..2aa5b1fed8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ColumnDefinitionQuotingTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.quote; import java.util.Iterator; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java index 273c5c031e..c23bb1434c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/House.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.quote; -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 Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java index 1995d02989..b594d69897 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Person.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.quote; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java index 88f9d631c5..e23e14b53e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Phone.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.orm.test.quote; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java index f529e74af8..ed53d3686b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java @@ -8,17 +8,17 @@ package org.hibernate.orm.test.quote; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java index 6bfbbb23f1..5036d8ac10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/Role.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.orm.test.quote; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java index 7c83fb6ff8..83e7224b71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.quote; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.HibernateException; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java index 0066f2f8c6..8abb1fea5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/User.java @@ -12,17 +12,17 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java index 908b7df52c..b15fec7ef0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/TestEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.refresh; -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 Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java index e63e7af98a..7037ebbf4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.resource.common; -import javax.transaction.Status; -import javax.transaction.Synchronization; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java index fd374b5ef0..b6b425f281 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.resource.common; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java index 2b21f04f58..2c84bef97b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.resource.transaction; -import javax.transaction.Status; -import javax.transaction.Synchronization; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl; import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java index ebf79bdb17..d62d6cb2b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java @@ -10,8 +10,8 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.sql.DataSource; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java index 829cbe696b..5f618c0af0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.resource.transaction.jta; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.hibernate.TransactionException; import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java index 8b34914241..f5daff0b5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.resource.transaction.jta; import java.util.Map; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java index 274ecb76c8..a1ef93f723 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.resource.transaction.jta; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java index 27db51b835..93d970910b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.resource.transaction.jta; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.JtaSynchronizationStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java index 214cbc2e09..e379f88fc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.resource.transaction.jta; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java index d948882b95..298cc03f48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/rowid/RowIdTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.rowid; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.RowId; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java index 5274fc8576..dda82e3594 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -157,7 +157,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_1", catalog = "the_catalog_1") + @jakarta.persistence.Table(name = "the_entity_1", catalog = "the_catalog_1") public static class Catalog1Entity1 { @Id @@ -173,7 +173,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_2", catalog = "the_catalog_1") + @jakarta.persistence.Table(name = "the_entity_2", catalog = "the_catalog_1") public static class Catalog1Entity2 { @Id @@ -189,7 +189,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_3", catalog = "the_catalog_2") + @jakarta.persistence.Table(name = "the_entity_3", catalog = "the_catalog_2") public static class Catalog2Entity3 { @Id @@ -205,7 +205,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_4", catalog = "the_catalog_2") + @jakarta.persistence.Table(name = "the_entity_4", catalog = "the_catalog_2") public static class Catalog2Entity4 { @Id @@ -221,7 +221,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_0") + @jakarta.persistence.Table(name = "the_entity_0") public static class CatalogNoneEntity0 { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java index e310a29d19..3e2e18d579 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -172,7 +172,7 @@ public class SchemaFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_1", schema = "the_schema_1") + @jakarta.persistence.Table(name = "the_entity_1", schema = "the_schema_1") public static class Schema1Entity1 { @Id @@ -188,7 +188,7 @@ public class SchemaFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_2", schema = "the_schema_1") + @jakarta.persistence.Table(name = "the_entity_2", schema = "the_schema_1") public static class Schema1Entity2 { @Id @@ -204,7 +204,7 @@ public class SchemaFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_3", schema = "the_schema_2") + @jakarta.persistence.Table(name = "the_entity_3", schema = "the_schema_2") public static class Schema2Entity3 { @Id @@ -220,7 +220,7 @@ public class SchemaFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_4", schema = "the_schema_2") + @jakarta.persistence.Table(name = "the_entity_4", schema = "the_schema_2") public static class Schema2Entity4 { @Id @@ -236,7 +236,7 @@ public class SchemaFilterTest extends BaseUnitTestCase { } @Entity - @javax.persistence.Table(name = "the_entity_0") + @jakarta.persistence.Table(name = "the_entity_0") public static class SchemaNoneEntity0 { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java index 4f638e79f8..a6929bff24 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java @@ -11,11 +11,11 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -114,7 +114,7 @@ public class SequenceFilterTest extends BaseUnitTestCase { @Entity @SequenceGenerator(initialValue = 1, name = "idgen", sequenceName = "entity_1_seq_gen") - @javax.persistence.Table(name = "the_entity_1", schema = "the_schema_1") + @jakarta.persistence.Table(name = "the_entity_1", schema = "the_schema_1") public static class Schema1Entity1 { @Id @@ -132,7 +132,7 @@ public class SequenceFilterTest extends BaseUnitTestCase { @Entity @SequenceGenerator(initialValue = 1, name = "idgen2", sequenceName = "entity_2_seq_gen") - @javax.persistence.Table(name = "the_entity_2", schema = "the_schema_2") + @jakarta.persistence.Table(name = "the_entity_2", schema = "the_schema_2") public static class Schema2Entity2 { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java index aa4597e861..36e4344fba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java @@ -12,9 +12,9 @@ import java.nio.file.Files; import java.util.EnumSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java index 9bee436efe..db4423f265 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java @@ -12,9 +12,9 @@ import java.nio.file.Files; import java.util.EnumSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java index 3f16133daa..2adb36edef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java @@ -12,10 +12,10 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.Collection; import java.util.EnumSet; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java index 1b2286829b..a96863dbda 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java @@ -10,9 +10,9 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.EnumSet; import java.util.Properties; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java index d243c58777..213f25cd10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.schemaupdate; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java index 588f519b5c..af8303636d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java index 81f3da43c5..5074d6bdf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.schemaupdate; import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.ForeignKey; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java index 88fa97c226..746c570ddd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java index 9e19c4889a..2927d0c4ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java @@ -24,10 +24,10 @@ package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java index 2642cabc14..0fff3a9175 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java @@ -15,12 +15,12 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.EnumSet; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java index b39dbdb2cf..f3e3a28a3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java @@ -12,9 +12,9 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.util.EnumSet; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java index ab6f917778..9f0cbb1642 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaCreationToOutputScriptTest.java @@ -13,8 +13,8 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.HashMap; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java index 7f59001e4f..5dba3091a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.schemaupdate; -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; import java.util.EnumSet; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java index 38f5bcb865..319f96a819 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropToOutputScriptTest.java @@ -13,8 +13,8 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.HashMap; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java index 2de2a6d3ac..8fbb938a37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java @@ -7,16 +7,11 @@ package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.Environment; -import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; @@ -25,11 +20,15 @@ import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.BaseUnitTest; import org.hibernate.testing.orm.junit.RequiresDialect; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java index d6ba54c177..fa9f153bac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java @@ -109,7 +109,7 @@ public class SchemaExportTest extends BaseUnitTestCase { public void testGenerateDdlToFile() { final SchemaExport schemaExport = new SchemaExport(); - java.io.File outFile = new java.io.File("schema.ddl"); + File outFile = new File("schema.ddl"); schemaExport.setOutputFile( outFile.getPath() ); // do not script to console or export to database diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java index 32cf80075e..27a278cbb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java @@ -27,10 +27,10 @@ import java.sql.SQLException; import java.util.EnumSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java index 9be4490ef8..7be8680ddf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java index ae16abdd0d..acf15652b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.schemaupdate; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java index df3b57ca8f..a0d4fc7e95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationToOutputScriptTest.java @@ -13,8 +13,8 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.HashMap; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java index 9efdcc7580..b47de93851 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java @@ -11,8 +11,8 @@ import static org.junit.Assert.fail; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java index dbe986db3e..78fb92026b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java @@ -11,9 +11,9 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.util.EnumSet; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java index 8cd8d9f390..ee7db96591 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java @@ -4,9 +4,9 @@ import java.io.File; import java.nio.file.Files; import java.util.EnumSet; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java index 2c3e75ceae..02ee666526 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java @@ -12,9 +12,9 @@ import java.util.EnumSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java index 37032fed2b..4f8cfa8b7b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java @@ -13,8 +13,8 @@ import java.io.File; import java.io.IOException; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; @@ -88,4 +88,4 @@ public class SchemaUpdateHaltOnErrorTest { private String select; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java index ea6a09f375..a64fe347d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; import java.util.EnumSet; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SecondaryTable; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SecondaryTable; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java index 984f615fe9..ff58644769 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; import java.util.EnumSet; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.SecondaryTables; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.SecondaryTables; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java index 5fd03cc1ad..406bafdb95 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; import java.util.EnumSet; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java index 6f496df659..6a8dab2c2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.schemaupdate; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java index e16f626ca0..8bb7fccd4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java @@ -19,22 +19,22 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java index 180c7ecc90..8fb3886716 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.schemaupdate; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java index 20aab3a7bf..ea358534b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java @@ -16,21 +16,21 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.model.naming.Identifier; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java index 1e53651138..efdb914e6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java index 4b4378729b..f167aa99ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseAndQuotedNameTest.java @@ -12,9 +12,9 @@ import java.nio.file.Files; import java.util.EnumSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java index b4a5378f6f..7cee765441 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithUseJdbcMetadataDefaultsSettingToFalseTest.java @@ -12,8 +12,8 @@ import java.nio.file.Files; import java.util.EnumSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java index f9f7cc5ebd..0733fd4667 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.schemaupdate; import java.io.IOException; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java index 73e5ed21ec..e001979243 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java index 33eaa278b2..becb4dc58a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java @@ -12,9 +12,9 @@ import java.nio.file.Files; import java.util.EnumSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java index adeca6c06b..0c5384608b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java @@ -12,8 +12,8 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.util.EnumSet; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Table; import org.hibernate.boot.MetadataSources; @@ -89,7 +89,7 @@ public class TableCommentTest extends BaseNonConfigCoreFunctionalTestCase { } @Entity(name = "TableWithComment") - @javax.persistence.Table(name = "TABLE_WITH_COMMENT") + @jakarta.persistence.Table(name = "TABLE_WITH_COMMENT") @Table(appliesTo = "TABLE_WITH_COMMENT", comment = "comment snippet") public static class TableWithComment { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java index 82a35eac2b..b9d2a33105 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java index 9e558e8113..7eddc63a4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java @@ -11,15 +11,15 @@ import java.io.Serializable; import java.nio.file.Files; import java.util.EnumSet; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java index bf982e933b..fc7455c625 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.Set; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java index 35f7629ccf..8ebf9054a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java @@ -14,11 +14,11 @@ import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java index 58e47bbcbc..824c27df8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.schemaupdate.foreignkeys; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java index ad75f12d98..d369f1568c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java index cafabf2f98..ac5f91cb79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PrimaryKeyJoinColumn; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java index b359ce4aad..6c1d55b385 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java index 8251f49542..338ecc8aad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java index 0f57544e88..2dac8819e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.Set; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java index fd7a6f3d37..20c6f769b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.schemaupdate.foreignkeys; import java.util.EnumSet; import java.util.Map; import java.util.TreeMap; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java index 63812348a6..b0693d44e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import java.util.List; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java index f9b9ffe70e..e4ad2876d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java index 65335ed97c..5c82950cc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java index 6eb65a01b8..9415818dab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java index 67f909faa2..06696e1f9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java index 9b0f7eacd8..720361a9a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java index 24a1d2d773..35b1527ca8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java index 85d7e60bdf..5d367c126e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java index 951c5064d9..5537b67322 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java @@ -12,12 +12,12 @@ import java.util.EnumSet; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java index de62fab2b8..3531b1dd05 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java @@ -12,13 +12,13 @@ import java.util.EnumSet; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.SequenceGenerators; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.SequenceGenerators; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java index 5da5c8cac6..67bb14bfd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java @@ -12,12 +12,12 @@ import java.util.EnumSet; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java index 68ec131fa9..a83b0fcb23 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java @@ -12,13 +12,13 @@ import java.util.EnumSet; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.TableGenerators; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.TableGenerators; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java index c58d780927..40abda9439 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.schemaupdate.index; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Index; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java index 80619d6bc8..2b4bae877a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java @@ -1,11 +1,11 @@ package org.hibernate.orm.test.schemaupdate.index; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java index 7f198ecd61..974bc301c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java index 5b5575dda3..41011db65c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java index c5c6b5c182..193c596678 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java index 68be07f7c3..fa6cbfb674 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java index c10b6bdd3a..b9861e01a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java @@ -10,12 +10,12 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java index 58e245fbf8..1e269e25e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java @@ -10,9 +10,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.EnumSet; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Type; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java index 54168556d1..ee5e57722e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java @@ -11,9 +11,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.EnumSet; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java index d260918090..6a0eccdda5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.schemavalidation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java index d677197ce7..7915ee9819 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.schemavalidation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java index d0c438c470..39720da0dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.schemavalidation.matchingtablenames; -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; import org.hibernate.tool.hbm2ddl.SchemaValidator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/secure/JaccIntegratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/secure/JaccIntegratorTest.java index 5274a0095f..84d93673e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/secure/JaccIntegratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/secure/JaccIntegratorTest.java @@ -13,12 +13,12 @@ import java.security.Policy; import java.security.ProtectionDomain; import java.security.Provider; import java.util.Collections; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.security.auth.Subject; -import javax.security.jacc.PolicyContext; -import javax.security.jacc.PolicyContextException; -import javax.security.jacc.PolicyContextHandler; +import jakarta.security.jacc.PolicyContext; +import jakarta.security.jacc.PolicyContextException; +import jakarta.security.jacc.PolicyContextHandler; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java index 84e7b2e4b0..1ae968870f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.serialization; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -255,4 +255,4 @@ public class EntityProxySerializationTest { } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java index a0fd3071ce..d49b3a7528 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Enumeration; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.HibernateException; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java index 97e36a6d3c..6d6219bfd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.session; -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; import org.hibernate.Session; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java index d4b44d5df7..61cecf71f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java @@ -25,8 +25,8 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope; import java.lang.reflect.Field; import java.util.Collection; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java old mode 100755 new mode 100644 index 1e9e81f4a1..c04efd48c9 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java @@ -14,15 +14,15 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.annotations.SortComparator; import org.hibernate.annotations.SortNatural; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java index 6724e35f27..171b030467 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java @@ -4,14 +4,14 @@ import java.util.Iterator; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.SortComparator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java index df3fe207a9..8401c8905c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java @@ -4,14 +4,14 @@ import java.util.Iterator; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.SortNatural; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java index 3e81cc5d14..594d69d01f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java @@ -3,13 +3,13 @@ package org.hibernate.orm.test.sorted.set; import java.util.Comparator; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.SortComparator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java index 2cb84bb00a..17b302e382 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java @@ -2,13 +2,13 @@ package org.hibernate.orm.test.sorted.set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.SortNatural; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java index 60eb95325f..b336d21b5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java @@ -193,7 +193,7 @@ public class SmokeTests { assertThat( assembler.getValueConverter(), instanceOf( OrdinalEnumValueConverter.class ) ); final NavigablePath expectedSelectedPath = new NavigablePath( - org.hibernate.orm.test.mapping.SmokeTests.SimpleEntity.class.getName(), + SimpleEntity.class.getName(), "e" ).append( "gender" ); assertThat( domainResult.getNavigablePath(), equalTo( expectedSelectedPath ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java index e0a325f6e5..36f4ed10f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.sql.autodiscovery; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java index e30bcd3e9c..b2f9585f1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.sql.autodiscovery; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java index 3dccc39062..33194c5889 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.sql.autodiscovery; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java index eac1f94494..04e682043f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java @@ -15,11 +15,11 @@ package org.hibernate.orm.test.sql.exec; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java index 17b1b34a60..30aba578ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java @@ -13,13 +13,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.util.collections.CollectionHelper; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java index f6fbb18252..2bd5c7c72d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.sql.exec.manytoone; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.stat.spi.StatisticsImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java index 178e12cd16..5d405a9545 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/OneToOneWithDerivedIdentityTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.sql.exec.onetoone; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java index 370f7514c3..8b77bbed75 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.sql.exec.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java index c95cb27558..a6ba0caead 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.sql.exec.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.validator.internal.util.Contracts; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java index 1463f0f7bb..d038ebaad2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.sql.exec.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java index ef79b85a9c..7b00d239b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.sql.exec.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java index dfab54e877..4d4d5664ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.sql.function; import java.sql.Timestamp; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; @@ -114,4 +114,4 @@ public class JpaFunctionTest extends BaseEntityManagerFunctionalTestCase { this.message = message; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java index b735a72a2e..b22c6d83af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java @@ -15,7 +15,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Hibernate; import org.hibernate.QueryException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java index 0dc4459b7c..ed91b056c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/graph/embeddable/internal/EmbeddableFetchImplTests.java @@ -1,12 +1,12 @@ package org.hibernate.orm.test.sql.results.graph.embeddable.internal; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java index 41cddff4f7..3285c3c340 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/H2ProcTesting.java @@ -6,15 +6,16 @@ */ package org.hibernate.orm.test.sql.storedproc; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.QueryHint; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.StoredProcedureParameter; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.StoredProcedureParameter; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java index e11cbee8c2..2009a3533e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/PostgresRefCursorSupportTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.sql.storedproc; import java.math.BigDecimal; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ParameterMode; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java index b793fe2cb5..5aefcdfa1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/storedproc/StoredProcedureResultSetMappingTest.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.sql.storedproc; import java.util.Date; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java index 51dd0f12c6..2ebc79fcb0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.sql.syncSpace; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java index da4825c38f..c58b8c66fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.stat.internal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.LockModeType; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; import org.hibernate.cfg.Environment; import org.hibernate.stat.QueryStatistics; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java index 7d8f400302..e0580d7ac6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java @@ -16,10 +16,10 @@ package org.hibernate.orm.test.stateless; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.StatelessSession; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java index 6941073051..23233884e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.stateless; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java index f7c19096cf..9d739d8a1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.stateless; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.StatelessSession; import org.hibernate.query.NativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java index e597801e25..f20d21d5ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.stateless; import java.util.Collections; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.StatelessSession; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java old mode 100755 new mode 100644 index 61eafafc43..c37ef61725 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.stateless; import java.util.Date; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java index 42fd2c39fd..a654052b8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Producer.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.stateless.fetching; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java index 1d66e577ad..4ca230ec58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Product.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.stateless.fetching; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Product { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java index 109a5fca9b..e8204325b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/Vendor.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.stateless.fetching; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java index 945d098ecf..13241dbf7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.tm; import java.util.Arrays; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; -import javax.transaction.Status; +import jakarta.transaction.Status; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java index 98b34410cd..6fb797fec9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.tm; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Transaction; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; import org.hibernate.HibernateException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java index c969150ad6..09886e8f69 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.tm; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.JDBCException; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java index 5dc2d35d0f..36cc00d593 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/TransactionTimeoutTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.tm; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Transaction; import org.hibernate.TransactionException; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java index ecace4fb93..9b78c89bc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.tool.schema; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java index 6140f63613..36f20c1d41 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java @@ -14,9 +14,9 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java index c7421a801d..44b4984644 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java @@ -12,10 +12,10 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java index f49b1fb1cc..f3451352d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.tool.schema; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java index a326d8b6c8..6ae9947ba4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.tool.schema; import java.util.Collections; import java.util.EnumSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java index dacec8827e..2bc7f4e843 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.type.contributor; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.boot.spi.MetadataBuilderContributor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java index f43a6b8763..eb7f0bbc5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.type.contributor; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.TypeDef; import org.hibernate.engine.spi.PersistenceContext; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java index 3c0e2e91ad..f88b934deb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/Issue.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.typedescriptor; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Strong Liu diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java index c10fe6fa80..67b00cee9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/VariousTypesEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.typedescriptor; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java old mode 100755 new mode 100644 index b28eb5ccea..c084d90437 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.unconstrained; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.cache.spi.CacheImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java index f711d640a6..b1f4ae41a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.unidir; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java index fa496e7de9..0d2dacbe07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.unidir; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java index 9c8c1d062f..a7c2db27c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.unidir; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "PARENT1") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java index c36adecc80..c7a53e0a5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.unidir; import java.io.Serializable; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java index 40d6dd9859..cbc78a250a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.unionsubclass; import java.sql.Connection; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java old mode 100755 new mode 100644 index 3bcafd4d3f..b7aadc1914 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.unionsubclass2; import java.math.BigDecimal; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java index 83c65de161..6eaa8cc222 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass3/UnionSubclassTest.java @@ -12,12 +12,12 @@ import org.junit.Test; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java index 48a90d8ccc..06c329282e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java @@ -10,7 +10,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.boot.Metadata; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java index 7ae5f390f0..cefa7708cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.version; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java index e8547cef89..10455f657b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.version; import java.time.LocalDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java index 49f9567dba..c68eceea5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.version; import java.time.OffsetDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/PersonThing.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/version/PersonThing.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Task.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Task.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/Thing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/Thing.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java old mode 100755 new mode 100644 index 5f50a14e5a..69c0fbc1fb --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.version; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java index 39aece3835..1ac75f4767 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.version; import java.time.ZonedDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java index 4e2eff6041..9023bc80db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/AbstractEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.version.mappedsuperclass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java index b8d7cc52d5..d2f8c9e418 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.version.mappedsuperclass; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java index b80f3a63fe..6f765186aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.version.sybase; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java index 2e199489ea..d853164d83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.version.sybase; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java index df7fa50e4f..2bd34d3ef2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java @@ -8,16 +8,16 @@ package org.hibernate.orm.test.where.annotations; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeSelectWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeSelectWhereTest.java index effdd9e140..ec9c04ec21 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeSelectWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeSelectWhereTest.java @@ -9,16 +9,16 @@ package org.hibernate.orm.test.where.annotations; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereDontUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereDontUseClassWhereTest.java index b411cf15f5..102d0fd1fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereDontUseClassWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereDontUseClassWhereTest.java @@ -10,15 +10,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java index 088846a096..98f4366450 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.where.annotations; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java index 870769c45a..caa21436f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerToManyWhereUseClassWhereTest.java @@ -10,15 +10,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java index 6ac3938fe3..3ce910038a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionBasicNonUniqueIdWhereTest.java @@ -10,13 +10,13 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java index 72b4a16562..aef27585dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyElementCollectionWithLazyManyToOneNonUniqueIdWhereTest.java @@ -10,18 +10,18 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java index a7b70f3cbf..f225b6dd2c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java @@ -12,13 +12,13 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Immutable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java index 9a1c534548..a6defea31e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java @@ -11,12 +11,12 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Immutable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereDontUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereDontUseClassWhereTest.java index b3bcf5eaa9..388159af8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereDontUseClassWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereDontUseClassWhereTest.java @@ -10,15 +10,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java index d79dc2a350..1870361839 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereTest.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.where.annotations; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java index 8e3fd34d2d..9497aa3f1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyToManyWhereUseClassWhereTest.java @@ -10,15 +10,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java index a842000703..157811f704 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.where.hbm; import java.util.HashSet; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.junit.After; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java index 8266a9aedf..4d8fd08364 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java @@ -9,13 +9,13 @@ package org.hibernate.query; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java index 430b978dcc..81cab954f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java @@ -8,8 +8,8 @@ package org.hibernate.query; import java.util.Arrays; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java index 66b27504df..b73d5ff1d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java @@ -1,7 +1,7 @@ package org.hibernate.query; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java index 43f85ba64b..7a8132d8cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java @@ -9,8 +9,8 @@ package org.hibernate.query; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java b/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java index d7514fc569..7eba5eec05 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.query; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/query/hhh12076/AnnotationMappingJoinClassTest.java b/hibernate-core/src/test/java/org/hibernate/query/hhh12076/AnnotationMappingJoinClassTest.java index 90d082d046..37fc4616a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/hhh12076/AnnotationMappingJoinClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/hhh12076/AnnotationMappingJoinClassTest.java @@ -13,24 +13,24 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/hibernate-core/src/test/java/org/hibernate/query/hhh13670/HHH13670Test.java b/hibernate-core/src/test/java/org/hibernate/query/hhh13670/HHH13670Test.java index 5fd03c80d5..b52a352b58 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/hhh13670/HHH13670Test.java +++ b/hibernate-core/src/test/java/org/hibernate/query/hhh13670/HHH13670Test.java @@ -11,17 +11,17 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Tuple; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Tuple; import java.util.List; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/query/hhh13712/HHH13712Test.java b/hibernate-core/src/test/java/org/hibernate/query/hhh13712/HHH13712Test.java index 0591966ea0..5c7fa250e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/hhh13712/HHH13712Test.java +++ b/hibernate-core/src/test/java/org/hibernate/query/hhh13712/HHH13712Test.java @@ -11,17 +11,17 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Tuple; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Tuple; import java.util.List; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/query/hhh14112/HHH14112Test.java b/hibernate-core/src/test/java/org/hibernate/query/hhh14112/HHH14112Test.java index 0f9e690530..1c60ddae5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/hhh14112/HHH14112Test.java +++ b/hibernate-core/src/test/java/org/hibernate/query/hhh14112/HHH14112Test.java @@ -1,11 +1,11 @@ package org.hibernate.query.hhh14112; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.Where; @@ -31,7 +31,7 @@ public class HHH14112Test extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] { HHH14112Test.Super.class, HHH14112Test.SubObject.class }; + return new Class[] { Super.class, SubObject.class }; } @Entity(name = "Super") diff --git a/hibernate-core/src/test/java/org/hibernate/query/hhh14116/HHH14116Test.java b/hibernate-core/src/test/java/org/hibernate/query/hhh14116/HHH14116Test.java index cfc6ea2602..75192b7290 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/hhh14116/HHH14116Test.java +++ b/hibernate-core/src/test/java/org/hibernate/query/hhh14116/HHH14116Test.java @@ -1,16 +1,16 @@ package org.hibernate.query.hhh14116; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -27,7 +27,7 @@ public class HHH14116Test extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] { HHH14116Test.User.class, HHH14116Test.Group.class }; + return new Class[] { User.class, Group.class }; } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/query/hhh14154/HHH14154Test.java b/hibernate-core/src/test/java/org/hibernate/query/hhh14154/HHH14154Test.java index 2d06f8e21e..cb258bf54e 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/hhh14154/HHH14154Test.java +++ b/hibernate-core/src/test/java/org/hibernate/query/hhh14154/HHH14154Test.java @@ -1,12 +1,12 @@ package org.hibernate.query.hhh14154; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.dialect.H2Dialect; @@ -27,7 +27,7 @@ public class HHH14154Test extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] { HHH14154Test.Foo.class }; + return new Class[] { Foo.class }; } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/query/hhh14156/HHH14156Test.java b/hibernate-core/src/test/java/org/hibernate/query/hhh14156/HHH14156Test.java index bb943030b2..29022b36c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/hhh14156/HHH14156Test.java +++ b/hibernate-core/src/test/java/org/hibernate/query/hhh14156/HHH14156Test.java @@ -2,10 +2,10 @@ package org.hibernate.query.hhh14156; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.SQLServerDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java index 7ce26fd0dd..329e380af9 100644 --- a/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java @@ -8,11 +8,11 @@ package org.hibernate.stat.internal; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/A320.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/A320.java index b6ba00fb60..7cfea994ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/A320.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/A320.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.test.annotations; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/A320b.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/A320b.java index 105b339f37..617e277be7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/A320b.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/A320b.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.test.annotations; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java index f9dd17525c..698184dfb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.test.annotations; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Boat.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Boat.java index 475a1293a1..f087c1bece 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Boat.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Boat.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.test.annotations; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Country.java index ee103ed45d..d4c3e195f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Country.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.test.annotations; import java.io.Serializable; -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 Country implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Customer.java index 73894f91f4..fd0c7b7d72 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Customer.java @@ -10,14 +10,14 @@ package org.hibernate.test.annotations; import java.io.Serializable; import java.util.Collection; import java.util.SortedSet; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.SortComparator; @@ -70,7 +70,7 @@ public class Customer implements Serializable { this.tickets = tickets; } - @OneToMany(targetEntity = org.hibernate.test.annotations.Discount.class, + @OneToMany(targetEntity = Discount.class, cascade = CascadeType.ALL, mappedBy = "owner") @Cascade({ALL}) public Collection getDiscountTickets() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Discount.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Discount.java index ca9fa9d14f..5954dde9aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Discount.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Discount.java @@ -8,14 +8,14 @@ //$Id$ package org.hibernate.test.annotations; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Ferry.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Ferry.java index f9898f4d33..3ed36dda4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Ferry.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Ferry.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.test.annotations; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/FlyingObject.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/FlyingObject.java index 5a7e600672..a03ff78968 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/FlyingObject.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/FlyingObject.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.test.annotations; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java index 8e9ea01199..6833a0afb5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.test.annotations; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Passport.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Passport.java index 66a32b7deb..10ada7701a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Passport.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Passport.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.test.annotations; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * International passport diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Plane.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Plane.java index e2f4c54a3e..08e22339b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Plane.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Plane.java @@ -7,18 +7,18 @@ //$Id$ package org.hibernate.test.annotations; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; /** * Plane class diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Port.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Port.java index a4efc37890..3e1bfd2b81 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Port.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Port.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.test.annotations; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * Used to test that annotated classes can have one-to-many diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Thing.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Thing.java index 2830fc704e..1618807dad 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Thing.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Thing.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.test.annotations; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Ticket.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Ticket.java index ddec9eea95..1e3e734efb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Ticket.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/Ticket.java @@ -8,10 +8,10 @@ //$Id$ package org.hibernate.test.annotations; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Flight ticket diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java index 689514697b..5325e4ecd6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java @@ -7,15 +7,15 @@ package org.hibernate.test.annotations.dataTypes; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Steve Ebersole @@ -27,7 +27,7 @@ public class SomeEntity { @Id @Temporal(TemporalType.DATE) @Column(name = "ID") - private java.util.Date id; + private Date id; @Column(name = "TIMEDATA") private java.sql.Time timeData; @Column(name = "TSDATA") @@ -43,11 +43,11 @@ public class SomeEntity { this.id = id; } - public java.util.Date getId() { + public Date getId() { return id; } - public void setId(java.util.Date id) { + public void setId(Date id) { this.id = id; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java index a635395db7..582d5dfc41 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.annotations.dataTypes; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java index db962a7898..58c568974d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Dependent.java @@ -8,10 +8,10 @@ // $Id:$ package org.hibernate.test.annotations.derivedidentities; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java index 702dc3c96e..f468f66fa6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/DependentId.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java index 9d70763344..a9f669e708 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employee.java @@ -7,9 +7,9 @@ // $Id:$ package org.hibernate.test.annotations.derivedidentities; -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 Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java index 4e51f75630..d6da9a55cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Employer.java @@ -8,10 +8,10 @@ // $Id:$ package org.hibernate.test.annotations.derivedidentities; -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; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java index 88fe0a4c88..c10652504f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/MedicalHistory.java @@ -8,12 +8,12 @@ // $Id:$ package org.hibernate.test.annotations.derivedidentities; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToOne; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java index c0e146526b..8e346a918e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/Person.java @@ -8,8 +8,8 @@ // $Id:$ package org.hibernate.test.annotations.derivedidentities; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Bar.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Bar.java index 9252811096..0ffb9966c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Bar.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Bar.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class Bar implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java index 72d9579927..0a578ca99d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java @@ -10,14 +10,14 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.junit.After; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Dependent.java index 939dddcd44..5b10217a97 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Dependent.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Employee.java index d4ba4f2e75..25c6bdfd3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Employee.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Foo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Foo.java index 6e45db8cc4..2504d71c5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Foo.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Foo.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; -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; @Entity public class Foo implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java index a8e1b55376..60d6d6ddbe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java @@ -10,13 +10,13 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java index 334bc867b6..d604881b35 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java @@ -8,13 +8,13 @@ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java index 3c78716fd8..7812b3b523 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java @@ -7,13 +7,13 @@ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Order.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Order.java index 5f43ef0a76..b8a4c726c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Order.java @@ -8,13 +8,13 @@ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @SuppressWarnings("serial") @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OrderLine.java index eb24264281..25c57e4fec 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OrderLine.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/OrderLine.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @SuppressWarnings("serial") @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Person.java index 749c4717e5..f06cff3a79 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Person.java @@ -1,83 +1,83 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.derivedidentities.bidirectional; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; - -@Entity -@NamedQuery(name="PersonQuery", query="SELECT p FROM Person p") -public class Person - implements Serializable -{ - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private Integer id; - - @Basic - private String name; - - @OneToOne(mappedBy="id") - private PersonInfo personInfo; - - public Integer getId() - { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public int hashCode() - { - int hash = 0; - hash += (this.id != null ? this.id.hashCode() : 0); - return hash; - } - - public boolean equals(Object object) - { - if (!(object instanceof Person)) { - return false; - } - Person other = (Person)object; - - return ((this.id != null) || (other.id == null)) && ((this.id == null) || (this.id.equals(other.id))); - } - - public String toString() - { - return "nogroup.hibertest.Person[ id=" + this.id + " ]"; - } - - public PersonInfo getPersonInfo() - { - return this.personInfo; - } - - public void setPersonInfo(PersonInfo personInfo) - { - this.personInfo = personInfo; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.annotations.derivedidentities.bidirectional; + +import java.io.Serializable; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; + +@Entity +@NamedQuery(name="PersonQuery", query="SELECT p FROM Person p") +public class Person + implements Serializable +{ + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy=GenerationType.AUTO) + private Integer id; + + @Basic + private String name; + + @OneToOne(mappedBy="id") + private PersonInfo personInfo; + + public Integer getId() + { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public int hashCode() + { + int hash = 0; + hash += (this.id != null ? this.id.hashCode() : 0); + return hash; + } + + public boolean equals(Object object) + { + if (!(object instanceof Person)) { + return false; + } + Person other = (Person)object; + + return ((this.id != null) || (other.id == null)) && ((this.id == null) || (this.id.equals(other.id))); + } + + public String toString() + { + return "nogroup.hibertest.Person[ id=" + this.id + " ]"; + } + + public PersonInfo getPersonInfo() + { + return this.personInfo; + } + + public void setPersonInfo(PersonInfo personInfo) + { + this.personInfo = personInfo; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/PersonInfo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/PersonInfo.java index af2405cb7a..ff87b96f8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/PersonInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/PersonInfo.java @@ -1,66 +1,66 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.derivedidentities.bidirectional; - -import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; - -@Entity -public class PersonInfo - implements Serializable -{ - private static final long serialVersionUID = 1L; - - @Id - @OneToOne - private Person id; - - @Basic - private String info; - - public Person getId() - { - return this.id; - } - - public void setId(Person id) { - this.id = id; - } - - public String getInfo() { - return this.info; - } - - public void setInfo(String info) { - this.info = info; - } - - public int hashCode() - { - int hash = 0; - hash += (this.id != null ? this.id.hashCode() : 0); - return hash; - } - - public boolean equals(Object object) - { - if (!(object instanceof PersonInfo)) { - return false; - } - PersonInfo other = (PersonInfo)object; - - return ((this.id != null) || (other.id == null)) && ((this.id == null) || (this.id.equals(other.id))); - } - - public String toString() - { - return "nogroup.hibertest.PersonInfo[ id=" + this.id + " ]"; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.annotations.derivedidentities.bidirectional; + +import java.io.Serializable; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; + +@Entity +public class PersonInfo + implements Serializable +{ + private static final long serialVersionUID = 1L; + + @Id + @OneToOne + private Person id; + + @Basic + private String info; + + public Person getId() + { + return this.id; + } + + public void setId(Person id) { + this.id = id; + } + + public String getInfo() { + return this.info; + } + + public void setInfo(String info) { + this.info = info; + } + + public int hashCode() + { + int hash = 0; + hash += (this.id != null ? this.id.hashCode() : 0); + return hash; + } + + public boolean equals(Object object) + { + if (!(object instanceof PersonInfo)) { + return false; + } + PersonInfo other = (PersonInfo)object; + + return ((this.id != null) || (other.id == null)) && ((this.id == null) || (this.id.equals(other.id))); + } + + public String toString() + { + return "nogroup.hibertest.PersonInfo[ id=" + this.id + " ]"; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Product.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Product.java index 2d83e45336..482518f716 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/Product.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.annotations.derivedidentities.bidirectional; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @SuppressWarnings("serial") @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java index 965a97fd11..cb63d8c654 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Dependent.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e1.a; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java index 27bf05fc13..593336cde2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/Employee.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e1.a; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java old mode 100755 new mode 100644 index fd7f587180..0860b4c817 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java @@ -10,18 +10,18 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; @SuppressWarnings("serial") @NamedQueries({ diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java old mode 100755 new mode 100644 index 6bf7aef509..af2776e12d --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java @@ -8,20 +8,20 @@ package org.hibernate.test.annotations.derivedidentities.e1.b2; import java.io.Serializable; import java.math.BigDecimal; import java.util.Comparator; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.Version; @NamedQueries({ @NamedQuery(name = "CustomerInventory.selectAll", diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java old mode 100755 new mode 100644 index 955bf02ead..4d607c162f --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java @@ -7,13 +7,13 @@ package org.hibernate.test.annotations.derivedidentities.e1.b2; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Version; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java index 8d84e071b9..1b93889ec6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Dependent.java @@ -5,13 +5,13 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e2.a; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java index cb05b02e08..a2a43208d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DependentId.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.annotations.derivedidentities.e2.a; import java.io.Serializable; -import javax.persistence.Embedded; +import jakarta.persistence.Embedded; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java index 3a3a71bc61..00787dd5a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/Employee.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e2.a; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java index 91609a4bfe..fd5b30d865 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e2.b; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java index a5c499e1ba..ada19fb569 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.annotations.derivedidentities.e2.b; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java index c651f79d1e..2bb032d18a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e2.b; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java index fae2ecdd79..0556adb435 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Dependent.java @@ -5,14 +5,14 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e3.a; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -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.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java index d0994862b6..6841736505 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/Employee.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e3.a; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java index 2c3f435269..a617c9e1a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Dependent.java @@ -5,15 +5,15 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e3.b; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java index a7b6781992..b64e80101b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DependentId.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.annotations.derivedidentities.e3.b; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java index 13d9649b33..c687946a9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/Employee.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e3.b; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java index 3e72e46a7f..33c856d4f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/EmployeeId.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.annotations.derivedidentities.e3.b; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Dependent.java index dcdc999fc1..15cd0bbf12 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Dependent.java @@ -1,10 +1,10 @@ package org.hibernate.test.annotations.derivedidentities.e3.b2; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; @Entity @Table(name="`Dependent`") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DependentId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DependentId.java index aa15aeaa23..04ddbe56e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DependentId.java @@ -1,6 +1,6 @@ package org.hibernate.test.annotations.derivedidentities.e3.b2; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Employee.java index 381114776f..ba8305f226 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Employee.java @@ -1,7 +1,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b2; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/EmployeeId.java index a6a9d92a2e..61e427b486 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/EmployeeId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/EmployeeId.java @@ -1,7 +1,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b2; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Policy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Policy.java index 4fdd5fde51..85598cb71e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Policy.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Policy.java @@ -1,10 +1,10 @@ package org.hibernate.test.annotations.derivedidentities.e3.b2; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; @Entity @Table(name="`Policy`") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/PolicyId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/PolicyId.java index 6eb2cfc1a2..5a0a998b69 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/PolicyId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/PolicyId.java @@ -1,7 +1,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b2; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Dependent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Dependent.java index 5a21f18cc5..313f5cbabf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Dependent.java @@ -1,6 +1,6 @@ package org.hibernate.test.annotations.derivedidentities.e3.b3; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name="`Dependent`") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DependentId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DependentId.java index 6e8de003c7..7e935f91ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DependentId.java @@ -1,7 +1,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b3; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Employee.java index 00492d1172..e954d5c652 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Employee.java @@ -1,7 +1,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b3; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/EmployeeId.java index da7c33ff66..cd3e3be879 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/EmployeeId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/EmployeeId.java @@ -1,7 +1,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b3; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Policy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Policy.java index 7eda4869cb..8e7fb9941a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Policy.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Policy.java @@ -1,6 +1,6 @@ package org.hibernate.test.annotations.derivedidentities.e3.b3; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name="`Policy`") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/PolicyId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/PolicyId.java index 0e58806306..892b1cd77c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/PolicyId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/PolicyId.java @@ -1,7 +1,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b3; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java index 5eb97eff58..da5a3f359e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/FinancialHistory.java @@ -7,11 +7,11 @@ package org.hibernate.test.annotations.derivedidentities.e4.a; import java.io.Serializable; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java index 1a0393dcd8..c55a2884d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/MedicalHistory.java @@ -7,12 +7,12 @@ package org.hibernate.test.annotations.derivedidentities.e4.a; import java.io.Serializable; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java index 830ea39d59..f549b471c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Person.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e4.a; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java index 1fe3dc554d..f3314b33c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/Simple.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.annotations.derivedidentities.e4.a; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java index 7ee35e5f58..c3ce04c2ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java @@ -7,10 +7,10 @@ package org.hibernate.test.annotations.derivedidentities.e4.c; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java index c433611f6e..334fb39624 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/MedicalHistory.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.annotations.derivedidentities.e5.a; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java index 1e9d86bb6d..dc3c0e94ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/Person.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e5.a; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java index 68ef14765d..e9baf9597e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/MedicalHistory.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e5.b; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java index de62c64ca7..5fd7574eac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/Person.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e5.b; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java index 2de7364ca1..d59514559e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/MedicalHistory.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.annotations.derivedidentities.e6.a; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java index 4dd1a6b24b..4777453894 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/Person.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e6.a; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java index 9efae34a44..f23792428e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/PersonId.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.annotations.derivedidentities.e6.a; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java index c35f75e4a2..dea2aa7f3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/MedicalHistory.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e6.b; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java index a8ebe367e1..c0d6405fc0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/Person.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.derivedidentities.e6.b; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java index ec4cf8610c..c6f942e8ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/PersonId.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.annotations.derivedidentities.e6.b; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java index 8a7872defd..ac750a3973 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java @@ -7,12 +7,12 @@ package org.hibernate.test.annotations.derivedidentities.unidirectional; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java index 34708dbf70..df5c69a930 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java @@ -7,12 +7,12 @@ package org.hibernate.test.annotations.derivedidentities.unidirectional; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java index 50a41f1ae0..9325f1e628 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.annotations.embeddables; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investment.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investment.java index be7937817d..8538371b66 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investment.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investment.java @@ -1,47 +1,47 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.embeddables; - -import javax.persistence.Column; -import javax.persistence.Embeddable; - -/** - * @author Chris Pheby - */ -@Embeddable -public class Investment { - - private DollarValue amount; - private String description; - @Column(name = "`date`") - private MyDate date; - - public DollarValue getAmount() { - return amount; - } - - public void setAmount(DollarValue amount) { - this.amount = amount; - } - - @Column(length = 500) - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public MyDate getDate() { - return date; - } - - public void setDate(MyDate date) { - this.date = date; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.annotations.embeddables; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +/** + * @author Chris Pheby + */ +@Embeddable +public class Investment { + + private DollarValue amount; + private String description; + @Column(name = "`date`") + private MyDate date; + + public DollarValue getAmount() { + return amount; + } + + public void setAmount(DollarValue amount) { + this.amount = amount; + } + + @Column(length = 500) + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public MyDate getDate() { + return date; + } + + public void setDate(MyDate date) { + this.date = date; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investor.java index 3e270c5411..c90f936dae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investor.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/Investor.java @@ -9,10 +9,10 @@ package org.hibernate.test.annotations.embeddables; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; /** * @author Chris Pheby diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java index 6f544f5560..f630dc5f8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java @@ -5,14 +5,14 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.time.YearMonth; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.HibernateException; import org.hibernate.NotYetImplementedFor6Exception; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java index 6a9f3ce589..a961ae19fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java @@ -8,11 +8,11 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java index d03a091a44..f07d118039 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java @@ -7,12 +7,12 @@ package org.hibernate.test.annotations.manytoonewithformula; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java index 469c4f7b07..558b0e6f27 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java @@ -7,8 +7,8 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class ContractId implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java index ca13c1e8f3..ed53155999 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java @@ -7,11 +7,11 @@ package org.hibernate.test.annotations.manytoonewithformula; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java index 6425780f1c..fea706f1c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java @@ -7,10 +7,10 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java index 8ffe2c6a23..b7dd180f06 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.annotations.manytoonewithformula; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MANUFACTURER") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java index a2b63847ca..785e180e2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java @@ -7,8 +7,8 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class ManufacturerId implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java index b2161353f7..b778ef1720 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java @@ -200,8 +200,8 @@ public class ManyToOneWithFormulaTest extends BaseCoreFunctionalTestCase { } @Override - protected java.lang.Class[] getAnnotatedClasses() { - return new java.lang.Class[] { + protected Class[] getAnnotatedClasses() { + return new Class[] { Menu.class, FoodItem.class, Company.class, diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java index 9c0c3b4a09..2b827ad5fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java @@ -7,10 +7,10 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java index e7631a385f..f1715e7dde 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java @@ -9,11 +9,11 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java index f1f8ba3742..e7a295e697 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.annotations.manytoonewithformula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="MODEL") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java index e557336cbf..cce9a1586e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java @@ -7,8 +7,8 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class ModelId implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java index 835272aba8..4ca3a728fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java @@ -7,10 +7,10 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java index 6c6c9bc0bb..b1ec05b0d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java @@ -7,11 +7,11 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java index 844b8dec12..bc8038c447 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java @@ -7,11 +7,11 @@ package org.hibernate.test.annotations.manytoonewithformula; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundLogicalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundLogicalOneToOneTest.java index c940b3faec..02ddc95306 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundLogicalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundLogicalOneToOneTest.java @@ -7,14 +7,14 @@ package org.hibernate.test.annotations.notfound; import java.io.Serializable; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java index df457847ce..e769544595 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.annotations.notfound; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java index 8142eb9644..90f0a3f474 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java @@ -7,11 +7,11 @@ package org.hibernate.test.annotations.notfound; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/OneToOneNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/OneToOneNotFoundTest.java index c7362215d3..948c578efc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/OneToOneNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/OneToOneNotFoundTest.java @@ -6,15 +6,15 @@ */ package org.hibernate.test.annotations.notfound; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java index 6bc772fb0f..59a9646366 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java @@ -7,13 +7,13 @@ //$Id$ package org.hibernate.test.annotations.polymorphism; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Polymorphism; import org.hibernate.annotations.PolymorphismType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/MarketRegion.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/MarketRegion.java index 21d35c7063..666c15ddb4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/MarketRegion.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/MarketRegion.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.annotations.polymorphism; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java index a0c8deb716..e72055471a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.test.annotations.polymorphism; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Polymorphism; import org.hibernate.annotations.PolymorphismType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/AllTables.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/AllTables.java index 148d26d89a..b882b9de08 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/AllTables.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/AllTables.java @@ -5,13 +5,13 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.annotations.query; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Table; import org.hibernate.annotations.Formula; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Area.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Area.java index b6b91dc889..9358e9a5bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Area.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Area.java @@ -7,17 +7,17 @@ //$Id$ package org.hibernate.test.annotations.query; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; /** * Example of a entity load incl a join fetching of an associated *ToOne entity @@ -40,13 +40,13 @@ import javax.persistence.Table; }) @SqlResultSetMappings( @SqlResultSetMapping(name = "joinMapping", entities = { - @EntityResult(entityClass = org.hibernate.test.annotations.query.Night.class, fields = { + @EntityResult(entityClass = Night.class, fields = { @FieldResult(name = "id", column = "nid"), @FieldResult(name = "duration", column = "night_duration"), @FieldResult(name = "date", column = "night_date"), @FieldResult(name = "area", column = "area_id") }), - @EntityResult(entityClass = org.hibernate.test.annotations.query.Area.class, fields = { + @EntityResult(entityClass = Area.class, fields = { @FieldResult(name = "id", column = "aid"), @FieldResult(name = "name", column = "name") }) diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrset.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrset.java index c07679fc69..9d716c91c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrset.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrset.java @@ -1,43 +1,43 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.query; - -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; - -@Entity -public class Attrset { - @Id - @GeneratedValue - private Long id; - - @OneToMany - @JoinTable(name = "ATTRSET_X_ATTRVALUE") - private Set attrvalues = new HashSet(); - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Set getAttrvalues() { - return attrvalues; - } - - public void setAttrvalues(Set attrvalues) { - this.attrvalues = attrvalues; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.annotations.query; + +import java.util.HashSet; +import java.util.Set; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; + +@Entity +public class Attrset { + @Id + @GeneratedValue + private Long id; + + @OneToMany + @JoinTable(name = "ATTRSET_X_ATTRVALUE") + private Set attrvalues = new HashSet(); + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Set getAttrvalues() { + return attrvalues; + } + + public void setAttrvalues(Set attrvalues) { + this.attrvalues = attrvalues; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrvalue.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrvalue.java index 5bf4e1ee83..2f4949a311 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrvalue.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Attrvalue.java @@ -1,36 +1,36 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.query; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -public class Attrvalue { - @Id - @GeneratedValue - private Long id; - - private String value; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.annotations.query; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; + +@Entity +public class Attrvalue { + @Id + @GeneratedValue + private Long id; + + private String value; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Captain.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Captain.java index fc4319a438..d1113517bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Captain.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Captain.java @@ -8,13 +8,13 @@ //$Id$ package org.hibernate.test.annotations.query; import java.io.Serializable; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.SqlResultSetMapping; /** * @author Emmanuel Bernard @@ -22,7 +22,7 @@ import javax.persistence.SqlResultSetMapping; @Entity @IdClass(Identity.class) @SqlResultSetMapping(name = "compositekey", - entities = @EntityResult(entityClass = org.hibernate.test.annotations.query.SpaceShip.class, + entities = @EntityResult(entityClass = SpaceShip.class, fields = { @FieldResult(name = "name", column = "name"), @FieldResult(name = "model", column = "model"), diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java index 1b9a8ee0d5..bdfd1c303c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.test.annotations.query; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Chaos.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Chaos.java index d071e7ce58..08a973859c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Chaos.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Chaos.java @@ -9,13 +9,13 @@ package org.hibernate.test.annotations.query; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.NamedNativeQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Loader; import org.hibernate.annotations.SQLDelete; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Darkness.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Darkness.java index abf72af0a8..03f205b595 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Darkness.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Darkness.java @@ -8,7 +8,7 @@ //$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $ package org.hibernate.test.annotations.query; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @org.hibernate.annotations.NamedQuery( name = "night.olderThan", diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dictionary.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dictionary.java index 8b6fbf8657..78181915f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dictionary.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dictionary.java @@ -7,15 +7,15 @@ //$Id$ package org.hibernate.test.annotations.query; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; /** * @author Emmanuel Bernard @@ -26,7 +26,7 @@ import javax.persistence.SqlResultSetMapping; @SqlResultSetMapping( name = "dictionary", entities = { @EntityResult( - entityClass = org.hibernate.test.annotations.query.Dictionary.class, + entityClass = Dictionary.class, fields = { @FieldResult(name = "id", column = "id"), @FieldResult(name = "name", column = "name"), diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dimensions.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dimensions.java index 59859bf6e2..f54ebef18c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dimensions.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dimensions.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.test.annotations.query; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employee.java index ad2eb045b0..525c449967 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employee.java @@ -1,50 +1,50 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.query; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -@Entity -public class Employee { - @Id - @GeneratedValue - private Long id; - - @ManyToOne - private Employeegroup employeegroup; - - @ManyToOne - private Attrset attrset; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Employeegroup getEmployeegroup() { - return employeegroup; - } - - public void setEmployeegroup(Employeegroup employeegroup) { - this.employeegroup = employeegroup; - } - - public Attrset getAttrset() { - return attrset; - } - - public void setAttrset(Attrset attrset) { - this.attrset = attrset; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.annotations.query; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; + +@Entity +public class Employee { + @Id + @GeneratedValue + private Long id; + + @ManyToOne + private Employeegroup employeegroup; + + @ManyToOne + private Attrset attrset; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Employeegroup getEmployeegroup() { + return employeegroup; + } + + public void setEmployeegroup(Employeegroup employeegroup) { + this.employeegroup = employeegroup; + } + + public Attrset getAttrset() { + return attrset; + } + + public void setAttrset(Attrset attrset) { + this.attrset = attrset; + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employeegroup.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employeegroup.java index cbf40f2da5..5949fa6356 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employeegroup.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Employeegroup.java @@ -1,55 +1,55 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.query; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; - -@Entity -public class Employeegroup { - @Id - @GeneratedValue - private Long id; - - @OneToMany(cascade = CascadeType.ALL, mappedBy = "employeegroup") - private List employees = new ArrayList(); - - @ManyToOne - private Attrset attrset; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public List getEmployees() { - return employees; - } - - public void setEmployees(List employees) { - this.employees = employees; - } - - public Attrset getAttrset() { - return attrset; - } - - public void setAttrset(Attrset attrset) { - this.attrset = attrset; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.annotations.query; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; + +@Entity +public class Employeegroup { + @Id + @GeneratedValue + private Long id; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "employeegroup") + private List employees = new ArrayList(); + + @ManyToOne + private Attrset attrset; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public List getEmployees() { + return employees; + } + + public void setEmployees(List employees) { + this.employees = employees; + } + + public Attrset getAttrset() { + return attrset; + } + + public void setAttrset(Attrset attrset) { + this.attrset = attrset; + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Mark.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Mark.java index b6fa74e7ed..2a9d61d72c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Mark.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Mark.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.test.annotations.query; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; /** * Example of scalar result (not working right now) diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java index 2c3337a799..0384924004 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java @@ -7,14 +7,14 @@ package org.hibernate.test.annotations.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Query; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Query; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.After; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Night.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Night.java index 060651b9bf..e5b4f7a47c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Night.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Night.java @@ -8,12 +8,12 @@ //$Id$ package org.hibernate.test.annotations.query; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; /** * Entity declaring a named query diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java index fe6402ba94..f2475c659f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java @@ -9,12 +9,12 @@ package org.hibernate.test.annotations.query; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.TypedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TypedQuery; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java index 083448daef..d0dbaa54b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java @@ -7,23 +7,23 @@ //$Id$ package org.hibernate.test.annotations.query; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; /** * @author Emmanuel Bernard */ @Entity @SqlResultSetMapping(name = "implicit", - entities = @EntityResult(entityClass = org.hibernate.test.annotations.query.SpaceShip.class)) + entities = @EntityResult(entityClass = SpaceShip.class)) @NamedNativeQueries({ @NamedNativeQuery(name = "implicitSample", query = "select * from SpaceShip", resultSetMapping = "implicit"), @NamedNativeQuery(name = "compositekey", diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java index d15b7bdd99..9e37f96bda 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.test.annotations.query; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Twilight.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Twilight.java index 1f148aa4f2..445b182cca 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Twilight.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Twilight.java @@ -8,9 +8,9 @@ //$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $ package org.hibernate.test.annotations.query; -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 Sharath Reddy diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java index f568835fff..085143bb88 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java @@ -7,12 +7,12 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java index 635267186a..38612060c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; -import javax.persistence.Entity; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java index 0a1a2d62b1..d334324491 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java @@ -10,14 +10,14 @@ package org.hibernate.test.annotations.referencedcolumnname; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/HousePlaces.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/HousePlaces.java index e233fc9341..c0671bbd6a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/HousePlaces.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/HousePlaces.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.annotations.referencedcolumnname; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; /** * @author Janario Oliveira diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java index e9f074af1b..a61d3fab34 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java @@ -10,10 +10,10 @@ package org.hibernate.test.annotations.referencedcolumnname; import java.io.Serializable; 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; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java index 10d0c41696..4484bf85d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java index eebf5c03e3..c50f6bd386 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java @@ -9,9 +9,9 @@ package org.hibernate.test.annotations.referencedcolumnname; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java index cc202e86e5..06e388c330 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java @@ -10,14 +10,14 @@ package org.hibernate.test.annotations.referencedcolumnname; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Place.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Place.java index 7b9f0f0224..03bb2d97d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Place.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Place.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.annotations.referencedcolumnname; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Janario Oliveira diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Places.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Places.java index fdb9d06e74..a22b4feb8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Places.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Places.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.annotations.referencedcolumnname; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * @author Janario Oliveira diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java index b43fae6a99..0c795a6ba2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java @@ -8,8 +8,8 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java index b3f2f3271e..165e0b3185 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java @@ -10,12 +10,12 @@ package org.hibernate.test.annotations.referencedcolumnname; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java index da58491ccb..25b382f396 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java @@ -16,10 +16,10 @@ import org.junit.Test; import java.math.BigDecimal; import java.util.Iterator; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java index 7618934906..492cff41cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java index b76a0f8e7c..ad2282ab25 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java @@ -8,11 +8,11 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/Dvd.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/Dvd.java index 925a0d64d6..bd25193590 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/Dvd.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/Dvd.java @@ -7,10 +7,10 @@ //$Id$ package org.hibernate.test.annotations.type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Columns; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/AbstractEntity.java index 850fc7a4a2..786d8631e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/AbstractEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/AbstractEntity.java @@ -25,11 +25,11 @@ package org.hibernate.test.annotations.type.dynamicparameterized; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity1.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity1.java index c14f4c1db8..08cc390b08 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity1.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity1.java @@ -23,11 +23,11 @@ */ package org.hibernate.test.annotations.type.dynamicparameterized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity2.java index 2fd4b2ecc9..5bb658c6db 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity2.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/Entity2.java @@ -23,11 +23,11 @@ */ package org.hibernate.test.annotations.type.dynamicparameterized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Building.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Building.java index 8194047463..4070af158a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Building.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Building.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.annotations.uniqueconstraint; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; /** * @author Manuel Bernhardt diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java index 651d4533b1..aeaaff4450 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.annotations.uniqueconstraint; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; /** * @author Manuel Bernhardt diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java index bc91c3fec3..e8b6d2ff87 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java @@ -8,13 +8,13 @@ package org.hibernate.test.annotations.uniqueconstraint; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Room.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Room.java index 956faf3b7e..11a6989df7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Room.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Room.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.annotations.uniqueconstraint; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Manuel Bernhardt diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java index f5ba7f2b53..9e2522898c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java @@ -7,7 +7,7 @@ package org.hibernate.test.annotations.uniqueconstraint; import java.util.Map; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Antenna.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Antenna.java index 138fd2fd6d..2622e782db 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Antenna.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Antenna.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.test.annotations.various; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Conductor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Conductor.java index c4a85bbc87..6edf56b0ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Conductor.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Conductor.java @@ -7,11 +7,11 @@ //$Id$ package org.hibernate.test.annotations.various; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.Index; import org.hibernate.annotations.OptimisticLock; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java index 55faa25cc8..7d6e6fccf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java @@ -8,10 +8,10 @@ // $Id$ package org.hibernate.test.annotations.various; import java.util.Date; -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; import org.hibernate.annotations.Source; import org.hibernate.annotations.SourceType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java index b1be822046..675c0a0e5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java @@ -8,9 +8,9 @@ //$Id$ package org.hibernate.test.annotations.various; import java.util.Date; -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 Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Truck.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Truck.java index f6ca00136b..e4abd89f0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Truck.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Truck.java @@ -7,9 +7,9 @@ //$Id$ package org.hibernate.test.annotations.various; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Index; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java index 97f877d2c8..d48545547e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java @@ -8,10 +8,10 @@ // $Id$ package org.hibernate.test.annotations.various; import java.util.Date; -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; import org.hibernate.annotations.Source; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Vehicule.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Vehicule.java index e55c736024..e6be1d3339 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Vehicule.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Vehicule.java @@ -7,14 +7,14 @@ //$Id$ package org.hibernate.test.annotations.various; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Index; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java index 3b13900d80..f0863088dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java @@ -7,13 +7,13 @@ //$Id$ package org.hibernate.test.annotations.xml.hbm; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Inheritance( strategy = InheritanceType.JOINED ) diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java index 802b53a4f7..68a91f17a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.test.annotations.xml.hbm; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @org.hibernate.annotations.Proxy( proxyClass = B.class ) diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java index 63b8a89ea2..63ae0d27ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java @@ -8,11 +8,11 @@ //$Id:PrimeMinister.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $ package org.hibernate.test.annotations.xml.hbm; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java index 20158aafbd..bd6534ea04 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java @@ -9,11 +9,11 @@ package org.hibernate.test.annotations.xml.hbm; 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 javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java index f341c8d0c1..724f9dcb3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java @@ -7,16 +7,16 @@ //$Id$ package org.hibernate.test.annotations.xml.hbm; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Inheritance( strategy = InheritanceType.JOINED ) diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/A.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/A.java index 165264cf58..5e36727fc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/A.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/A.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.batchfetch; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class A { diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/B.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/B.java index e8ffa48c28..0b9dff4aed 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/B.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/B.java @@ -8,9 +8,9 @@ package org.hibernate.test.batchfetch; import org.hibernate.annotations.BatchSize; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; @Entity @IdClass(BId.class) diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchBootstrapTest.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchBootstrapTest.java index 23ee50788f..54af121c3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchBootstrapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchBootstrapTest.java @@ -2,12 +2,12 @@ package org.hibernate.test.batchfetch; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchNotFoundIgnoreDefaultStyleTest.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchNotFoundIgnoreDefaultStyleTest.java index d61a6b4591..a5ae54a2c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchNotFoundIgnoreDefaultStyleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchNotFoundIgnoreDefaultStyleTest.java @@ -8,12 +8,12 @@ package org.hibernate.test.batchfetch; import java.util.ArrayList; import java.util.List; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.Session; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchReferencedColumnNameTest.java index c161191188..8ca5c226cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchReferencedColumnNameTest.java @@ -11,15 +11,15 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import java.time.ZonedDateTime; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchRefreshTest.java index 12c0d79bc0..3ae3d8773c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchRefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchRefreshTest.java @@ -9,14 +9,14 @@ package org.hibernate.test.batchfetch; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.LockModeType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.LockModeType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchLoadableEntity.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchLoadableEntity.java index 573b568ca6..77d9422c53 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchLoadableEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchLoadableEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.batchfetch; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/City.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/City.java index 83a800a267..96d86db58e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/City.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/City.java @@ -6,15 +6,15 @@ */ package org.hibernate.test.batchfetch; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "city") diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/Country.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/Country.java index 76e40d62ca..2c498df1a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/Country.java @@ -8,13 +8,13 @@ package org.hibernate.test.batchfetch; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "country") diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/Model.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/Model.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java index 2bb38af839..de564dc779 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java @@ -11,12 +11,12 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.Serializable; import java.util.Objects; import java.util.UUID; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java index 1f8860e41c..55b5a4f87b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java @@ -13,17 +13,17 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java index caebf8ea73..423c4afd0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.test.bytecode.enhancement.cascade; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDetachedTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDetachedTest.java index 8bb8095fc2..857b7d4e77 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDetachedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeDetachedTest.java @@ -12,17 +12,17 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java index c9ac10d5cf..39231c01d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java @@ -3,16 +3,16 @@ package org.hibernate.test.bytecode.enhancement.cascade; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java index 723c481f94..24c1193fd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java @@ -14,11 +14,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; import java.util.UUID; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949Test.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949Test.java index 595d1ef35e..4e4a1e8575 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949Test.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949Test.java @@ -14,15 +14,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; import java.util.List; import static org.hibernate.Hibernate.isInitialized; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java index 5b9431a025..524c481785 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/BidirectionalLazyTest.java @@ -8,12 +8,12 @@ package org.hibernate.test.bytecode.enhancement.lazy; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java index 6b139e6174..ac643d2966 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.bytecode.enhancement.lazy; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java index f2cd996711..73b9db661d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.test.bytecode.enhancement.lazy; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; @@ -80,7 +80,7 @@ public class LazyBasicFieldMergeTest extends BaseCoreFunctionalTestCase { @Column(name = "NAME") private String name; - @OneToOne(mappedBy = "company", cascade = javax.persistence.CascadeType.ALL, orphanRemoval = true) + @OneToOne(mappedBy = "company", cascade = jakarta.persistence.CascadeType.ALL, orphanRemoval = true) private Manager manager; public Long getId() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java index 3ec6be12b5..e0b10e4c61 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java @@ -11,12 +11,12 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java index 1433a80e20..3bb672e6ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java @@ -18,15 +18,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java index cef8d20373..598bc36be7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java @@ -18,15 +18,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingTest.java index ccdd9d3ee0..9a50e78add 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingTest.java @@ -9,15 +9,15 @@ package org.hibernate.test.bytecode.enhancement.lazy; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java index d818fa52e8..e7c61c2faf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyWithCollectionTest.java @@ -25,15 +25,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java index 7fe20e03e0..32d0afab0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.bytecode.enhancement.lazy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java index 5141ca736b..6928d1a3bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java @@ -9,13 +9,13 @@ package org.hibernate.test.bytecode.enhancement.lazy; import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.ScrollMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java index 4d07652d8c..5b2601072d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java @@ -16,12 +16,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static org.hibernate.Hibernate.isPropertyInitialized; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.checkDirtyTracking; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java index a41949fca9..5ad681288d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java @@ -16,14 +16,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static org.hibernate.Hibernate.isPropertyInitialized; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.checkDirtyTracking; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java index be660f12f2..ab73b3b2a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsInEmbeddableTest.java @@ -11,15 +11,15 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java index 4fdeee8d4a..2fd7581f8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/BidirectionalLazyGroupsTest.java @@ -8,13 +8,13 @@ package org.hibernate.test.bytecode.enhancement.lazy.group; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyGroup; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_From.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_From.java index edaf3808bf..4e85d57de9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_From.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_From.java @@ -1,18 +1,18 @@ package org.hibernate.test.bytecode.enhancement.lazy.group; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_To.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_To.java index a0598f2f61..d2f94814f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_To.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LGMB_To.java @@ -1,15 +1,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.group; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; -import javax.persistence.Access; +import jakarta.persistence.Access; /** * Target of a LazyToOne - relationship (Foreignkey on this side) diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LazyGroupTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LazyGroupTest.java index cff8ab8a65..9b98efdc9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LazyGroupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/LazyGroupTest.java @@ -8,16 +8,16 @@ package org.hibernate.test.bytecode.enhancement.lazy.group; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyGroup; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java index 93a66e308c..6c3ebde9e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java @@ -21,11 +21,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.getFieldByReflection; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java index 3b22a0598e..477926158d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java @@ -6,15 +6,15 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.notfound; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java index 33673f001f..8992aa9028 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java @@ -10,15 +10,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.notfound; * @author Gail Badner */ -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java index 7d6676a7ac..29a394b024 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java @@ -6,15 +6,15 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.notfound; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/AbstractKey.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/AbstractKey.java index 3851639660..a38c39a56e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/AbstractKey.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/AbstractKey.java @@ -16,15 +16,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Activity.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Activity.java index 6745acc9c9..9a839cef81 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Activity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Activity.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Address.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Address.java index 360a042081..fd22677201 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Address.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BaseEntity.java index 463d1bb7d6..6b7eb620c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BaseEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BaseEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java index a0ac0445b1..fb581f3148 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java @@ -8,11 +8,11 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.BatchSize; @@ -256,4 +256,4 @@ public class BatchFetchProxyTest extends BaseNonConfigCoreFunctionalTestCase { private String name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java index 79185b7ef4..594dd9f48d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java @@ -9,18 +9,18 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java index 16e086b477..a06acd51e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java @@ -11,11 +11,11 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.LazyInitializationException; @@ -146,4 +146,4 @@ public class BytecodeEnhancedLazyLoadingOnDeletedEntityTest this.owners = owners; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java index f0529f83e8..66e20a6168 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/CreditCardPayment.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Customer.java index a709fe1fea..6c3a7fd0a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Customer.java @@ -8,15 +8,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java index 9eb37212be..dae31602b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DebitCardPayment.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java index b2b490a2ea..bd2d34ba63 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceProxyTest.java @@ -7,11 +7,11 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.MappedSuperclass; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java index 28c40332cb..e4438bae6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DeepInheritanceWithNonEntitiesProxyTest.java @@ -7,11 +7,11 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.MappedSuperclass; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java index 8647b578e4..4d1ec55ee1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/DomesticCustomer.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java index 3fa5e8d574..ab79399a15 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java @@ -8,15 +8,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyGroup; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java index 836d3469a4..efc671dbf5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java @@ -11,18 +11,18 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.ScrollableResults; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java index a9b0c6acc3..bbb2b6a634 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ForeignCustomer.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/GenericKey.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/GenericKey.java index 6f52802abf..449d9bf462 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/GenericKey.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/GenericKey.java @@ -14,10 +14,10 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity(name="GenericKey") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Instruction.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Instruction.java index 56d594b368..8112cf4614 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Instruction.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Instruction.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java index 73d0ec1d58..7b895d217d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java @@ -9,16 +9,16 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Query; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Query; +import jakarta.persistence.Table; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java index b0cee5eb07..17004bc2b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java @@ -7,13 +7,13 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.EntityMode; import org.hibernate.EntityNameResolver; @@ -456,4 +456,4 @@ public class LazyToOnesNoProxyFactoryWithSubclassesStatefulTest extends BaseNonC return pojoEntityTuplizer.getGetter( i ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java index 3e173b7fcc..018a04ff86 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java @@ -7,13 +7,13 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.EntityMode; import org.hibernate.EntityNameResolver; @@ -457,4 +457,4 @@ public class LazyToOnesNoProxyFactoryWithSubclassesStatelessTest extends BaseNon return pojoEntityTuplizer.getGetter( i ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java index e1dff89764..0754f98da9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -853,4 +853,4 @@ public class LazyToOnesProxyMergeWithSubclassesTest extends BaseNonConfigCoreFun this.human = human; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java index 00b205a14a..9ded78e932 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -321,4 +321,4 @@ public class LazyToOnesProxyWithSubclassesStatelessTest extends BaseNonConfigCor this.human = human; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java index ba16490b25..27355f28bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -389,4 +389,4 @@ public class LazyToOnesProxyWithSubclassesTest extends BaseNonConfigCoreFunction this.human = human; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java index 4937169f45..d94c5c4a43 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java @@ -15,14 +15,14 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.BatchSize; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java index 92959d7116..d06574f172 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java @@ -13,14 +13,14 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.CascadeType; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java index 1ae43e2d07..5a3d0a87eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -167,4 +167,4 @@ public class MapsIdProxyBidirectionalTest extends BaseNonConfigCoreFunctionalTes private String name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java index bb39638446..35d8c50b7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -132,4 +132,4 @@ public class MapsIdProxyUnidirectionalTest extends BaseNonConfigCoreFunctionalTe private String name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java index 957b98393f..63f1c3dff9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java @@ -7,11 +7,11 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ModelEntity.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ModelEntity.java index 1bf0415967..42c01b9a20 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ModelEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ModelEntity.java @@ -14,10 +14,10 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.sql.Timestamp; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class ModelEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java index 4eecb7acbb..fc939dd66b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MoreSpecializedKey.java @@ -14,9 +14,9 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity(name="MoreSpecializedKey") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java index 1f0bede495..79308f37db 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/NaturalIdInUninitializedProxyTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Order.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Order.java index b5fbf1bf99..057973e18b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Order.java @@ -8,17 +8,17 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java index 50f2fe5409..0c12dad884 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java index c2bf3baaa5..7ee8f92eea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/OrderSupplemental2.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Payment.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Payment.java index cac4adc2db..48a9a284be 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Payment.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Payment.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java index b9dc51bfac..80b0cd9607 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.spi.LoadState; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.spi.LoadState; +import jakarta.persistence.spi.PersistenceProvider; import org.hibernate.Hibernate; import org.hibernate.annotations.DynamicUpdate; @@ -380,4 +380,4 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest extend this.color = color; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java index 9a076abc64..f9f5bc4c1e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; @@ -353,4 +353,4 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingTest extends BaseNonConf this.color = color; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java index 92de81d0c0..78a5d2da11 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; @@ -359,4 +359,4 @@ public class ProxyInitializeAndUpdateTest extends BaseNonConfigCoreFunctionalTes this.color = color; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java index e3f9514220..c12661ee9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java @@ -9,15 +9,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.ScrollMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java index c756a89f04..eba9481fa7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java @@ -9,15 +9,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.ScrollMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/RoleEntity.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/RoleEntity.java index 18ae96adb2..d2c20c3ea5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/RoleEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/RoleEntity.java @@ -15,14 +15,14 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java index 33954bb22d..e308582d57 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java @@ -16,17 +16,17 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java index a75ffc4715..645fbbb3b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java @@ -8,15 +8,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -327,4 +327,4 @@ public class SimpleUpdateTestWithLazyLoading extends BaseNonConfigCoreFunctional this.relatives.add( person ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java index 70a9d0a369..bdf859bd00 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java @@ -8,15 +8,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; @@ -279,4 +279,4 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking extends BaseN this.relatives.add( person ); } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java index 875cd594b2..8112f9808f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedEntity.java @@ -14,15 +14,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java index 682f0a4fb0..842fbe427f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SpecializedKey.java @@ -16,12 +16,12 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/WebApplication.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/WebApplication.java index 72ac8889b6..67b6dc109f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/WebApplication.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/WebApplication.java @@ -9,11 +9,11 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy; import java.net.URL; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/batch/AbstractBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/batch/AbstractBatchingTest.java index 00a293ac00..a40ce1c1f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/batch/AbstractBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/batch/AbstractBatchingTest.java @@ -7,13 +7,13 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.batch; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; @@ -52,8 +52,8 @@ public abstract class AbstractBatchingTest extends BaseNonConfigCoreFunctionalTe @Override protected void applyMetadataSources(MetadataSources sources) { - sources.addAnnotatedClass( PaddedBatchingTest.ParentEntity.class ); - sources.addAnnotatedClass( PaddedBatchingTest.ChildEntity.class ); + sources.addAnnotatedClass( ParentEntity.class ); + sources.addAnnotatedClass( ChildEntity.class ); } @Test @@ -78,10 +78,10 @@ public abstract class AbstractBatchingTest extends BaseNonConfigCoreFunctionalTe @Before public void setUp() { - PaddedBatchingTest.ParentEntity parent = new PaddedBatchingTest.ParentEntity(); + ParentEntity parent = new ParentEntity(); inTransaction( session -> { - PaddedBatchingTest.ChildEntity childEntity = new PaddedBatchingTest.ChildEntity(); + ChildEntity childEntity = new ChildEntity(); childEntity.setName( childName ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java index 936cfdf210..c8a79a2409 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/BaseEntity.java @@ -7,12 +7,12 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.util.Date; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @MappedSuperclass public class BaseEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java index d18f50dfe1..bc040bac06 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Customer.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity(name = "Customer") public class Customer extends BaseEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java index 25487266aa..0d84f592ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java @@ -7,14 +7,14 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java index 47056359ee..26dafe4a02 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java @@ -8,10 +8,10 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.util.HashSet; import java.util.List; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java index 11d96769c7..1cdb504c2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java @@ -12,26 +12,26 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java index 0917b14da4..898949e6dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java @@ -7,16 +7,16 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.time.OffsetDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.SessionFactoryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java index 08c55e964c..db9459b290 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/Role.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity(name = "Role") @Table(name = "approle") diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java index 855d1fde9a..15a29fae6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SamplingOrder.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity(name = "SamplingOrder") public class SamplingOrder { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java index 22bb1f5df0..281559c40f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java index 30fb4c2612..1cdc1f0b8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/User.java @@ -8,15 +8,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; @Entity(name = "User") @Table(name = "appuser") diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java index a51df31126..57ee0b4fe0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/BaseEntity.java @@ -7,12 +7,12 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate; import java.util.Date; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @MappedSuperclass public class BaseEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java index d4cc226710..498bba5c8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Customer.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import org.hibernate.annotations.DynamicUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java index 4933bd6ee6..9442206b6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java @@ -8,10 +8,10 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.d import java.util.HashSet; import java.util.List; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java index cd8c685dde..01162491f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/Role.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.DynamicUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java index c25711d343..f374876e63 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/SamplingOrder.java @@ -7,13 +7,13 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.dynamicupdate; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.DynamicUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java index c8d8eb62d7..b1ae96593a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/User.java @@ -8,15 +8,15 @@ package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.d import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.hibernate.annotations.DynamicUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java index 9d7993aedf..1bcb6f6ed6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazyCache/InitFromCacheTest.java @@ -8,15 +8,15 @@ package org.hibernate.test.bytecode.enhancement.lazyCache; import java.util.Date; import java.util.Locale; -import javax.persistence.Basic; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.Basic; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java index 13cf60798d..3b301f004a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java @@ -19,16 +19,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/Email.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/Email.java index 53a43e1c31..379ce9141f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/Email.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/Email.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.collection.custom.basic; -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; /** * @author Gavin King diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/User.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/User.java index 0e7eabf6e4..1166a3e8ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/User.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/User.java @@ -9,15 +9,15 @@ package org.hibernate.test.collection.custom.basic; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.annotations.CollectionType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java index 6c7456c1df..356b0a4238 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.collection.custom.basic; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/Email.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/Email.java index bf7271f896..0709ed382b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/Email.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/Email.java @@ -1,9 +1,9 @@ package org.hibernate.test.collection.custom.declaredtype; -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; /** * @author Gavin King diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserCollectionTypeTest.java index 5f43ddf61e..923b27003d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserCollectionTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserCollectionTypeTest.java @@ -28,17 +28,17 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Hibernate; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserWithUnimplementedCollection.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserWithUnimplementedCollection.java index 75a6fe1c38..93b4720203 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserWithUnimplementedCollection.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/UserWithUnimplementedCollection.java @@ -25,7 +25,7 @@ package org.hibernate.test.collection.custom.declaredtype; import org.hibernate.annotations.CollectionType; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/explicitsemantics/UserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/explicitsemantics/UserCollectionTypeTest.java index 5ce2b7e349..cc0e439221 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/explicitsemantics/UserCollectionTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/declaredtype/explicitsemantics/UserCollectionTypeTest.java @@ -33,19 +33,19 @@ import java.util.Map; import java.util.Set; import java.util.Spliterator; import java.util.Spliterators; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Hibernate; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Entity.java index 3a4665a667..82b29f8e27 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Entity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Entity.java @@ -8,12 +8,12 @@ package org.hibernate.test.collection.custom.parameterized; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OrderColumn; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.CollectionType; import org.hibernate.annotations.Parameter; @@ -30,7 +30,7 @@ import org.hibernate.annotations.TypeDef; typeClass = DefaultableListType.class, parameters = @Parameter(name = "default", value = "Hello" ) ) -@javax.persistence.Entity +@jakarta.persistence.Entity public class Entity { private String name; private List values = new ArrayList(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedNestedCompositesTest.java b/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedNestedCompositesTest.java index 91a0cb168c..4980342f95 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedNestedCompositesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/component/empty/EmptyInitializedNestedCompositesTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.component.empty; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cuk/Account.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/Account.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/cuk/Address.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/cuk/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cuk/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/cuk/Person.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/distinct/SelectDistinctHqlTest.java b/hibernate-core/src/test/java/org/hibernate/test/distinct/SelectDistinctHqlTest.java index 77ff5c5d17..2203dcb9c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/distinct/SelectDistinctHqlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/distinct/SelectDistinctHqlTest.java @@ -8,15 +8,15 @@ package org.hibernate.test.distinct; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.jpa.QueryHints; diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedDetail.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedDetail.java index 8a946b1ab0..c452a32ae2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedDetail.java +++ b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedDetail.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.formulajoin; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedRoot.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedRoot.java index fdbaa8fe97..c95a2d0ef1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedRoot.java +++ b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedRoot.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.formulajoin; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Detail.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Detail.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ClassificationType.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ClassificationType.java index 0977e341bb..d3518fd85b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/ClassificationType.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ClassificationType.java @@ -22,7 +22,7 @@ import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.usertype.EnhancedUserType; /** - * A custom type for mapping {@link org.hibernate.test.hql.Classification} instances + * A custom type for mapping {@link Classification} instances * to the respective db column. *

          * THis is largely intended to mimic JDK5 enum support in JPA. Here we are diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java index 75157a986d..98cd6180f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java @@ -7,10 +7,10 @@ package org.hibernate.test.hql; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.Oracle8iDialect; @@ -142,4 +142,4 @@ public class CoalesceTest extends BaseCoreFunctionalTestCase { } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java index 2bb301639f..320139000e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.hql; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.java index eb69ce5277..a422798226 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.java @@ -15,7 +15,7 @@ package org.hibernate.test.hql; public class ComponentContainer { private Long id; - private ComponentContainer.Address address; + private Address address; public ComponentContainer() { } @@ -32,11 +32,11 @@ public class ComponentContainer { this.id = id; } - public ComponentContainer.Address getAddress() { + public Address getAddress() { return address; } - public void setAddress(ComponentContainer.Address address) { + public void setAddress(Address address) { this.address = address; } @@ -44,12 +44,12 @@ public class ComponentContainer { private String street; private String city; private String state; - private ComponentContainer.Address.Zip zip; + private Zip zip; public Address() { } - public Address(String street, String city, String state, ComponentContainer.Address.Zip zip) { + public Address(String street, String city, String state, Zip zip) { this.street = street; this.city = city; this.state = state; @@ -80,11 +80,11 @@ public class ComponentContainer { this.state = state; } - public ComponentContainer.Address.Zip getZip() { + public Zip getZip() { return zip; } - public void setZip(ComponentContainer.Address.Zip zip) { + public void setZip(Zip zip) { this.zip = zip; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Crop.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Crop.java index 4f430e401e..63416d30c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/Crop.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/Crop.java @@ -8,11 +8,11 @@ package org.hibernate.test.hql; import java.util.List; -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; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/DB297SubStringFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/DB297SubStringFunctionsTest.java index 74086582c0..f522e9bacf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/DB297SubStringFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/DB297SubStringFunctionsTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.hql; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; @@ -174,4 +174,4 @@ public class DB297SubStringFunctionsTest extends BaseCoreFunctionalTestCase { mostRecentSql = null; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java index a795755864..7af10a4be3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java @@ -1,12 +1,12 @@ package org.hibernate.test.hql; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteWhereFunctionCallTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteWhereFunctionCallTest.java index 6bb2e42e4e..d1dbab9f1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteWhereFunctionCallTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteWhereFunctionCallTest.java @@ -8,9 +8,9 @@ package org.hibernate.test.hql; import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Department.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Department.java index 432b7324c7..9e3dca1fd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/Department.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/Department.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.hql; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="department") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/DomesticAnimal.java b/hibernate-core/src/test/java/org/hibernate/test/hql/DomesticAnimal.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Employee.java index 857a32ea61..3966736615 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/Employee.java @@ -8,16 +8,16 @@ package org.hibernate.test.hql; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name="employee") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Farm.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Farm.java index afc39d79de..7327ce644f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/Farm.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/Farm.java @@ -8,14 +8,14 @@ package org.hibernate.test.hql; import java.util.List; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java index d3dd808e85..e3439cc09b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java @@ -8,10 +8,10 @@ package org.hibernate.test.hql; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Human.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Human.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/IndicesTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/IndicesTest.java index ddeae05664..576d234b66 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/IndicesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/IndicesTest.java @@ -3,13 +3,13 @@ package org.hibernate.test.hql; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import static org.hamcrest.core.Is.is; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java index 570fb1dec8..8c80e61f8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java @@ -15,20 +15,20 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; import java.util.List; import static org.hamcrest.core.Is.is; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/MapFunctionExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/MapFunctionExpressionsTest.java index e5538f071b..797f5143de 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/MapFunctionExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/MapFunctionExpressionsTest.java @@ -9,12 +9,12 @@ package org.hibernate.test.hql; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Name.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Name.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/NaturalIdDereferenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/NaturalIdDereferenceTest.java index a3455af970..027f3b2692 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/NaturalIdDereferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/NaturalIdDereferenceTest.java @@ -16,16 +16,16 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Before; import org.junit.Test; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.Collections; import java.util.List; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Panel.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Panel.java index e530422889..5e49787882 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/Panel.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/Panel.java @@ -1,47 +1,47 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.hql; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; - -@Entity -public class Panel implements Serializable { - - @Id - private Long id; - - private Long clientId; - - private String deltaStamp; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getClientId() { - return clientId; - } - - public void setClientId(Long clientId) { - this.clientId = clientId; - } - - public String getDeltaStamp() { - return deltaStamp; - } - - public void setDeltaStamp(String deltaStamp) { - this.deltaStamp = deltaStamp; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.hql; + +import java.io.Serializable; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + +@Entity +public class Panel implements Serializable { + + @Id + private Long id; + + private Long clientId; + + private String deltaStamp; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getClientId() { + return clientId; + } + + public void setClientId(Long clientId) { + this.clientId = clientId; + } + + public String getDeltaStamp() { + return deltaStamp; + } + + public void setDeltaStamp(String deltaStamp) { + this.deltaStamp = deltaStamp; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ParameterCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ParameterCollectionTest.java index 9bda113ebf..811a8da5d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/ParameterCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ParameterCollectionTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.hql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/PettingZoo.java b/hibernate-core/src/test/java/org/hibernate/test/hql/PettingZoo.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java index 597d775d23..f1a95fb9a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java @@ -8,11 +8,11 @@ package org.hibernate.test.hql; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/SubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/SubQueryTest.java index f04f13332a..745fa29056 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/SubQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/SubQueryTest.java @@ -8,12 +8,12 @@ package org.hibernate.test.hql; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Title.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Title.java index 6a47027274..3c73cb643f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/Title.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/Title.java @@ -7,11 +7,11 @@ package org.hibernate.test.hql; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="title") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/TrtPanel.java b/hibernate-core/src/test/java/org/hibernate/test/hql/TrtPanel.java index e58a7d7ba9..23de410a1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/TrtPanel.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/TrtPanel.java @@ -1,60 +1,60 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.hql; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -@Entity -public class TrtPanel implements Serializable { - - @Id - private Long id; - - @ManyToOne(fetch = FetchType.LAZY) - private Panel panel; - - private Long clientId; - - private String deltaStamp; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Panel getPanel() { - return panel; - } - - public void setPanel(Panel panel) { - this.panel = panel; - } - - public Long getClientId() { - return clientId; - } - - public void setClientId(Long clientId) { - this.clientId = clientId; - } - - public String getDeltaStamp() { - return deltaStamp; - } - - public void setDeltaStamp(String deltaStamp) { - this.deltaStamp = deltaStamp; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.hql; + +import java.io.Serializable; + +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; + +@Entity +public class TrtPanel implements Serializable { + + @Id + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private Panel panel; + + private Long clientId; + + private String deltaStamp; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Panel getPanel() { + return panel; + } + + public void setPanel(Panel panel) { + this.panel = panel; + } + + public Long getClientId() { + return clientId; + } + + public void setClientId(Long clientId) { + this.clientId = clientId; + } + + public String getDeltaStamp() { + return deltaStamp; + } + + public void setDeltaStamp(String deltaStamp) { + this.deltaStamp = deltaStamp; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java index 1700857957..b233717c1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java @@ -5,13 +5,13 @@ import org.hibernate.testing.TestForIssue; import org.junit.Assert; import org.junit.Test; -import javax.persistence.*; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.*; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import java.util.List; -import static javax.persistence.InheritanceType.JOINED; +import static jakarta.persistence.InheritanceType.JOINED; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @TestForIssue(jiraKey = "HHH-13169") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/User.java b/hibernate-core/src/test/java/org/hibernate/test/hql/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Child.java b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Child.java index 00131877d7..4d563a8b8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Child.java @@ -25,14 +25,14 @@ package org.hibernate.test.hql.fetchAndJoin; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -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.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "child") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity1.java b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity1.java index 2e9778484b..ae8fe190a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity1.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity1.java @@ -23,12 +23,12 @@ */ package org.hibernate.test.hql.fetchAndJoin; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "entity1") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity2.java b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity2.java index 3edf588156..dd89b94193 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity2.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity2.java @@ -23,13 +23,13 @@ */ package org.hibernate.test.hql.fetchAndJoin; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "entity2") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity3.java b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity3.java index 54234438a1..6fbcc97fa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity3.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity3.java @@ -23,10 +23,10 @@ */ package org.hibernate.test.hql.fetchAndJoin; -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; @Entity @Table(name = "entity3") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/GrandChild.java b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/GrandChild.java index 6a0ab7a3b7..8b3bbce040 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/GrandChild.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/GrandChild.java @@ -23,10 +23,10 @@ */ package org.hibernate.test.hql.fetchAndJoin; -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; @Entity @Table(name = "grandchild") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Parent.java index d7845fdc46..42c1ae68ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Parent.java @@ -25,14 +25,14 @@ package org.hibernate.test.hql.fetchAndJoin; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -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.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "parent") diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Employee.java index fd40eb6ae1..d6871bbdf2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Employee.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.hql.joinedSubclass; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java index c877d63605..ee8c50fbd8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassSubQueryTest.java @@ -7,17 +7,17 @@ package org.hibernate.test.hql.joinedSubclass; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Person.java b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Person.java index d12edf1d22..3eb875b164 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Person.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.hql.joinedSubclass; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java index f7baf77809..65cb655490 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java @@ -13,14 +13,14 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.TypedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TypedQuery; import org.hibernate.annotations.ResultCheckStyle; import org.hibernate.annotations.SQLDelete; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/City.java b/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/City.java index c60400e547..116e36bf87 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/City.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/City.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.hql.size.filter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Where; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/Region.java b/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/Region.java index 59da4d4f35..1075ad99bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/Region.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/size/filter/Region.java @@ -8,9 +8,9 @@ package org.hibernate.test.hql.size.filter; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Region { diff --git a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java index 4ae03d7153..e057b957f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/QueryScrollingWithInheritanceTest.java @@ -9,15 +9,15 @@ package org.hibernate.test.hqlfetchscroll; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.ScrollMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/sequence/SequenceExportTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/sequence/SequenceExportTest.java index 21fe804729..36a56f1a6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/sequence/SequenceExportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/id/sequence/SequenceExportTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.id.sequence; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.model.relational.Namespace; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java index 0b65f52810..80c5b03b3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java @@ -9,11 +9,11 @@ package org.hibernate.test.id.usertype; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import org.hibernate.HibernateException; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/Event.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/Event.java index 39b90d818b..5795307965 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/Event.java +++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/Event.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.id.usertype.inet; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java index b099d51a3b..5da9f74d33 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java @@ -8,11 +8,11 @@ package org.hibernate.test.id.usertype.inet; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.TypeDef; import org.hibernate.boot.MetadataBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/idclass/CustomerId.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/CustomerId.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/InheritanceDeleteBatchTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/InheritanceDeleteBatchTest.java index fb5c15d7ea..c22078a89c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/InheritanceDeleteBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/InheritanceDeleteBatchTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Query; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Query; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java index b771c45ade..637a622338 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.inheritance; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.MappedSuperclass; import org.hibernate.cfg.AnnotationBinder; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/InheritingEntity.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/InheritingEntity.java index 4e015cb940..8c3ccce1cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/InheritingEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/InheritingEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.inheritance.discriminator; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Pawel Stawicki diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceEagerTest.java index 25ce90f3db..60c1efebcd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceEagerTest.java @@ -24,13 +24,13 @@ package org.hibernate.test.inheritance.discriminator; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.query.sqm.InterpretationException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceTest.java index 27a0707280..1c1605e7b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/JoinedInheritanceTest.java @@ -29,7 +29,7 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java index c707f72e1c..1a200f6cbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/MultiInheritanceImplicitDowncastTest.java @@ -30,25 +30,25 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.NotYetImplementedFor6Exception; diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/ParentEntity.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/ParentEntity.java index 26f770ac20..32a9dd5ed9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/ParentEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/ParentEntity.java @@ -6,16 +6,16 @@ */ package org.hibernate.test.inheritance.discriminator; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; -import static javax.persistence.DiscriminatorType.INTEGER; -import static javax.persistence.GenerationType.IDENTITY; -import static javax.persistence.InheritanceType.SINGLE_TABLE; +import static jakarta.persistence.DiscriminatorType.INTEGER; +import static jakarta.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.InheritanceType.SINGLE_TABLE; /** * @author Pawel Stawicki diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Polygon.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Polygon.java index 8698e99412..b7c02ef8a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Polygon.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Polygon.java @@ -23,11 +23,11 @@ */ package org.hibernate.test.inheritance.discriminator; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Base class for testing joined inheritance with a discriminator column. diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Quadrilateral.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Quadrilateral.java index 3d78770f3f..b56b1e0731 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Quadrilateral.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/Quadrilateral.java @@ -23,8 +23,8 @@ */ package org.hibernate.test.inheritance.discriminator; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * Sub class for testing joined inheritance with a discriminator column. diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/CollectionInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/CollectionInterceptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java index e00625f83d..1e72c3aaa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorNonNullTransactionTest.java @@ -14,9 +14,9 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java old mode 100755 new mode 100644 index ff015b50b7..d14e5f032f --- a/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java @@ -5,9 +5,9 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.test.interceptor; -import javax.persistence.PersistenceException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import java.io.Serializable; import java.util.LinkedList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/Log.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/Log.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/PropertyInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/PropertyInterceptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/StatefulInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/StatefulInterceptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/interceptor/User.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/User.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Document.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Document.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Folder.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/FolderImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/FolderImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/ItemImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/ItemImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocument.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocument.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocumentImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocumentImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Address.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java old mode 100755 new mode 100644 index 7c2629cb96..4bc5538171 --- a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java @@ -8,9 +8,9 @@ package org.hibernate.test.joinedsubclass; import java.util.Iterator; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java index 5efb442de2..c84dba6c64 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java @@ -8,17 +8,17 @@ package org.hibernate.test.joinedsubclassbatch; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; @@ -324,7 +324,7 @@ public class IdentityJoinedSubclassBatchingTest extends BaseCoreFunctionalTestCa @Column(nullable = false, updatable = false) private char sex; - @javax.persistence.Version + @jakarta.persistence.Version private int version; private double heightInches; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java index 1cce829ae5..46c0761e45 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java @@ -8,16 +8,16 @@ package org.hibernate.test.joinedsubclassbatch; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; @@ -251,7 +251,7 @@ public class JoinedSubclassBatchingTest extends BaseCoreFunctionalTestCase { @Column(nullable = false, updatable = false) private char sex; - @javax.persistence.Version + @jakarta.persistence.Version private int version; private double heightInches; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java index a310cb3639..46165aa0dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java @@ -8,17 +8,17 @@ package org.hibernate.test.joinedsubclassbatch; import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; @@ -287,7 +287,7 @@ public class SequenceJoinedSubclassBatchingTest extends BaseCoreFunctionalTestCa @Column(nullable = false, updatable = false) private char sex; - @javax.persistence.Version + @jakarta.persistence.Version private int version; private double heightInches; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassduplicatefields/JoinedSubclassDuplicateFieldsWithTreatTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassduplicatefields/JoinedSubclassDuplicateFieldsWithTreatTest.java index e844baa48c..417dcd585e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassduplicatefields/JoinedSubclassDuplicateFieldsWithTreatTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclassduplicatefields/JoinedSubclassDuplicateFieldsWithTreatTest.java @@ -7,11 +7,11 @@ package org.hibernate.test.joinedsubclassduplicatefields; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Bid.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Bid.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Category.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Category.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Comment.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Comment.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Group.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Group.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Item.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Item.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java old mode 100755 new mode 100644 index c7694629ad..39c8572e94 --- a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java @@ -8,10 +8,10 @@ package org.hibernate.test.joinfetch; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/User.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java index a839d869c8..4ced747019 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java @@ -15,14 +15,14 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyGroup; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java index d03e004a41..6ff0b39fd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java @@ -7,7 +7,7 @@ package org.hibernate.test.jpa; import java.util.IdentityHashMap; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import org.hibernate.boot.Metadata; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java index 41d4276883..428ddc6025 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.jpa; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.metamodel.Metamodel; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -47,10 +47,10 @@ public class EntityManagerUnwrapTest extends BaseEntityManagerFunctionalTestCase entityManagerFactory().unwrap( JdbcServices.class ); - entityManagerFactory().unwrap( javax.persistence.Cache.class ); + entityManagerFactory().unwrap( jakarta.persistence.Cache.class ); entityManagerFactory().unwrap( org.hibernate.Cache.class ); - entityManagerFactory().unwrap( javax.persistence.metamodel.Metamodel.class ); + entityManagerFactory().unwrap( jakarta.persistence.metamodel.Metamodel.class ); entityManagerFactory().unwrap( Metamodel.class ); entityManagerFactory().unwrap( MetamodelImplementor.class ); entityManagerFactory().unwrap( MappingMetamodel.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/MapContent.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/MapContent.java index 3cfc573a45..00702d5e12 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/MapContent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/MapContent.java @@ -1,8 +1,8 @@ package org.hibernate.test.jpa; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class MapContent { @@ -25,4 +25,4 @@ public class MapContent { this.relationship = relationship; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/MapOwner.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/MapOwner.java index 69c1e13469..b8248b91f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/MapOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/MapOwner.java @@ -2,12 +2,12 @@ package org.hibernate.test.jpa; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; @Entity public class MapOwner { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/Relationship.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/Relationship.java index 4a96a45b59..c5ce95da8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/Relationship.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/Relationship.java @@ -1,7 +1,7 @@ package org.hibernate.test.jpa; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Relationship { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java index 6038759cf4..135a5cdf3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java @@ -13,12 +13,12 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/package-info.java index 768009dbb8..6ad666c296 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/package-info.java @@ -22,6 +22,6 @@ * Boston, MA 02110-1301 USA */ /** - * Package for testing JPA converters and the {@link javax.persistence.Convert @Convert} annotation. + * Package for testing JPA converters and the {@link jakarta.persistence.Convert @Convert} annotation. */ package org.hibernate.test.jpa.convert; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ClassWithIdentityColumn.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ClassWithIdentityColumn.java index 274f40384e..589ea28f37 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ClassWithIdentityColumn.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ClassWithIdentityColumn.java @@ -1,33 +1,33 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.jpa.naturalid; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -import org.hibernate.annotations.NaturalId; - -@Entity -public class ClassWithIdentityColumn { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - - @NaturalId(mutable = true) - private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.jpa.naturalid; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +import org.hibernate.annotations.NaturalId; + +@Entity +public class ClassWithIdentityColumn { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @NaturalId(mutable = true) + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/Group.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/Group.java index d44d37e137..1a48873b11 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/Group.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/Group.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.jpa.naturalid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java index 1711b53858..f9a4abf2e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.jpa.naturalid; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java index 1a0c2d86b0..4a779830a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.jpa.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java index f1c4b9d729..1a95885969 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.jpa.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java index 43729ae5d7..4a7bb51c44 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.jpa.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java index 6b56ad55b8..7e68872de4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.jpa.orphan.one2one; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java index f72f71024e..9f1b31dfa7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java @@ -10,7 +10,7 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import javax.persistence.*; +import jakarta.persistence.*; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java index 3e354b7de5..18e7a1eccf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.jpa.proxy; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import junit.framework.AssertionFailedError; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java index 2277414031..c134de4dac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java @@ -6,15 +6,15 @@ */ package org.hibernate.test.jpa.ql; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.Table; /** * @author Janario Oliveira diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java index eac7b3d478..e519bf1a80 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.jpa.ql; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Janario Oliveira diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/IdentificationVariablesTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/IdentificationVariablesTest.java index 74ade8d065..9fe0cb07a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/IdentificationVariablesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/IdentificationVariablesTest.java @@ -6,15 +6,15 @@ */ package org.hibernate.test.jpa.ql; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/TreatKeywordTest.java index f82a5e5b1a..a67df968b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/TreatKeywordTest.java @@ -6,17 +6,17 @@ */ package org.hibernate.test.jpa.ql; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.Arrays; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employment.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employment.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/LobEntity.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LobEntity.java index b208682bc1..ea81ca5608 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/lob/LobEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/lob/LobEntity.java @@ -8,11 +8,11 @@ package org.hibernate.test.lob; import java.sql.Blob; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; /** * @author Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/LobStringTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LobStringTest.java index 26a42ebd69..97d7bdbd66 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/lob/LobStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/lob/LobStringTest.java @@ -10,12 +10,12 @@ import java.io.UnsupportedEncodingException; import java.sql.Clob; import java.sql.SQLException; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; @@ -234,4 +234,4 @@ public class LobStringTest extends BaseCoreFunctionalTestCase { } return buff.toString(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/PostgreSqlLobStringTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/PostgreSqlLobStringTest.java index c1f324a941..bc096eee83 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/lob/PostgreSqlLobStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/lob/PostgreSqlLobStringTest.java @@ -11,12 +11,12 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.query.Query; @@ -186,4 +186,4 @@ public class PostgreSqlLobStringTest extends BaseCoreFunctionalTestCase { protected boolean isCleanupTestDataUsingBulkDelete() { return true; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Item.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Item.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Part.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Part.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Product.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Product.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/ConfEntity.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/ConfEntity.java index effa785afb..33ce405769 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/ConfEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/ConfEntity.java @@ -1,60 +1,60 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.mapping; - -import static javax.persistence.CascadeType.ALL; - -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -@Entity -@Table(name = "CONF") -@IdClass(ConfId.class) -public class ConfEntity implements Serializable{ - - private static final long serialVersionUID = -5089484717715507169L; - - @Id - @Column(name = "confKey") - private String confKey; - - @Id - @Column(name = "confValue") - private String confValue; - - @OneToMany(mappedBy="conf", cascade = ALL, orphanRemoval = true, fetch = FetchType.LAZY) - private Set userConf = new HashSet(); - - public String getConfKey() { - return confKey; - } - - public void setConfKey(String confKey) { - this.confKey = confKey; - } - - public String getConfValue() { - return confValue; - } - - public void setConfValue(String confValue) { - this.confValue = confValue; - } - - public Set getUserConf() { - return userConf; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.mapping; + +import static jakarta.persistence.CascadeType.ALL; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + +@Entity +@Table(name = "CONF") +@IdClass(ConfId.class) +public class ConfEntity implements Serializable{ + + private static final long serialVersionUID = -5089484717715507169L; + + @Id + @Column(name = "confKey") + private String confKey; + + @Id + @Column(name = "confValue") + private String confValue; + + @OneToMany(mappedBy="conf", cascade = ALL, orphanRemoval = true, fetch = FetchType.LAZY) + private Set userConf = new HashSet(); + + public String getConfKey() { + return confKey; + } + + public void setConfKey(String confKey) { + this.confKey = confKey; + } + + public String getConfValue() { + return confValue; + } + + public void setConfValue(String confValue) { + this.confValue = confValue; + } + + public Set getUserConf() { + return userConf; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/MappedSuperclassWithGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/MappedSuperclassWithGenericsTest.java index fe49221bce..a33229e1bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/MappedSuperclassWithGenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/MappedSuperclassWithGenericsTest.java @@ -8,10 +8,10 @@ package org.hibernate.test.mapping; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/Table1.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/Table1.java index 54a88e9bc3..1c1a2830d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/Table1.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/Table1.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping; -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 Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/Table2.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/Table2.java index 86f72f952a..2d5588d6cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/Table2.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/Table2.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping; -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 Brett Meyer diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/UserConfEntity.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/UserConfEntity.java index e49d33d3f3..eb253e50fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/UserConfEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/UserConfEntity.java @@ -1,54 +1,54 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.mapping; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "USER_CONFS") -@IdClass(UserConfId.class) -public class UserConfEntity implements Serializable{ - - private static final long serialVersionUID = 9153314908821604322L; - - @Id - @ManyToOne - @JoinColumn(name="user_id", nullable = false) - private UserEntity user; - - @Id - @ManyToOne - @JoinColumns({ - @JoinColumn(name="cnf_key", referencedColumnName="confKey"), - @JoinColumn(name="cnf_value", referencedColumnName="confValue")}) - private ConfEntity conf; - - public ConfEntity getConf() { - return conf; - } - - public void setConf(ConfEntity conf) { - this.conf = conf; - } - - - public UserEntity getUser() { - return user; - } - - public void setUser(UserEntity user) { - this.user = user; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.mapping; + +import java.io.Serializable; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "USER_CONFS") +@IdClass(UserConfId.class) +public class UserConfEntity implements Serializable{ + + private static final long serialVersionUID = 9153314908821604322L; + + @Id + @ManyToOne + @JoinColumn(name="user_id", nullable = false) + private UserEntity user; + + @Id + @ManyToOne + @JoinColumns({ + @JoinColumn(name="cnf_key", referencedColumnName="confKey"), + @JoinColumn(name="cnf_value", referencedColumnName="confValue")}) + private ConfEntity conf; + + public ConfEntity getConf() { + return conf; + } + + public void setConf(ConfEntity conf) { + this.conf = conf; + } + + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/UserEntity.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/UserEntity.java index cf0b21e3c2..5325d641ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/UserEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/UserEntity.java @@ -1,64 +1,64 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.mapping; - -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.EAGER; - -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; - -@Entity -@Table(name = "USERTABLE") -public class UserEntity implements Serializable{ - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - @Column(name = "user_id") - private Long id; - - @OrderColumn(name = "cnf_order") - @OneToMany(mappedBy="user", fetch = EAGER, cascade = ALL, orphanRemoval = true) - private Set confs = new HashSet(); - - private String name; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Set getConfs() { - return confs; - } - - public void setConfs(Set confs) { - this.confs = confs; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.mapping; + +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.EAGER; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; + +@Entity +@Table(name = "USERTABLE") +public class UserEntity implements Serializable{ + + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue + @Column(name = "user_id") + private Long id; + + @OrderColumn(name = "cnf_order") + @OneToMany(mappedBy="user", fetch = EAGER, cascade = ALL, orphanRemoval = true) + private Set confs = new HashSet(); + + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Set getConfs() { + return confs; + } + + public void setConfs(Set confs) { + this.confs = confs; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/cascade/PersistOnLazyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/cascade/PersistOnLazyCollectionTest.java index a0679bd872..6d0a072840 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/cascade/PersistOnLazyCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/cascade/PersistOnLazyCollectionTest.java @@ -1,241 +1,241 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.mapping.cascade; - -import java.util.HashSet; -import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; - -import org.hibernate.LazyInitializationException; -import org.hibernate.Session; -import org.hibernate.stat.SessionStatistics; - -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Assert; -import org.junit.Test; - -import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -import static org.junit.Assert.fail; - -/** - * Testing relationships between components: example invoice -> invoice line - * - * @author Jan-Oliver Lustig, Sebastian Viefhaus - */ -public class PersistOnLazyCollectionTest extends BaseCoreFunctionalTestCase{ - - static String RECEIPT_A = "Receipt A"; - static String INVOICE_A = "Invoice A"; - static String INVOICELINE_A = "InvoiceLine A"; - static String INVOICELINE_B = "InvoiceLine B"; - - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { - Invoice.class, - InvoiceLine.class, - Receipt.class - }; - } - - public Invoice createInvoiceWithTwoInvoiceLines(Session session) { - InvoiceLine lineA = new InvoiceLine(INVOICELINE_A); - InvoiceLine lineB = new InvoiceLine(INVOICELINE_B); - - Invoice invoice = new Invoice(INVOICE_A); - invoice.addInvoiceLine(lineA); - invoice.addInvoiceLine(lineB); - - session.persist(invoice); - - return invoice; - } - - @Test - @TestForIssue( jiraKey = "HHH-11916" ) - public void testPersistOnAlreadyPersistentEntityWithUninitializedLazyCollection() { - - final Invoice _invoice = doInHibernate( this::sessionFactory, this::createInvoiceWithTwoInvoiceLines ); - - Invoice invoiceAfter = doInHibernate( this::sessionFactory, session -> { - SessionStatistics stats = session.getStatistics(); - - // load invoice, invoiceLines should not be loaded - Invoice invoice = session.get(Invoice.class, _invoice.getId()); - Assert.assertEquals( - "Invoice lines should not be initialized while loading the invoice, " + - "because of the lazy association.", 1, stats.getEntityCount()); - - invoice.setName(invoice.getName() + " !"); - - return invoice; - } ); - - try { - invoiceAfter.getInvoiceLines().size(); - fail("Should throw LazyInitializationException"); - } - catch (LazyInitializationException expected) { - } - } - - @Test - @TestForIssue( jiraKey = "HHH-11916" ) - public void testPersistOnNewEntityRelatedToAlreadyPersistentEntityWithUninitializedLazyCollection() { - final Invoice _invoice = doInHibernate( this::sessionFactory, this::createInvoiceWithTwoInvoiceLines ); - - Invoice invoiceAfter = doInHibernate( this::sessionFactory, session -> { - SessionStatistics stats = session.getStatistics(); - - // load invoice, invoiceLines should not be loaded - Invoice invoice = session.get(Invoice.class, _invoice.getId()); - Assert.assertEquals( - "Invoice lines should not be initialized while loading the invoice, " + - "because of the lazy association.", 1, stats.getEntityCount()); - - Receipt receipt = new Receipt(RECEIPT_A); - - receipt.setInvoice(invoice); - session.persist(receipt); - - return invoice; - } ); - - try { - invoiceAfter.getInvoiceLines().size(); - fail("Should throw LazyInitializationException"); - } - catch (LazyInitializationException expected) { - } - } - - @Entity - @Table(name = "OTM_Invoice") - public static class Invoice { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - - @Column(length = 50, nullable = false) - private String name; - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "INVOICE_ID", nullable = false) - private final Set invoiceLines = new HashSet<>(); - - public Invoice() { - super(); - } - - public Invoice(String name) { - super(); - this.name = name; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Set getInvoiceLines() { - return invoiceLines; - } - - public void addInvoiceLine(InvoiceLine invoiceLine) { - invoiceLines.add(invoiceLine); - } - } - - @Entity - @Table(name = "OTM_InvoiceLine") - public static class InvoiceLine { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - - @Column(length = 50, nullable = false) - private String name; - - public InvoiceLine() { - super(); - } - - public InvoiceLine(String name) { - super(); - this.name = name; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - } - - @Entity - @Table(name = "OTM_Receipt") - public static class Receipt { - - @OneToOne(cascade = { CascadeType.PERSIST}) - private Invoice invoice; - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - - @Column(length = 50, nullable = false) - private String name; - - public Receipt() { - super(); - } - - public Receipt(String name) { - super(); - this.name = name; - } - - public void setInvoice(Invoice invoice) { - this.invoice = invoice; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - } -} \ No newline at end of file +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.test.mapping.cascade; + +import java.util.HashSet; +import java.util.Set; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; + +import org.hibernate.LazyInitializationException; +import org.hibernate.Session; +import org.hibernate.stat.SessionStatistics; + +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.junit.Assert; +import org.junit.Test; + +import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; +import static org.junit.Assert.fail; + +/** + * Testing relationships between components: example invoice -> invoice line + * + * @author Jan-Oliver Lustig, Sebastian Viefhaus + */ +public class PersistOnLazyCollectionTest extends BaseCoreFunctionalTestCase{ + + static String RECEIPT_A = "Receipt A"; + static String INVOICE_A = "Invoice A"; + static String INVOICELINE_A = "InvoiceLine A"; + static String INVOICELINE_B = "InvoiceLine B"; + + @Override + protected Class[] getAnnotatedClasses() { + return new Class[] { + Invoice.class, + InvoiceLine.class, + Receipt.class + }; + } + + public Invoice createInvoiceWithTwoInvoiceLines(Session session) { + InvoiceLine lineA = new InvoiceLine(INVOICELINE_A); + InvoiceLine lineB = new InvoiceLine(INVOICELINE_B); + + Invoice invoice = new Invoice(INVOICE_A); + invoice.addInvoiceLine(lineA); + invoice.addInvoiceLine(lineB); + + session.persist(invoice); + + return invoice; + } + + @Test + @TestForIssue( jiraKey = "HHH-11916" ) + public void testPersistOnAlreadyPersistentEntityWithUninitializedLazyCollection() { + + final Invoice _invoice = doInHibernate( this::sessionFactory, this::createInvoiceWithTwoInvoiceLines ); + + Invoice invoiceAfter = doInHibernate( this::sessionFactory, session -> { + SessionStatistics stats = session.getStatistics(); + + // load invoice, invoiceLines should not be loaded + Invoice invoice = session.get(Invoice.class, _invoice.getId()); + Assert.assertEquals( + "Invoice lines should not be initialized while loading the invoice, " + + "because of the lazy association.", 1, stats.getEntityCount()); + + invoice.setName(invoice.getName() + " !"); + + return invoice; + } ); + + try { + invoiceAfter.getInvoiceLines().size(); + fail("Should throw LazyInitializationException"); + } + catch (LazyInitializationException expected) { + } + } + + @Test + @TestForIssue( jiraKey = "HHH-11916" ) + public void testPersistOnNewEntityRelatedToAlreadyPersistentEntityWithUninitializedLazyCollection() { + final Invoice _invoice = doInHibernate( this::sessionFactory, this::createInvoiceWithTwoInvoiceLines ); + + Invoice invoiceAfter = doInHibernate( this::sessionFactory, session -> { + SessionStatistics stats = session.getStatistics(); + + // load invoice, invoiceLines should not be loaded + Invoice invoice = session.get(Invoice.class, _invoice.getId()); + Assert.assertEquals( + "Invoice lines should not be initialized while loading the invoice, " + + "because of the lazy association.", 1, stats.getEntityCount()); + + Receipt receipt = new Receipt(RECEIPT_A); + + receipt.setInvoice(invoice); + session.persist(receipt); + + return invoice; + } ); + + try { + invoiceAfter.getInvoiceLines().size(); + fail("Should throw LazyInitializationException"); + } + catch (LazyInitializationException expected) { + } + } + + @Entity + @Table(name = "OTM_Invoice") + public static class Invoice { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @Column(length = 50, nullable = false) + private String name; + + @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) + @JoinColumn(name = "INVOICE_ID", nullable = false) + private final Set invoiceLines = new HashSet<>(); + + public Invoice() { + super(); + } + + public Invoice(String name) { + super(); + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set getInvoiceLines() { + return invoiceLines; + } + + public void addInvoiceLine(InvoiceLine invoiceLine) { + invoiceLines.add(invoiceLine); + } + } + + @Entity + @Table(name = "OTM_InvoiceLine") + public static class InvoiceLine { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @Column(length = 50, nullable = false) + private String name; + + public InvoiceLine() { + super(); + } + + public InvoiceLine(String name) { + super(); + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + } + + @Entity + @Table(name = "OTM_Receipt") + public static class Receipt { + + @OneToOne(cascade = { CascadeType.PERSIST}) + private Invoice invoice; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @Column(length = 50, nullable = false) + private String name; + + public Receipt() { + super(); + } + + public Receipt(String name) { + super(); + this.name = name; + } + + public void setInvoice(Invoice invoice) { + this.invoice = invoice; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/PlayerStat.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/PlayerStat.java index 48fe1dc884..6928b337e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/PlayerStat.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/PlayerStat.java @@ -8,15 +8,15 @@ package org.hibernate.test.mapping.hhh14276.entity; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "\"PlayerStats\"") diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/Score.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/Score.java index 5c03991752..d06b931e4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/Score.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/entity/Score.java @@ -8,12 +8,12 @@ package org.hibernate.test.mapping.hhh14276.entity; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name = "\"Scores\"") diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedPlayerStat.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedPlayerStat.java index a10564cc09..302ef47dff 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedPlayerStat.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedPlayerStat.java @@ -2,15 +2,15 @@ package org.hibernate.test.mapping.hhh14343.entity; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "\"PlayerStats\"") diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedScore.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedScore.java index 022dd21eda..cff6809876 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedScore.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedScore.java @@ -2,12 +2,12 @@ package org.hibernate.test.mapping.hhh14343.entity; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; @Entity @Table(name = "\"Scores\"") diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedStat.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedStat.java index a41c300dc4..00657a7ed0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedStat.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/entity/NestedStat.java @@ -2,14 +2,14 @@ package org.hibernate.test.mapping.hhh14343.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "\"Stats\"") diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ChildEntity.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ChildEntity.java index d30ae85398..e496e9f539 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ChildEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ChildEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.mapping.joinformula; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ChildEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ParentEntity.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ParentEntity.java index c34776e31a..df9187d7b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ParentEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/joinformula/ParentEntity.java @@ -10,10 +10,10 @@ import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinColumnsOrFormulas; import org.hibernate.annotations.JoinFormula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class ParentEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Airport.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Airport.java index 2727a527ac..ab5d9fb4b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Airport.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Airport.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.mapping.lazytoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Flight.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Flight.java index 30e40a4325..f0e2914bf9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Flight.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/Flight.java @@ -6,15 +6,15 @@ */ package org.hibernate.test.mapping.lazytoone; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyToOne; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hibernate.annotations.LazyToOneOption.NO_PROXY; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java index 119d7610e8..26c8873e7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java @@ -7,10 +7,10 @@ package org.hibernate.test.mapping.lazytoone; import java.math.BigDecimal; -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; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneAllowProxyTests.java index 36ad0a2510..45780e218f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneAllowProxyTests.java @@ -7,10 +7,10 @@ package org.hibernate.test.mapping.lazytoone; import java.math.BigDecimal; -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; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java index 82433cf891..4df6da8e46 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java @@ -7,10 +7,10 @@ package org.hibernate.test.mapping.lazytoone; import java.math.BigDecimal; -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; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java index 119ae3462a..a2007cfea5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping.lazytoone.mappedby; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java index 2a32a9cbe9..376b2d4fb8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping.lazytoone.mappedby; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java index 0fcdcfe7a3..4e492bc54d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping.lazytoone.mappedby; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java index 77b861fb72..ee4ddfb496 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping.lazytoone.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -29,7 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hibernate.annotations.FetchMode.JOIN; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java index e7e7ef297b..b6002bb9a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping.lazytoone.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java index a405c0017a..e61af8b2cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.mapping.lazytoone.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java index 9dc36e267f..b32dceebeb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java @@ -7,12 +7,12 @@ package org.hibernate.test.mapping.lazytoone.polymorphic; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.Fetch; @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hibernate.annotations.FetchMode.JOIN; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java index 5e149c104f..7f24e0b4ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java @@ -7,12 +7,12 @@ package org.hibernate.test.mapping.lazytoone.polymorphic; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyToOne; @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java index d72ca81900..813ebf2d43 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java @@ -7,12 +7,12 @@ package org.hibernate.test.mapping.lazytoone.polymorphic; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.boot.MetadataSources; @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/Document.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/Document.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/DocumentInterceptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/Folder.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mixed/Item.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/Item.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/Item.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/MixedTest.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/MixedTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/SecureDocument.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/SecureDocument.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Customer.java index 5f8b8fec7d..a477746794 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Customer.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.multitenancy.schema; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Invoice.java b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Invoice.java index c478070ccc..01b4d31cca 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Invoice.java +++ b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/Invoice.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.multitenancy.schema; -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; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Category.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Category.java index ba4c20d349..5ed60d41a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Category.java @@ -13,15 +13,15 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; import org.hibernate.test.namingstrategy.Item; diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Item.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Item.java index 95ca1b4964..79d99896ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Item.java @@ -7,12 +7,12 @@ package org.hibernate.test.namingstrategy; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/LocalizedEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/LocalizedEmbeddable.java index a7c5292c1f..a990a448ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/LocalizedEmbeddable.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/LocalizedEmbeddable.java @@ -7,8 +7,8 @@ package org.hibernate.test.namingstrategy; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class LocalizedEmbeddable implements Serializable, Cloneable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Workflow.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Workflow.java index 46703c72da..d3d1421484 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Workflow.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Workflow.java @@ -13,14 +13,14 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; @Entity public class Workflow implements Serializable { diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java index 7a6ab6fe3d..5c657c0f41 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/collectionJoinTableNaming/CollectionJoinTableNamingTest.java @@ -26,15 +26,15 @@ package org.hibernate.test.namingstrategy.collectionJoinTableNaming; import java.io.Serializable; import java.util.EnumSet; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Address.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Address.java index f09271d1e8..e716954fce 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Address.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.namingstrategy.complete; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Customer.java index a23459ae59..c5211a9e76 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Customer.java @@ -8,16 +8,16 @@ package org.hibernate.test.namingstrategy.complete; import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Version; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Industry.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Industry.java index b8648e0312..6a116e941f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Industry.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Industry.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.namingstrategy.complete; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Order.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Order.java index 379ee6f894..0d22378c48 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/Order.java @@ -7,14 +7,14 @@ package org.hibernate.test.namingstrategy.complete; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/ZipCode.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/ZipCode.java index 58272b09ce..6b895d5c6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/ZipCode.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/ZipCode.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.namingstrategy.complete; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java index 46a2abe9f9..68aab14977 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/ComponentNamingStrategyForJoinColumnTest.java @@ -8,16 +8,16 @@ package org.hibernate.test.namingstrategy.components; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Container.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Container.java index c6fb3a887c..f7fbcbfbf4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Container.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Container.java @@ -7,9 +7,9 @@ package org.hibernate.test.namingstrategy.components; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Item.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Item.java index 808283acf6..ae8ded0cc7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/Item.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.namingstrategy.components; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/ejb3joincolumn/Language.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/ejb3joincolumn/Language.java index a4f4db7b3d..cb26d31ce2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/ejb3joincolumn/Language.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/ejb3joincolumn/Language.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.namingstrategy.ejb3joincolumn; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Anton Wimmer diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/synchronizedTables/DynamicEntity.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/synchronizedTables/DynamicEntity.java index ab32e339b4..d361d976e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/synchronizedTables/DynamicEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/synchronizedTables/DynamicEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.namingstrategy.synchronizedTables; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Synchronize; diff --git a/hibernate-core/src/test/java/org/hibernate/test/notfound/EagerProxyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/test/notfound/EagerProxyNotFoundTest.java index 3cce64eeb2..dc21b96cf5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/notfound/EagerProxyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/notfound/EagerProxyNotFoundTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.test.notfound; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.EntityNotFoundException; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/Child.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Child.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/pagination/OraclePaginationWithLocksTest.java b/hibernate-core/src/test/java/org/hibernate/test/pagination/OraclePaginationWithLocksTest.java index f84f7424ae..514680cdb4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/pagination/OraclePaginationWithLocksTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/pagination/OraclePaginationWithLocksTest.java @@ -1,11 +1,11 @@ package org.hibernate.test.pagination; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java index 1adee132c7..af169ce56f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java @@ -20,14 +20,14 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.AbstractHANADialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java index 1ae81b54fe..0f4a88b040 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java @@ -16,9 +16,9 @@ import java.time.ZoneOffset; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; -import javax.persistence.EntityManager; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.MySQL5Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java index 071d57e411..7de27ceaf3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java @@ -17,14 +17,14 @@ import java.sql.Types; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.Oracle8iDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/Person.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/Person.java index 703b909419..a457d6ba5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/Person.java @@ -9,19 +9,19 @@ package org.hibernate.test.procedure; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; import org.hibernate.annotations.NamedNativeQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/Phone.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/Phone.java index 4fdcdf2211..4d6459f8d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/Phone.java @@ -9,12 +9,12 @@ package org.hibernate.test.procedure; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java index 242bf4eb8d..e4b5094c85 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java @@ -16,8 +16,8 @@ import java.sql.Types; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java index 8957bbcb3c..11b8e12695 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java @@ -15,9 +15,9 @@ import java.sql.Types; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.Collections; -import javax.persistence.EntityManager; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java index c0e9eab61d..49c1bdde9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java @@ -7,8 +7,8 @@ package org.hibernate.test.procedure; import java.sql.SQLException; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java index f3e66fd070..acf24abb5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java @@ -16,9 +16,9 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; import java.util.regex.Pattern; -import javax.persistence.EntityManager; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.SQLServer2012Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/StoredProcedureParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/StoredProcedureParameterTypeTest.java index 2cc25ecbe9..da4bb97572 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/StoredProcedureParameterTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/StoredProcedureParameterTypeTest.java @@ -25,7 +25,7 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; import java.util.UUID; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import javax.sql.rowset.serial.SerialBlob; import javax.sql.rowset.serial.SerialClob; @@ -427,4 +427,4 @@ public class StoredProcedureParameterTypeTest { } ); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/Vote.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/Vote.java index 8fb8e56f75..01de227407 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/Vote.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/Vote.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.procedure; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java index 3fdda8ef54..93ced12ebd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.propertyref.inheritence.joined; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/proxy/MissingSetterWithEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/MissingSetterWithEnhancementTest.java index 88ae5ba120..030ccf1763 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/proxy/MissingSetterWithEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/proxy/MissingSetterWithEnhancementTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.proxy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.MappingException; import org.hibernate.SessionFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/test/proxy/ProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/ProxyTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java index 5822782f52..48ac917bf3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java @@ -10,12 +10,6 @@ import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; import org.hibernate.CacheMode; import org.hibernate.Hibernate; @@ -47,6 +41,13 @@ import org.hibernate.testing.FailureExpected; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/queryhint/OracleQueryHintTest.java b/hibernate-core/src/test/java/org/hibernate/test/queryhint/OracleQueryHintTest.java index 103a05339d..229e4bdb76 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/queryhint/OracleQueryHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/queryhint/OracleQueryHintTest.java @@ -8,15 +8,15 @@ package org.hibernate.test.queryhint; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.Oracle8iDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java index 45ebf6b98d..54b23ee869 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintHANATest.java @@ -14,16 +14,16 @@ import static org.junit.Assert.assertThat; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.AbstractHANADialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintSQLServer2012Test.java b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintSQLServer2012Test.java index a476e3e5b9..8a56b1b03f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintSQLServer2012Test.java +++ b/hibernate-core/src/test/java/org/hibernate/test/queryhint/QueryHintSQLServer2012Test.java @@ -8,15 +8,15 @@ package org.hibernate.test.queryhint; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.query.Query; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/Course.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Course.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/Student.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Student.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java b/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java index b40cb459ac..31bd1b6bf8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.replicate; -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; import org.hibernate.ReplicationMode; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/rowid/Point.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/rowid/Point.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/rowid/Point.java b/hibernate-core/src/test/java/org/hibernate/test/rowid/Point.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdTest.java index b7949d82bb..25ff4112e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdTest.java @@ -8,8 +8,8 @@ package org.hibernate.test.rowid; import java.math.BigDecimal; import java.sql.Statement; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdType.java b/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdType.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/scalar/NationalizedScalarQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/scalar/NationalizedScalarQueryTest.java index 60e395d3a4..4712571e65 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/scalar/NationalizedScalarQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/scalar/NationalizedScalarQueryTest.java @@ -7,10 +7,10 @@ package org.hibernate.test.scalar; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.SQLServer2008Dialect; @@ -89,4 +89,4 @@ public class NationalizedScalarQueryTest extends BaseCoreFunctionalTestCase { } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java b/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java index f2876f1c9f..0e3decc636 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java +++ b/hibernate-core/src/test/java/org/hibernate/test/sql/NativeQueryScrollableResults.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/refcursor/NumValue.java b/hibernate-core/src/test/java/org/hibernate/test/sql/refcursor/NumValue.java index 5b23f34638..340559a90a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/sql/refcursor/NumValue.java +++ b/hibernate-core/src/test/java/org/hibernate/test/sql/refcursor/NumValue.java @@ -7,13 +7,13 @@ package org.hibernate.test.sql.refcursor; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.QueryHint; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Table; @Entity @Table(name = "BOT_NUMVALUE") diff --git a/hibernate-core/src/test/java/org/hibernate/test/stats/ExplicitQueryStatsMaxSizeTest.java b/hibernate-core/src/test/java/org/hibernate/test/stats/ExplicitQueryStatsMaxSizeTest.java index 20bc99d3db..e937004108 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/stats/ExplicitQueryStatsMaxSizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/stats/ExplicitQueryStatsMaxSizeTest.java @@ -7,7 +7,7 @@ package org.hibernate.test.stats; import java.util.Map; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java b/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java index 533d69fc2c..4fb717db61 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java @@ -10,9 +10,9 @@ import java.lang.reflect.Field; import java.util.HashSet; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java b/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java index 79adf7b421..5f26d6e2cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java @@ -8,13 +8,13 @@ package org.hibernate.test.stream.basic; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/test/stream/basic/JpaStreamTest.java b/hibernate-core/src/test/java/org/hibernate/test/stream/basic/JpaStreamTest.java index dc7f72e176..ab8dc42824 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/stream/basic/JpaStreamTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/stream/basic/JpaStreamTest.java @@ -17,9 +17,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Employee.java index a066f7ab3b..873f11fb2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Employee.java @@ -7,7 +7,7 @@ // $Id: Employee.java 5899 2005-02-24 20:08:04Z steveebersole $ package org.hibernate.test.subclassfilter; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subquery/EntityA.java b/hibernate-core/src/test/java/org/hibernate/test/subquery/EntityA.java index 79b30b6271..c3da0f5fea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subquery/EntityA.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subquery/EntityA.java @@ -9,7 +9,7 @@ package org.hibernate.test.subquery; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EntityA { @@ -41,4 +41,4 @@ public class EntityA { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/subquery/SubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/subquery/SubqueryTest.java index fec5883746..f17df4ff0c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subquery/SubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subquery/SubqueryTest.java @@ -23,7 +23,7 @@ import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.type.Type; import org.junit.Test; -import javax.persistence.Query; +import jakarta.persistence.Query; import java.util.List; import java.util.function.Consumer; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/Alien.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/Alien.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/Being.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/Being.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/Employee.java index 643ccacf14..e01e583bdd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subselect/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselect/Employee.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.subselect; -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 Employee { diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroup.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroup.java index 2465e4a8ee..c123b677da 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroup.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroup.java @@ -9,10 +9,10 @@ package org.hibernate.test.subselect; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroupId.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroupId.java index 0e9fe76bb9..2d11405011 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroupId.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselect/EmployeeGroupId.java @@ -8,7 +8,7 @@ package org.hibernate.test.subselect; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmployeeGroupId diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/Human.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/Human.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/SubselectTest.java old mode 100755 new mode 100644 index 6efb1cb1c3..ccbe71c4f0 --- a/hibernate-core/src/test/java/org/hibernate/test/subselect/SubselectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselect/SubselectTest.java @@ -8,9 +8,9 @@ package org.hibernate.test.subselect; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Child.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Child.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Parent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchCollectionFromBatchTest.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchCollectionFromBatchTest.java index 82e3cdca7a..965a6e09e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchCollectionFromBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchCollectionFromBatchTest.java @@ -25,15 +25,15 @@ package org.hibernate.test.subselectfetch; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java old mode 100755 new mode 100644 index 0fb7b7b32b..efc5a09217 --- a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java @@ -7,11 +7,11 @@ package org.hibernate.test.subselectfetch; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTest.java index 9b818c5411..a2d208ea23 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTest.java @@ -8,8 +8,8 @@ package org.hibernate.test.subselectfetch; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTransactSqlTest.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTransactSqlTest.java index 3deaac8494..f1f362b5a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTransactSqlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchWithFormulaTransactSqlTest.java @@ -7,8 +7,8 @@ package org.hibernate.test.subselectfetch; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampFspFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampFspFunctionTest.java index e7afb6b933..df672a3b7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampFspFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampFspFunctionTest.java @@ -8,9 +8,9 @@ package org.hibernate.test.temporal; import java.sql.Timestamp; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.junit.Test; @@ -76,7 +76,7 @@ public class MySQL57TimestampFspFunctionTest extends BaseCoreFunctionalTestCase } // If MySQL supported something like Oracle's "dual", then this entity wouldn't be needed. - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name = "DummyEntity") public static class Entity { @GeneratedValue diff --git a/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampPropertyTest.java index 4ee00bf5f7..620c191945 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/temporal/MySQL57TimestampPropertyTest.java @@ -9,11 +9,11 @@ package org.hibernate.test.temporal; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.query.Query; import org.hibernate.Session; @@ -184,7 +184,7 @@ public class MySQL57TimestampPropertyTest extends BaseCoreFunctionalTestCase { return new Class[] { Entity.class }; } - @javax.persistence.Entity(name = "Entity") + @jakarta.persistence.Entity(name = "Entity") public static class Entity { @GeneratedValue @Id diff --git a/hibernate-core/src/test/java/org/hibernate/test/temporal/TimePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/test/temporal/TimePropertyTest.java index 745c42b208..ef24d12e5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/temporal/TimePropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/temporal/TimePropertyTest.java @@ -10,11 +10,11 @@ import java.sql.Time; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.junit.Test; @@ -99,7 +99,7 @@ public class TimePropertyTest extends BaseCoreFunctionalTestCase { return new Class[] { Entity.class }; } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name = "entity") public static class Entity { @GeneratedValue diff --git a/hibernate-core/src/test/java/org/hibernate/test/temporal/TimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/test/temporal/TimestampPropertyTest.java index 6a27b1f9a1..093168cb20 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/temporal/TimestampPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/temporal/TimestampPropertyTest.java @@ -9,12 +9,12 @@ package org.hibernate.test.temporal; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.junit.Test; @@ -142,7 +142,7 @@ public class TimestampPropertyTest extends BaseCoreFunctionalTestCase { return new Class[] { Entity.class }; } - @javax.persistence.Entity + @jakarta.persistence.Entity @Table(name = "MyEntity") public static class Entity { @GeneratedValue diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java b/hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java b/hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java index d6e3f84bf5..6e29fdec9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java @@ -17,8 +17,8 @@ import java.util.Calendar; import java.util.Map; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.MySQL5Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java index 3362b00ce5..a6359efad1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java @@ -11,8 +11,8 @@ import java.sql.SQLException; import java.sql.Time; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java index 814ecb5b62..aa040894b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java @@ -14,8 +14,8 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Map; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.MySQL5Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java index 40f9582f4c..8aaba899a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java @@ -14,8 +14,8 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Map; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.MySQL5Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDSTWithUTCTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDSTWithUTCTest.java index c63985a28f..42516594af 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDSTWithUTCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDSTWithUTCTest.java @@ -14,8 +14,8 @@ import java.time.LocalTime; import java.util.GregorianCalendar; import java.util.Map; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.MySQL5Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java index a1026cb756..14bd2c585a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java @@ -10,8 +10,8 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java index f85b6aaab3..de9055e83c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java @@ -12,8 +12,8 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.CockroachDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/LocalDateCustomSessionLevelTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/LocalDateCustomSessionLevelTimeZoneTest.java index 050149e7e5..c1efa79589 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/LocalDateCustomSessionLevelTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/LocalDateCustomSessionLevelTimeZoneTest.java @@ -9,8 +9,8 @@ package org.hibernate.test.timestamp; import java.time.LocalDate; import java.util.Map; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.MySQL5Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/Person.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/TimestampTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/timestamp/User.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/User.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/User.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/tm/CMTTest.java b/hibernate-core/src/test/java/org/hibernate/test/tm/CMTTest.java index 28faa71e18..9857387840 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tm/CMTTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/tm/CMTTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.tm; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.transaction.Transaction; +import jakarta.transaction.Transaction; import org.hibernate.ConnectionReleaseMode; import org.hibernate.EntityMode; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tm/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/tm/Item.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/BigDecimalTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/BigDecimalTypeTest.java index 1f3ebb2f93..9c6dac54b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/BigDecimalTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/BigDecimalTypeTest.java @@ -16,13 +16,13 @@ import org.junit.Test; import static org.junit.Assert.fail; import java.math.BigDecimal; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; /** * @author Ales Justin diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/BinaryTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/BinaryTypeTest.java index d06f10794e..3b4107dd38 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/BinaryTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/BinaryTypeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.resource.transaction.spi.TransactionStatus; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/InstantTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/InstantTest.java index f1d159b8b0..edb91a849d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/InstantTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/InstantTest.java @@ -17,10 +17,10 @@ import java.time.ZoneId; import java.time.ZoneOffset; import java.util.Arrays; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.MariaDBDialect; import org.hibernate.dialect.MySQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/Java8DateTimeTests.java b/hibernate-core/src/test/java/org/hibernate/test/type/Java8DateTimeTests.java index d1a5428872..d9f8d54cc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/Java8DateTimeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/Java8DateTimeTests.java @@ -16,10 +16,10 @@ import java.time.OffsetTime; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; import java.util.Iterator; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/LobUnfetchedPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/LobUnfetchedPropertyTest.java index 092e268d47..ec9f85b1b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/LobUnfetchedPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/LobUnfetchedPropertyTest.java @@ -18,13 +18,13 @@ import java.sql.NClob; import java.sql.SQLException; import java.util.Arrays; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.Hibernate; import org.hibernate.annotations.Cache; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTest.java index c41dbcf093..87b3857a2c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTest.java @@ -16,10 +16,10 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.Arrays; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.MariaDBDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTimeTest.java index 03e3cf0c5c..e62eea9689 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTimeTest.java @@ -14,10 +14,10 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Arrays; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.MariaDBDialect; import org.hibernate.dialect.MySQLDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java index 918541aac9..93336bf0d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java @@ -17,10 +17,10 @@ import java.time.ZoneId; import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.MariaDBDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java index dfbdaf31f6..b7e6f71e0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java @@ -9,10 +9,10 @@ package org.hibernate.test.type; import java.io.Serializable; import java.util.Arrays; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.model.TypeContributions; import org.hibernate.boot.model.TypeContributor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/OffsetDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/OffsetDateTimeTest.java index 885e5090c8..2c52d365ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/OffsetDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/OffsetDateTimeTest.java @@ -17,10 +17,10 @@ import java.time.ZoneOffset; import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.query.Query; import org.hibernate.dialect.MariaDBDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java index e5ade72e2d..6969a6b961 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java @@ -19,10 +19,10 @@ import java.time.ZoneOffset; import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.MariaDBDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/OracleLongLobTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/OracleLongLobTypeTest.java index 22dc40af6b..3bdbeabaff 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/OracleLongLobTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/OracleLongLobTypeTest.java @@ -8,9 +8,9 @@ package org.hibernate.test.type; import java.sql.Blob; import java.sql.Clob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/SQLServer2008NVarCharTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/SQLServer2008NVarCharTypeTest.java index d440be8360..da4173f725 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/SQLServer2008NVarCharTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/SQLServer2008NVarCharTypeTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.EnumSet; import org.hibernate.annotations.Nationalized; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java index 39c4795545..062253f054 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.type; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/TimeAndTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/TimeAndTimestampTest.java index 4027501816..5a95470e2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/TimeAndTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/TimeAndTimestampTest.java @@ -9,8 +9,8 @@ package org.hibernate.test.type; import java.sql.Time; import java.sql.Timestamp; import java.util.concurrent.TimeUnit; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.MariaDBDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/ZonedDateTimeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/ZonedDateTimeTest.java index 4715656582..68cd22587d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/ZonedDateTimeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/ZonedDateTimeTest.java @@ -17,10 +17,10 @@ import java.time.ZonedDateTime; import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.query.Query; import org.hibernate.dialect.MariaDBDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Address.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/AddressId.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/AddressId.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Address.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Address.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/AddressId.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/AddressId.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/java/org/hibernate/test/uniquekey/NaturalIdCachingTest.java b/hibernate-core/src/test/java/org/hibernate/test/uniquekey/NaturalIdCachingTest.java index 817493745e..bfe34da3bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/uniquekey/NaturalIdCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/uniquekey/NaturalIdCachingTest.java @@ -7,12 +7,12 @@ package org.hibernate.test.uniquekey; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; import static org.hamcrest.CoreMatchers.is; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; @@ -109,4 +109,4 @@ public class NaturalIdCachingTest extends BaseCoreFunctionalTestCase { this.item = item; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java index c6193f76c8..b8d3516156 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java @@ -12,8 +12,8 @@ import java.io.InputStream; import java.io.Serializable; import java.net.URL; import java.util.Enumeration; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.internal.util.ConfigHelper; diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/ops/Node.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/ops/Node.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/subselectfetch/ParentChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/subselectfetch/ParentChild.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ChildEntity.java b/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ChildEntity.java index 139f4593ff..5bcd13ea43 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ChildEntity.java +++ b/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ChildEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.id.hhh14407; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; /** * @author Sönke Reimer diff --git a/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ParentEntity.java b/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ParentEntity.java index 534dcd0965..fb67803a06 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ParentEntity.java +++ b/hibernate-core/src/test_legacy/org/hibernate/id/hhh14407/ParentEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.id.hhh14407; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Version; /** * @author Sönke Reimer diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/criteria/paths/EntityModeMapJoinsTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/criteria/paths/EntityModeMapJoinsTest.java index 591b38ed52..f856f0734d 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/criteria/paths/EntityModeMapJoinsTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/criteria/paths/EntityModeMapJoinsTest.java @@ -8,12 +8,12 @@ package org.hibernate.jpa.test.criteria.paths; import java.util.Map; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.JoinType; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Bindable; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/AbstractStoredProcedureTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/AbstractStoredProcedureTest.java index 64358e2f53..0692a04f22 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/AbstractStoredProcedureTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/AbstractStoredProcedureTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.test.procedure; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; @@ -38,13 +38,13 @@ public abstract class AbstractStoredProcedureTest extends BaseEntityManagerFunct assertEquals( 2, list.size() ); NamedCallableQueryMementoImpl.ParameterMemento memento = list.get( 0 ); assertEquals( "p11", memento.getName() ); - assertEquals( javax.persistence.ParameterMode.IN, memento.getMode() ); + assertEquals( jakarta.persistence.ParameterMode.IN, memento.getMode() ); assertEquals( IntegerType.INSTANCE, memento.getHibernateType() ); assertEquals( Integer.class, memento.getType() ); memento = list.get( 1 ); assertEquals( "p12", memento.getName() ); - assertEquals( javax.persistence.ParameterMode.IN, memento.getMode() ); + assertEquals( jakarta.persistence.ParameterMode.IN, memento.getMode() ); assertEquals( IntegerType.INSTANCE, memento.getHibernateType() ); assertEquals( Integer.class, memento.getType() ); @@ -59,13 +59,13 @@ public abstract class AbstractStoredProcedureTest extends BaseEntityManagerFunct memento = list.get( 0 ); assertEquals( Integer.valueOf( 1 ), memento.getPosition() ); - assertEquals( javax.persistence.ParameterMode.INOUT, memento.getMode() ); + assertEquals( jakarta.persistence.ParameterMode.INOUT, memento.getMode() ); assertEquals( StringType.INSTANCE, memento.getHibernateType() ); assertEquals( String.class, memento.getType() ); memento = list.get( 1 ); assertEquals( Integer.valueOf( 2 ), memento.getPosition() ); - assertEquals( javax.persistence.ParameterMode.INOUT, memento.getMode() ); + assertEquals( jakarta.persistence.ParameterMode.INOUT, memento.getMode() ); assertEquals( LongType.INSTANCE, memento.getHibernateType() ); assertEquals( Long.class, memento.getType() ); diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/DateTimeParameterTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/DateTimeParameterTest.java index 335ddbef43..c8ac98cccd 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/DateTimeParameterTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/DateTimeParameterTest.java @@ -20,15 +20,15 @@ import java.util.GregorianCalendar; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.DerbyTenSevenDialect; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/H2StoreProcedureTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/H2StoreProcedureTest.java index 1054182586..f2dc746076 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/H2StoreProcedureTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/H2StoreProcedureTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.jpa.test.procedure; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/HSQLStoreProcedureTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/HSQLStoreProcedureTest.java index 5819e0146d..d2fb823934 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/HSQLStoreProcedureTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/HSQLStoreProcedureTest.java @@ -6,18 +6,18 @@ */ package org.hibernate.jpa.test.procedure; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/JpaTckUsageTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/JpaTckUsageTest.java index 4aee30970c..24b2ebe685 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/JpaTckUsageTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/JpaTckUsageTest.java @@ -16,8 +16,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.dialect.DerbyTenSevenDialect; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByNameTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByNameTest.java index e1c9c2beb4..79adbb86b5 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByNameTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByNameTest.java @@ -9,17 +9,17 @@ package org.hibernate.jpa.test.procedure; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByPositionTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByPositionTest.java index 5f8b89d3f5..72dbf02f4f 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByPositionTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureOutParameterByPositionTest.java @@ -9,17 +9,17 @@ package org.hibernate.jpa.test.procedure; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByNameTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByNameTest.java index 046b8ca5c1..f253b27643 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByNameTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByNameTest.java @@ -9,16 +9,16 @@ package org.hibernate.jpa.test.procedure; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java index c190790216..c5f4dff619 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoreProcedureRefCursorOutParameterByPositionTest.java @@ -9,16 +9,16 @@ package org.hibernate.jpa.test.procedure; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureNullParameterByNameTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureNullParameterByNameTest.java index 75e0184b99..06e995f94c 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureNullParameterByNameTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureNullParameterByNameTest.java @@ -10,17 +10,17 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureResultSetMappingTest.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureResultSetMappingTest.java index bce223a2a7..913be5d684 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureResultSetMappingTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/StoredProcedureResultSetMappingTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.jpa.test.procedure; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import java.sql.Connection; import java.sql.SQLException; import java.util.Date; diff --git a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/User.java b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/User.java index 6257674b2a..c914b33ac5 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/User.java +++ b/hibernate-core/src/test_legacy/org/hibernate/jpa/test/procedure/User.java @@ -6,16 +6,16 @@ */ package org.hibernate.jpa.test.procedure; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.Table; /** * @author Strong Liu diff --git a/hibernate-core/src/test_legacy/org/hibernate/query/criteria/internal/AliasWithCriterionTest.java b/hibernate-core/src/test_legacy/org/hibernate/query/criteria/internal/AliasWithCriterionTest.java index 5f2d35f06b..cc27b94fa3 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/query/criteria/internal/AliasWithCriterionTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/query/criteria/internal/AliasWithCriterionTest.java @@ -8,14 +8,14 @@ package org.hibernate.query.criteria.internal; import java.util.Date; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.criterion.CriteriaSpecification; import org.hibernate.criterion.Criterion; @@ -237,4 +237,4 @@ public class AliasWithCriterionTest extends BaseCoreFunctionalTestCase { this.tableB = tableB; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java index e7b285af7f..4e2121fc28 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.fail; /** - * Tests verifying the correct behaviour for the usage of {@code @javax.persistence.Access}. + * Tests verifying the correct behaviour for the usage of {@code @jakarta.persistence.Access}. * * @author Hardy Ferentschik */ diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkCompositeIdTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkCompositeIdTest.java index a3c4d5138f..a7d5c2e788 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkCompositeIdTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkCompositeIdTest.java @@ -2,10 +2,10 @@ package org.hibernate.test.bulkid; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; @@ -210,4 +210,4 @@ public abstract class AbstractBulkCompositeIdTest extends BaseCoreFunctionalTest //tag::batch-bulk-hql-temp-table-sub-classes-example[] } //end::batch-bulk-hql-temp-table-sub-classes-example[] -} \ No newline at end of file +} diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkIdTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkIdTest.java index 76b74adb9d..cfc914d560 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkIdTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/AbstractBulkIdTest.java @@ -1,10 +1,10 @@ package org.hibernate.test.bulkid; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; @@ -164,4 +164,4 @@ public abstract class AbstractBulkIdTest extends BaseCoreFunctionalTestCase { } //end::batch-bulk-hql-temp-table-sub-classes-example[] -} \ No newline at end of file +} diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java index c436ccc86e..d923df63d2 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/bulkid/GlobalQuotedIdentifiersBulkIdTest.java @@ -4,13 +4,13 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.Date; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; @@ -154,4 +154,4 @@ public class GlobalQuotedIdentifiersBulkIdTest this.fellow = fellow; } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/cid/CompositeIdCountEntityTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/cid/CompositeIdCountEntityTest.java index 8f1a377f4b..3d6ee4fa31 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/cid/CompositeIdCountEntityTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/cid/CompositeIdCountEntityTest.java @@ -8,7 +8,7 @@ package org.hibernate.test.cid; import java.util.Calendar; import java.util.Collections; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Session; import org.hibernate.dialect.Oracle8iDialect; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Bid.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Bid.java index 5b3b0adc3c..ea80bc2377 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Bid.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Bid.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.criteria; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.io.Serializable; /** diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Course.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Course.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/CriteriaAliasFetchTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/CriteriaAliasFetchTest.java index 66eab367a3..b848df6316 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/CriteriaAliasFetchTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/CriteriaAliasFetchTest.java @@ -12,11 +12,11 @@ import static org.junit.Assert.assertNotNull; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.FetchMode; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/CriteriaQueryTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/CriteriaQueryTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Enrolment.hbm.xml b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Enrolment.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Enrolment.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Enrolment.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Foo.hbm.xml b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Foo.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Item.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Item.java index 98318c428c..c8093ab347 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Item.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Item.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.criteria; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/ListActionRole.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/ListActionRole.java index 03dfe25357..bd145f6a79 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/ListActionRole.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/ListActionRole.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.criteria; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Strong Liu diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/NationalizedIgnoreCaseTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/NationalizedIgnoreCaseTest.java index 9d2e501343..7718bef7ab 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/NationalizedIgnoreCaseTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/NationalizedIgnoreCaseTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.criteria; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.criterion.Restrictions; @@ -91,4 +91,4 @@ public class NationalizedIgnoreCaseTest extends BaseCoreFunctionalTestCase { } } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Role.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Role.java index 623429f7ee..70fca2803f 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Role.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Role.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.criteria; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Strong Liu diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/SessionCreateQueryFromCriteriaTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/SessionCreateQueryFromCriteriaTest.java index 0bf6bc8574..e11f763ffd 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/SessionCreateQueryFromCriteriaTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/SessionCreateQueryFromCriteriaTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.criteria; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.util.Optional; import java.util.stream.Stream; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Student.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/Student.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/VersionedRecord.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/VersionedRecord.java index 38bcb24200..fae5c51508 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/VersionedRecord.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/VersionedRecord.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.criteria; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Strong Liu diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/Country.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/Country.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/Person.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/Person.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/UsState.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/UsState.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/domain.hbm.xml b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/domain.hbm.xml old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Customer.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Customer.java index 93789d8dd3..93f3d1bd10 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Customer.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Customer.java @@ -8,10 +8,10 @@ package org.hibernate.test.criteria.many_to_many; 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; /** * @author Janario Oliveira @@ -52,4 +52,4 @@ public class Customer { public int hashCode() { return name.hashCode(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Seller.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Seller.java index 44e3f11ab7..24a4b51bbf 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Seller.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/many_to_many/Seller.java @@ -8,12 +8,12 @@ package org.hibernate.test.criteria.many_to_many; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; /** * @author Janario Oliveira @@ -61,4 +61,4 @@ public class Seller { public int hashCode() { return name.hashCode(); } -} \ No newline at end of file +} diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java index 3f833006a5..b21aeff564 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java @@ -8,15 +8,15 @@ package org.hibernate.test.criteria.mapsid; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.validation.constraints.NotNull; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java index 365c044077..75cadec897 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.hql; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collections; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/hql/EJBQLTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/hql/EJBQLTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/hql/HibernateFirstResultMaxResultsTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/hql/HibernateFirstResultMaxResultsTest.java index d97fde3d98..4123cd7f20 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/hql/HibernateFirstResultMaxResultsTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/hql/HibernateFirstResultMaxResultsTest.java @@ -7,8 +7,8 @@ package org.hibernate.test.hql; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/hql/QuerySplitterTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/hql/QuerySplitterTest.java index 2714c9a484..bcb071045f 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/hql/QuerySplitterTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/hql/QuerySplitterTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.hql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.query.hql.internal.QuerySplitter; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/hql/TupleSupportTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/hql/TupleSupportTest.java index 775c9afe7d..56042627a5 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/hql/TupleSupportTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/hql/TupleSupportTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.hql; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Collections; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/idprops/CriteriaIdPropertyReferencesTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/idprops/CriteriaIdPropertyReferencesTest.java index 1d575dbbfb..7e3261fff1 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/idprops/CriteriaIdPropertyReferencesTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/idprops/CriteriaIdPropertyReferencesTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.idprops; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import org.junit.Test; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/iterate/IterateTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/iterate/IterateTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/jpa/compliance/tck2_2/OrderByAnnotationTests.java b/hibernate-core/src/test_legacy/org/hibernate/test/jpa/compliance/tck2_2/OrderByAnnotationTests.java index afcf66bd92..c0212cde47 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/jpa/compliance/tck2_2/OrderByAnnotationTests.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/jpa/compliance/tck2_2/OrderByAnnotationTests.java @@ -7,12 +7,12 @@ package org.hibernate.test.jpa.compliance.tck2_2; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.boot.MetadataSources; import org.hibernate.cfg.annotations.CollectionBinder; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeAttributeResultSetProcessorTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeAttributeResultSetProcessorTest.java index 3eff3fb251..5fb38bd2d8 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeAttributeResultSetProcessorTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeAttributeResultSetProcessorTest.java @@ -6,18 +6,18 @@ */ package org.hibernate.test.loadplans.process; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Connection; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeIdResultSetProcessorTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeIdResultSetProcessorTest.java index cc23aeb278..fdf25cf649 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeIdResultSetProcessorTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EncapsulatedCompositeIdResultSetProcessorTest.java @@ -13,11 +13,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.LockOptions; import org.hibernate.Session; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityAssociationResultSetProcessorTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityAssociationResultSetProcessorTest.java index 23da8a9c06..c74c46663e 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityAssociationResultSetProcessorTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityAssociationResultSetProcessorTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.test.loadplans.process; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyCollectionResultSetProcessorTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyCollectionResultSetProcessorTest.java index 3e3911150b..56cd70ab32 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyCollectionResultSetProcessorTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyCollectionResultSetProcessorTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.loadplans.process; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManyListResultSetProcessorTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManyListResultSetProcessorTest.java index 1f1c3d61c8..c409c91369 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManyListResultSetProcessorTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManyListResultSetProcessorTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.loadplans.process; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManySetResultSetProcessorTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManySetResultSetProcessorTest.java index ed5ec4fb95..a246d13557 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManySetResultSetProcessorTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/EntityWithNonLazyOneToManySetResultSetProcessorTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.test.loadplans.process; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/SimpleResultSetProcessorTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/SimpleResultSetProcessorTest.java index ef197200a3..e882e1fe93 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/SimpleResultSetProcessorTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/SimpleResultSetProcessorTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.loadplans.process; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Contractor.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Contractor.java index cde5dcddc7..161f8c1cee 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Contractor.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Contractor.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.loadplans.process.inheritance; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Department.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Department.java index 2aa9e53dca..9db3a44e02 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Department.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Department.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.loadplans.process.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Employee.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Employee.java index 7884f33d8f..fc83cec400 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Employee.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/Employee.java @@ -6,8 +6,8 @@ */ package org.hibernate.test.loadplans.process.inheritance; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/User.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/User.java index e4ab1a9938..aedb10c5b2 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/User.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/process/inheritance/User.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.loadplans.process.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/walking/BasicWalkingTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/walking/BasicWalkingTest.java index 1ac0274b08..e7e0b9df3f 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/walking/BasicWalkingTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/loadplans/walking/BasicWalkingTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.test.loadplans.walking; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/locale/IAmAFoo.java b/hibernate-core/src/test_legacy/org/hibernate/test/locale/IAmAFoo.java index 170ad1f155..27cecf6a4d 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/locale/IAmAFoo.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/locale/IAmAFoo.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.locale; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Brett Meyer diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/sql/NativeQueryDoesNotSupportIterationTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/sql/NativeQueryDoesNotSupportIterationTest.java index 942209a246..1b3f9ae7b6 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/sql/NativeQueryDoesNotSupportIterationTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/sql/NativeQueryDoesNotSupportIterationTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.query.NativeQuery; diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/sql/storedproc/StoredProcedureParameterRegistrationTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/sql/storedproc/StoredProcedureParameterRegistrationTest.java index f162186691..9fd2f13a42 100644 --- a/hibernate-core/src/test_legacy/org/hibernate/test/sql/storedproc/StoredProcedureParameterRegistrationTest.java +++ b/hibernate-core/src/test_legacy/org/hibernate/test/sql/storedproc/StoredProcedureParameterRegistrationTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.sql.storedproc; import java.util.List; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.JDBCException; import org.hibernate.Session; diff --git a/hibernate-envers-jakarta/hibernate-envers-jakarta.gradle b/hibernate-envers-jakarta/hibernate-envers-jakarta.gradle deleted file mode 100644 index c8da4a6b22..0000000000 --- a/hibernate-envers-jakarta/hibernate-envers-jakarta.gradle +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -description = 'Hibernate\'s entity version (audit/history) support Jakarta edition' - -apply from: rootProject.file( 'gradle/published-jakarta-java-module.gradle' ) - -evaluationDependsOn( ':hibernate-envers' ) -evaluationDependsOn( ':hibernate-transaction-client' ) - -dependencies { - api project( ':hibernate-core-jakarta' ) - - testImplementation( project( ':hibernate-envers-jakarta' ) ) - testImplementation( project( ':hibernate-testing-jakarta' ) ) -} - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// main jar - -//tasks.jar { -// enabled false -//} -// -//task jakartafyJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-envers').tasks.jar.archiveFile -// targetJar = tasks.jar.archiveFile -//} -// -//tasks.jar.dependsOn project(':hibernate-envers').tasks.jar -//tasks.jar.finalizedBy tasks.jakartafyJar -//tasks.jakartafyJar.dependsOn tasks.jar -//tasks.jakartafyJar.mustRunAfter tasks.jar - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// javadoc jar - -//tasks.javadocJar { -// enabled false -//} -// -//task jakartafyJavadocJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-envers').tasks.javadocJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.javadocJar.dependsOn project(':hibernate-envers').tasks.javadocJar -//tasks.javadocJar.finalizedBy tasks.jakartafyJavadocJar -//tasks.jakartafyJavadocJar.dependsOn tasks.javadocJar -//tasks.jakartafyJavadocJar.mustRunAfter tasks.javadocJar - - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// sources jar - -//tasks.sourcesJar { -// enabled false -//} -// -//task jakartafySourcesJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-envers').tasks.sourcesJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.sourcesJar.dependsOn project(':hibernate-envers').tasks.sourcesJar -//tasks.sourcesJar.finalizedBy tasks.jakartafySourcesJar -//tasks.jakartafySourcesJar.dependsOn tasks.sourcesJar -//tasks.jakartafySourcesJar.mustRunAfter tasks.sourcesJar -// - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// testing - -//project.ext { -// testClassesUnpackTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/unpack/classes' ) -// testClassesTransformationTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/test/classes' ) -//} -// -//tasks.compileTestJava { -// enabled false -//} -// -//tasks.processTestResources { -// enabled false -//} -// -//task unpackTests(type: Copy) { -// from zipTree( project( ':hibernate-envers' ).tasks.testJar.archiveFile ) -// into project.testClassesUnpackTargetDirectory -//} -// -//task jakartafyTests(type: JakartaDirectoryTransformation) { -// sourceDirectory = project.testClassesUnpackTargetDirectory -// targetDirectory = project.testClassesTransformationTargetDirectory -//} -// -// -//tasks.compileTestJava.dependsOn tasks.unpackTests -//tasks.compileTestJava.finalizedBy tasks.jakartafyTests -// -//tasks.unpackTests.dependsOn project(':hibernate-envers').tasks.testJar -// -//tasks.jakartafyTests.dependsOn tasks.unpackTests - -tasks.test { - dependsOn tasks.jakartafyTests - testClassesDirs += project.files( tasks.jakartafyTests.targetDirectory ) - classpath += project.files( tasks.jakartafyTests.targetDirectory ) - - systemProperty 'file.encoding', 'utf-8' - - if ( gradle.ext.javaVersions.test.launcher.asInt() >= 9 ) { - // See org.hibernate.boot.model.naming.NamingHelperTest.DefaultCharset.set - jvmArgs( ['--add-opens', 'java.base/java.nio.charset=ALL-UNNAMED'] ) - // Weld needs this to generate proxies - jvmArgs( ['--add-opens', 'java.base/java.security=ALL-UNNAMED'] ) - jvmArgs( ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] ) - } -} - -tasks.test.dependsOn ':hibernate-transaction-client:jar' - -//task testJar(type: Jar, dependsOn: testClasses) { -// duplicatesStrategy = DuplicatesStrategy.EXCLUDE -// archiveClassifier.set( 'test' ) -// from sourceSets.test.output -//} -// -//artifacts { -// tests tasks.testJar -//} diff --git a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java index 254f8bf101..42dc2cfcae 100644 --- a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java +++ b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Address.java @@ -6,10 +6,10 @@ */ package org.hibernate.envers.demo; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java index ce7ac8e79c..7673f68d27 100644 --- a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java +++ b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/Person.java @@ -5,10 +5,10 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.envers.demo; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java index 791d19d5b7..6e744a70b1 100644 --- a/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java +++ b/hibernate-envers/src/demo/java/org/hibernate/envers/demo/TestConsole.java @@ -13,9 +13,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Scanner; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java index eb47c4599b..26c5661541 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditJoinTable.java @@ -10,7 +10,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.persistence.JoinColumn; +import jakarta.persistence.JoinColumn; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java index 521cc05f39..7495d22fd4 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditMappedBy.java @@ -37,7 +37,7 @@ public @interface AuditMappedBy { /** * Name of the property in the related entity which maps to the position column. Should be specified only * for indexed collection, when @{@link org.hibernate.annotations.IndexColumn} or - * {@link javax.persistence.OrderColumn} is used on the collection. The property should be mapped with + * {@link jakarta.persistence.OrderColumn} is used on the collection. The property should be mapped with * {@code @Column(insertable=false, updatable=false)}. */ String positionMappedBy() default ""; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java index 2e2dc716bf..c95d407a8a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverride.java @@ -17,16 +17,16 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * The {@code AuditingOverride} annotation is used to override the auditing - * behavior of a superclass or single property inherited from {@link javax.persistence.MappedSuperclass} + * behavior of a superclass or single property inherited from {@link jakarta.persistence.MappedSuperclass} * type, or attribute inside an embedded component. * * @author Erik-Berndt Scheper * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) * - * @see javax.persistence.Embedded - * @see javax.persistence.Embeddable - * @see javax.persistence.MappedSuperclass - * @see javax.persistence.AssociationOverride + * @see jakarta.persistence.Embedded + * @see jakarta.persistence.Embeddable + * @see jakarta.persistence.MappedSuperclass + * @see jakarta.persistence.AssociationOverride * @see AuditJoinTable */ @Target({TYPE, METHOD, FIELD}) @@ -37,7 +37,7 @@ public @interface AuditOverride { /** * Name of the field (or property) whose mapping is being overridden. Allows empty value if * {@link AuditOverride} is used to change auditing behavior of all attributes inherited from - * {@link javax.persistence.MappedSuperclass} type. + * {@link jakarta.persistence.MappedSuperclass} type. */ String name() default ""; @@ -55,7 +55,7 @@ public @interface AuditOverride { /** * Specifies class which field (or property) mapping is being overridden. Required if * {@link AuditOverride} is used to change auditing behavior of attributes inherited from - * {@link javax.persistence.MappedSuperclass} type. + * {@link jakarta.persistence.MappedSuperclass} type. */ Class forClass() default void.class; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java index 8322775412..4212b89d6b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditOverrides.java @@ -20,11 +20,11 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * component. * * @author Erik-Berndt Scheper - * @see javax.persistence.Embedded - * @see javax.persistence.Embeddable - * @see javax.persistence.MappedSuperclass - * @see javax.persistence.AssociationOverride - * @see javax.persistence.AssociationOverrides + * @see jakarta.persistence.Embedded + * @see jakarta.persistence.Embeddable + * @see jakarta.persistence.MappedSuperclass + * @see jakarta.persistence.AssociationOverride + * @see jakarta.persistence.AssociationOverrides * @see AuditJoinTable * @see AuditOverride */ diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java index 0aaf87f14f..387cb2a5f0 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReader.java @@ -224,7 +224,7 @@ public interface AuditReader { * @param The type of the revision entity to find * * @return The current revision entity, to which any entries in the audit tables will be bound. - * @deprecated (since 5.2), use {@link org.hibernate.envers.RevisionListener} instead. While this method is + * @deprecated (since 5.2), use {@link RevisionListener} instead. While this method is * being deprecated, expect a new API for this in 6.0. */ @Deprecated diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java index ab1855bcc3..62915a1197 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java @@ -6,7 +6,7 @@ */ package org.hibernate.envers; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java b/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java index 9cbcbc1671..80798ba0a3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/Audited.java @@ -60,7 +60,7 @@ public @interface Audited { boolean withModifiedFlag() default false; /** - * The column name of the modified field. Analogous to the name attribute of the @{@link javax.persistence.Column} + * The column name of the modified field. Analogous to the name attribute of the @{@link jakarta.persistence.Column} * annotation. Ignored if withModifiedFlag is false. */ String modifiedColumnName() default ""; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java index 38bf044dd5..a856238999 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java @@ -9,10 +9,10 @@ package org.hibernate.envers; import java.io.Serializable; import java.text.DateFormat; import java.util.Date; -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; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java index 8a57b17eaa..9a822fc311 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java @@ -8,12 +8,12 @@ package org.hibernate.envers; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java index 837b34387a..05f3ce0ee2 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java @@ -8,7 +8,7 @@ package org.hibernate.envers.configuration.internal; import java.util.Date; import java.util.Set; -import javax.persistence.Column; +import jakarta.persistence.Column; import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.ReflectionManager; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java index 6fcbaab638..a51d932584 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java @@ -16,8 +16,8 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import javax.persistence.EnumType; -import javax.persistence.JoinColumn; +import jakarta.persistence.EnumType; +import jakarta.persistence.JoinColumn; import org.dom4j.Element; import org.hibernate.MappingException; @@ -227,7 +227,7 @@ public final class CollectionMetadataGenerator { new MiddleRelatedComponentMapper( referencedIdData ), 0 ); - // Generating the index mapping, if an index exists. It can only exists in case a javax.persistence.MapKey + // Generating the index mapping, if an index exists. It can only exists in case a jakarta.persistence.MapKey // annotation is present on the entity. So the middleEntityXml will be not be used. The queryGeneratorBuilder // will only be checked for nullnes. MiddleComponentData indexComponentData = addIndex( null, null ); @@ -359,7 +359,7 @@ public final class CollectionMetadataGenerator { IdMappingData relatedIdMapping) { final Element properties = (Element) relatedIdMapping.getXmlRelationMapping().clone(); MetadataTools.prefixNamesInPropertyElement( properties, prefix, columnNameIterator, true, true ); - for ( Element idProperty : (java.util.List) properties.elements() ) { + for ( Element idProperty : (List) properties.elements() ) { xmlMapping.add( (Element) idProperty.clone() ); } } @@ -536,7 +536,7 @@ public final class CollectionMetadataGenerator { final String mapKey = propertyAuditingData.getMapKey(); final EnumType mapKeyEnumType = propertyAuditingData.getMapKeyEnumType(); if ( ( mapKey == null && mapKeyEnumType == null ) || ( mapKeyEnumType != null && referencedEntityName == null ) ) { - // This entity doesn't specify a javax.persistence.MapKey or there is a MapKeyEnumerated but its a non-entity type. + // This entity doesn't specify a jakarta.persistence.MapKey or there is a MapKeyEnumerated but its a non-entity type. // Mapping it to the middle entity. return addValueToMiddleTable( indexedValue.getIndex(), diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MetadataTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MetadataTools.java index c19c930b56..fdd2bddaf6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MetadataTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MetadataTools.java @@ -7,7 +7,7 @@ package org.hibernate.envers.configuration.internal.metadata; import java.util.Iterator; -import javax.persistence.JoinColumn; +import jakarta.persistence.JoinColumn; import org.hibernate.boot.Metadata; import org.hibernate.dialect.Dialect; @@ -404,8 +404,8 @@ public final class MetadataTools { * Adds all column or formula elements. * * @param element Parent element. - * @param columnIterator Iterator pointing at {@link org.hibernate.mapping.Column} and/or - * {@link org.hibernate.mapping.Formula} objects. + * @param columnIterator Iterator pointing at {@link Column} and/or + * {@link Formula} objects. */ public static void addColumnsOrFormulas(Element element, Iterator columnIterator) { while ( columnIterator.hasNext() ) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java index 25494642b9..b62c2aa0f3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java @@ -15,13 +15,13 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import javax.persistence.ElementCollection; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.MapKey; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.hibernate.HibernateException; import org.hibernate.MappingException; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java index c8274fe142..dac92393be 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java @@ -9,7 +9,7 @@ package org.hibernate.envers.configuration.internal.metadata.reader; import java.util.ArrayList; import java.util.List; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.AuditOverride; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java index 95d7c9d9cf..def5a1e075 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java @@ -9,10 +9,10 @@ package org.hibernate.envers.enhanced; import java.io.Serializable; import java.text.DateFormat; import java.util.Date; -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.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java index 889fb59b03..f665d9e397 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java @@ -8,12 +8,12 @@ package org.hibernate.envers.enhanced; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java index 028cc0b7f7..72dadebda3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java @@ -8,7 +8,7 @@ package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import java.util.Map; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; import org.hibernate.NonUniqueResultException; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java index f20b9bee74..23c95599cc 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleMapKeyEnumeratedComponentMapper.java @@ -14,7 +14,7 @@ import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleCo import org.hibernate.envers.internal.tools.query.Parameters; /** - * A {@link MiddleComponentMapper} specifically for {@link javax.persistence.MapKeyEnumerated}. + * A {@link MiddleComponentMapper} specifically for {@link jakarta.persistence.MapKeyEnumerated}. * * @author Chris Cranford */ diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java index 59ec3c92db..b8a74b84df 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java @@ -14,7 +14,7 @@ import org.hibernate.envers.query.AuditEntity; import org.hibernate.service.ServiceRegistry; /** - * Property mapper for not owning side of {@link javax.persistence.OneToOne} relation. + * Property mapper for not owning side of {@link jakarta.persistence.OneToOne} relation. * * @author Adam Warski (adam at warski dot org) * @author HernпїЅn Chanfreau diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java index ab3aed377d..2b0cc25884 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java @@ -15,7 +15,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.service.ServiceRegistry; /** - * Property mapper for {@link javax.persistence.OneToOne} with {@link javax.persistence.PrimaryKeyJoinColumn} relation. + * Property mapper for {@link jakarta.persistence.OneToOne} with {@link jakarta.persistence.PrimaryKeyJoinColumn} relation. * * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java index 2d00782735..61a7870332 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java @@ -22,7 +22,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.proxy.HibernateProxy; import org.jboss.logging.Logger; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java index a292d41b41..77e490ae58 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java @@ -72,7 +72,7 @@ public class BasicCollectionInitializor extends AbstractCo // collectionRow will be the actual object if retrieved from audit relation or middle table // otherwise it will be a List Object elementData = collectionRow; - if ( collectionRow instanceof java.util.List ) { + if ( collectionRow instanceof List ) { elementData = ( (List) collectionRow ).get( elementComponentData.getComponentIndex() ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java index 455ee8057a..e300d87004 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java @@ -67,8 +67,8 @@ public class ListCollectionInitializor extends AbstractCollectionInitializor extends AbstractCollectionI // otherwise it will be a List Object elementData = collectionRow; Object indexData = collectionRow; - if ( collectionRow instanceof java.util.List ) { + if ( collectionRow instanceof List ) { elementData = ( (List) collectionRow ).get( elementComponentData.getComponentIndex() ); indexData = ( (List) collectionRow ).get( indexComponentData.getComponentIndex() ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java index 3e96d93f79..de13168da3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java @@ -18,7 +18,7 @@ import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.I public abstract class CollectionProxy> implements Collection, Serializable { private static final long serialVersionUID = 8698249863871832402L; - private transient org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor initializor; + private transient Initializor initializor; protected T delegate; protected CollectionProxy() { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java index 6ee143ea00..67fedc2e89 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java @@ -25,7 +25,7 @@ public class MapProxy implements Map, Serializable { public MapProxy() { } - public MapProxy(org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor> initializor) { + public MapProxy(Initializor> initializor) { this.initializor = initializor; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java index 93658e1333..d37dab71cf 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java @@ -27,7 +27,7 @@ public class SortedMapProxy implements SortedMap, Serializable { public SortedMapProxy() { } - public SortedMapProxy(org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor> initializor) { + public SortedMapProxy(Initializor> initializor) { this.initializor = initializor; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java index 4b816eb7c4..385a143498 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; import org.hibernate.HibernateException; import org.hibernate.NonUniqueResultException; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java index 1a5c48ad1f..3319f04e52 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java @@ -12,7 +12,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.Session; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java index 5426d4724a..7bc10d4890 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java @@ -47,7 +47,7 @@ public class UpdateBuilder { sb.append( "update " ).append( entityName ).append( " " ).append( alias ); sb.append( " set " ); int i = 1; - for ( java.util.Map.Entry entry : updates.entrySet() ) { + for ( Map.Entry entry : updates.entrySet() ) { final String property = entry.getKey(); final String paramName = generateParameterName(); sb.append( alias ).append( "." ).append( property ).append( " = " ).append( ":" ).append( paramName ); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java index 81e2e3d352..a3406cebbf 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditAssociationQuery.java @@ -6,7 +6,7 @@ */ package org.hibernate.envers.query; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java index e7d8e51ed9..43d9c38fdc 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQuery.java @@ -7,9 +7,9 @@ package org.hibernate.envers.query; import java.util.List; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.criteria.JoinType; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java index 7fbece776c..dac6ef1f05 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java @@ -71,7 +71,7 @@ public abstract class CriteriaTools { * @param entityName Original entity name (not audited). * @param propertyName Property name or placeholder. * - * @return Path to property. Handles identifier placeholder used by {@link org.hibernate.envers.query.criteria.AuditId}. + * @return Path to property. Handles identifier placeholder used by {@link AuditId}. */ public static String determinePropertyName( EnversService enversService, diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java index 167568bf5c..5d92aef468 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java @@ -11,9 +11,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.criteria.JoinType; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditAssociationQueryImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditAssociationQueryImpl.java index 4684daee70..66410d1692 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditAssociationQueryImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AuditAssociationQueryImpl.java @@ -10,9 +10,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.criteria.JoinType; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java index 43d0a81fec..d9b6a67e00 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.envers.RevisionType; import org.hibernate.envers.boot.internal.EnversService; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java old mode 100755 new mode 100644 diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java old mode 100755 new mode 100644 diff --git a/hibernate-envers/src/test/java/ee/estonia/entities/Child.java b/hibernate-envers/src/test/java/ee/estonia/entities/Child.java index f7b207df99..f27a9c41c6 100644 --- a/hibernate-envers/src/test/java/ee/estonia/entities/Child.java +++ b/hibernate-envers/src/test/java/ee/estonia/entities/Child.java @@ -7,9 +7,9 @@ package ee.estonia.entities; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -85,4 +85,4 @@ public class Child implements Serializable { public void setData(String data) { this.data = data; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java b/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java index 37a477bb7c..00d9ca3066 100644 --- a/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java +++ b/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java @@ -9,10 +9,10 @@ package ee.estonia.entities; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java index a6017c824c..955ee5d89d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java @@ -10,20 +10,20 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java index b0442494d2..9634205d09 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java @@ -9,11 +9,11 @@ package org.hibernate.envers.test.integration.customtype; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java index 22e284e463..a15ee054dd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeEntity.java @@ -7,10 +7,10 @@ package org.hibernate.envers.test.integration.customtype; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Columns; import org.hibernate.annotations.Type; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java index 2e8afa5545..f6e2648752 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java @@ -8,7 +8,7 @@ package org.hibernate.envers.test.integration.customtype; import java.util.Arrays; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.envers.configuration.EnversSettings; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java index 06e0161357..e8443d2778 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java @@ -7,7 +7,7 @@ package org.hibernate.envers.test.integration.customtype; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -74,4 +74,4 @@ public class ParametrizedCustom extends BaseEnversJPAFunctionalTestCase { assert "xUy".equals( rev1.getStr() ); assert "xVy".equals( rev2.getStr() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java index b8d14606f7..c9ce9347b8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java @@ -7,9 +7,9 @@ package org.hibernate.envers.test.integration.data; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -86,4 +86,4 @@ public class DateTestEntity { result = 31 * result + (dateValue != null ? dateValue.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java index 9201242530..4fc35ea3ad 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.envers.test.integration.data; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java index 11044e7125..68c3118620 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.envers.test.integration.data; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.envers.Audited; @@ -80,4 +80,4 @@ public class LobSerializableTestEntity { result = 31 * result + (obj != null ? obj.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java index abca137ee0..43af157076 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java @@ -8,10 +8,10 @@ package org.hibernate.envers.test.integration.data; import java.util.Arrays; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; @@ -134,4 +134,4 @@ public class LobTestEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java index 8b10e226dc..bcbf432333 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java @@ -9,7 +9,7 @@ package org.hibernate.envers.test.integration.data; import java.util.Arrays; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java index fe49d47496..af372d0f23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.envers.test.integration.data; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -78,4 +78,4 @@ public class SerializableTestEntity { result = 31 * result + (obj != null ? obj.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java index e2823fe0dd..61019d3964 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Address.java @@ -10,12 +10,12 @@ import java.time.Instant; import java.util.Collection; import java.util.LinkedList; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Chris Cranford @@ -52,4 +52,4 @@ public class Address extends BaseDomainEntity { public Collection getVersions() { return versions; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java index 09fcb5e13b..946173119d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/AddressVersion.java @@ -9,13 +9,13 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import java.time.Instant; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Chris Cranford @@ -58,4 +58,4 @@ public class AddressVersion extends BaseDomainEntityVersion { id.versions.add( version ); return version; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java index a6d03f4ef8..250e5835bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Base.java @@ -6,9 +6,9 @@ */ package org.hibernate.envers.test.integration.manytoone.lazy; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java index 61f99b06dc..0a793e4fa3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntity.java @@ -9,10 +9,10 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import java.time.Instant; import java.util.Objects; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java index 254d1007d8..0f495283b9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityMetadata.java @@ -9,8 +9,8 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import java.io.Serializable; import java.time.Instant; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.CreationTimestamp; @@ -52,4 +52,4 @@ public abstract class BaseDomainEntityMetadata extends Base implements Serializa public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java index 402ac57ed3..6fb683a361 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/BaseDomainEntityVersion.java @@ -8,9 +8,9 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Chris Cranford @@ -49,4 +49,4 @@ public abstract class BaseDomainEntityVersion extends BaseDomainEntityMetadata { public int hashCode() { return Objects.hash( getId(), version ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java index 8c11a758dc..09de313409 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java @@ -8,11 +8,11 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import org.hibernate.envers.NotAudited; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; /** @@ -32,4 +32,4 @@ public class ChildUser extends User { public long getId() { return id; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java index d21a4b7ca3..78e272ab79 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/Shipment.java @@ -9,15 +9,15 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import java.time.Instant; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.envers.AuditTable; import org.hibernate.envers.Audited; @@ -113,4 +113,4 @@ public class Shipment extends BaseDomainEntity { public void setUser(User user) { this.user = user; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java index dbcf88c8ef..0f4ee5f80c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java @@ -8,14 +8,14 @@ package org.hibernate.envers.test.integration.manytoone.lazy; import org.hibernate.envers.NotAudited; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; /** @@ -39,4 +39,4 @@ public class User { public long getId() { return id; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java index 294b891080..2efefc83e8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java @@ -7,7 +7,7 @@ package org.hibernate.envers.test.integration.maytomany; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -168,4 +168,4 @@ public class BasicWhereJoinTable extends BaseEnversJPAFunctionalTestCase { assert TestTools.checkCollection( rev3.getReferences2() ); assert TestTools.checkCollection( rev4.getReferences2(), ite2_2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java index 0a8d79c5ff..ccd4b18f52 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.inheritance.joined.ChildEntity; @@ -80,4 +80,4 @@ public class HasChangedChildAuditing extends AbstractModifiedFlagsEntityTest { list = queryForPropertyHasNotChanged( ParentEntity.class, id1, "data" ); assertEquals( 0, list.size() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java index 7dd64f1ff3..014838de7e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java @@ -8,7 +8,7 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation.ChildIngEntity; @@ -93,4 +93,4 @@ public class HasChangedChildReferencing extends AbstractModifiedFlagsEntityTest assertEquals( makeList( 3 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java index c9a4f24a13..19ff6c511d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java @@ -8,7 +8,7 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation.Address; @@ -88,4 +88,4 @@ public class HasChangedNotOwnedBidirectional extends AbstractModifiedFlagsEntity assertEquals( 1, list.size() ); assertEquals( makeList( 2 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java index e6abdbb11f..0553a1025c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java @@ -7,8 +7,8 @@ package org.hibernate.envers.test.integration.naming; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.naming.NamingTestEntity2; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java index 74d4cbe34b..8ff670c590 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java @@ -9,7 +9,7 @@ package org.hibernate.envers.test.integration.naming; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java index f456a11dff..c115ce3196 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.envers.test.integration.onetoone.bidirectional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java index 6da9e44b3d..fae2d4faa1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java @@ -7,8 +7,8 @@ package org.hibernate.envers.test.integration.query; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.JoinType; import org.hibernate.envers.AuditReader; import org.hibernate.envers.query.AuditEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java index ecef7b9cef..41f79e0b67 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java @@ -8,13 +8,13 @@ package org.hibernate.envers.test.integration.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.criteria.JoinType; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java index 83f82d5004..3abaecbe58 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java @@ -8,7 +8,7 @@ package org.hibernate.envers.test.integration.query; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -128,4 +128,4 @@ public class OrderByLimitQuery extends BaseEnversJPAFunctionalTestCase { assert Arrays.asList( new IntTestEntity( 5, id2 ), new IntTestEntity( 3, id5 ) ).equals( res_2_to_3 ); assert Arrays.asList( new IntTestEntity( 0, id1 ) ).equals( res_4 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java index e29bc82006..2bdc98febe 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java @@ -11,14 +11,14 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Fetch; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java index f75fd6b486..98c23cef33 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java @@ -12,11 +12,11 @@ import java.util.Iterator; import java.util.Map; import java.util.Objects; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderBy; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderBy; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java index b7076a83bd..779d1ad5ec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java @@ -11,13 +11,13 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Fetch; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java index 608efd8af2..d724b0cee2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java @@ -11,13 +11,13 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderBy; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Fetch; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java index 4be75e1bcd..b371192e63 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java @@ -10,11 +10,11 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java index aec33be9fb..9a4fa551f2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java @@ -10,10 +10,10 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; -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; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java index bf8b1ac922..fe29414634 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java @@ -10,9 +10,9 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java index 439870fafd..af52110e9f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java @@ -8,7 +8,7 @@ package org.hibernate.envers.test.integration.readwriteexpression; import java.math.BigDecimal; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.OracleDialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java index 855d5c5877..73ea5ab06d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java @@ -6,10 +6,10 @@ */ package org.hibernate.envers.test.integration.readwriteexpression; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.envers.Audited; @@ -54,4 +54,4 @@ public class Staff { private double sizeInInches; -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java index 93e02a0547..283092144e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java @@ -10,9 +10,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.SystemException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.SystemException; import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java index d7c255be5c..a7052130bd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java @@ -22,7 +22,7 @@ import org.junit.runners.model.InitializationError; import org.junit.runners.model.TestClass; /** - * Copied & modified from {@link org.junit.runners.Parameterized}. + * Copied & modified from {@link Parameterized}. *

          * The modification is that the generated runners extend {@link CustomRunner} instead of the default * {@code TestClassRunnerForParameters}. diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java index dc45bfbb3d..c40c87e493 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/ModelContributorSmokeTests.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java index b8f2657673..ab578a7ccb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/RuntimeModelSmokeTests.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java index 76e9b22365..53ffdfc162 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.entities; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -81,4 +81,4 @@ public class IntNoAutoIdTestEntity { public String toString() { return "INATE(id = " + id + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java index 1f5399eb13..6e4d1580bc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -83,4 +83,4 @@ public class IntTestEntity { public String toString() { return "ITE(id = " + id + ", number = " + number + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java index 64421b8945..2474fd8268 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java index 5de3f09ce4..a4ea27dd42 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -99,4 +99,4 @@ public class PrimitiveTestEntity { public String toString() { return "PTE(id = " + id + ", numVal1 = " + numVal1 + ", numVal2 = " + numVal2 + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java index 38dbc9f8f2..24f8c8844a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -101,4 +101,4 @@ public class StrIntTestEntity { public String toString() { return "SITE(id = " + id + ", str1 = " + str1 + ", number = " + number + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java index 0f6ecfbe78..2199617e12 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities; -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; import org.hibernate.envers.Audited; @@ -84,4 +84,4 @@ public class StrTestEntity { public String toString() { return "STE(id = " + id + ", str = " + str + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java index d4432d1f7f..ac76ad550f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities; import java.io.Serializable; -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; import org.hibernate.annotations.Proxy; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java index 2817265dcd..f410b80801 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java index c0c7c49fe4..db216e09f0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java index 6fde329459..83f475e5ca 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities; -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 Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java index 87f07cc6e6..5a31e151a4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.components.Component3; @@ -88,4 +88,4 @@ public class EmbeddableListEntity1 { public String toString() { return "ELE1(id = " + id + ", otherData = " + otherData + ", componentList = " + componentList + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java index 3c1b64ccba..bee27de0f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; @@ -80,4 +80,4 @@ public class EmbeddableListEntity2 { public String toString() { return "ELE2(id = " + id + ", componentList = " + componentList + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java index aa6859e1ff..37017265f0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.entities.collection; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java index 6d38979553..2e6262a436 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.components.Component3; @@ -79,4 +79,4 @@ public class EmbeddableMapEntity { public String toString() { return "EME(id = " + id + ", componentMap = " + componentMap + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java index 3af01070c8..68d9f10bed 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.components.Component3; @@ -76,4 +76,4 @@ public class EmbeddableSetEntity { public String toString() { return "ESE(id = " + id + ", componentSet = " + componentSet + ')'; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java index 807173f96c..66f5c815ef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.EnumMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java index e1dab694a7..09d0bbc9f8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.collection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java index eda3af31bb..4ecd20a3f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -93,4 +93,4 @@ public class EnumSetEntity { public String toString() { return "ESE(id = " + id + ", enums1 = " + enums1 + ", enums2 = " + enums2 + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java index b1a34b76d9..ab27003e73 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java @@ -9,16 +9,16 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; @@ -140,4 +140,4 @@ public class MultipleCollectionEntity { result = 31 * result + (refEntities2 != null ? refEntities2.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java index 156ba4bb2e..66934e8fd6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.envers.entities.collection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.hibernate.annotations.ForeignKey; import org.hibernate.envers.Audited; @@ -105,4 +105,4 @@ public class MultipleCollectionRefEntity1 { public int hashCode() { return text != null ? text.hashCode() : 0; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java index 4cd2b0b2d2..0c701605cd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.envers.entities.collection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.hibernate.annotations.ForeignKey; import org.hibernate.envers.Audited; @@ -105,4 +105,4 @@ public class MultipleCollectionRefEntity2 { public int hashCode() { return text != null ? text.hashCode() : 0; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java index f1bb53c739..76e48e25da 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.IndexColumn; import org.hibernate.envers.Audited; @@ -74,4 +74,4 @@ public class StringListEntity { public String toString() { return "SLE(id = " + id + ", strings = " + strings + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java index 8430c679d7..92a436e8bc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; import org.hibernate.envers.Audited; @@ -74,4 +74,4 @@ public class StringMapEntity { public String toString() { return "SME(id = " + id + ", strings = " + strings + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java index 12b1b0cd52..7f155b013f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.envers.entities.collection; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -72,4 +72,4 @@ public class StringSetEntity { public String toString() { return "SSE(id = " + id + ", strings = " + strings + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java index 51e1c5745c..3db7e033a3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.entities.components; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java index 8820b5e108..d7ff5a45a7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.entities.components; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java index 14e34f4da4..3c526c4538 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.components; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java index 047482e6fe..e1dde63177 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.entities.components; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java index 1114711d23..567cd81d90 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.entities.components; import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import org.hibernate.envers.Audited; @@ -89,4 +89,4 @@ public class ComponentSetTestEntity { ", comps=" + comps + '}'; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java index 3297e4c823..903a04366d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.entities.components; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java index d339fb52bc..f8d913ad9a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.entities.components; -import javax.persistence.Embedded; +import jakarta.persistence.Embedded; /** * @author Erik-Berndt Scheper diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java index e7c4df9d46..9c26f50c6f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.envers.entities.components; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java index 60ae543393..e6d1f3920e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.components.relations; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -78,4 +78,4 @@ public class ManyToOneComponent { public String toString() { return "ManyToOneComponent(str1 = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java index c26c09125c..23efeb2f33 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.entities.components.relations; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -87,4 +87,4 @@ public class ManyToOneComponentTestEntity { public String toString() { return "MTOCTE(id = " + id + ", comp1 = " + comp1 + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java index 205ede84e2..6248795f9f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.components.relations; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestNoProxyEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java index 2760e2fc33..dc4ee0bea0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.components.relations; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.NotAudited; import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; @@ -80,4 +80,4 @@ public class NotAuditedManyToOneComponent { public String toString() { return "NotAuditedManyToOneComponent(str1 = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java index 5894734eb4..8492492e4e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.entities.components.relations; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -87,4 +87,4 @@ public class NotAuditedManyToOneComponentTestEntity { public String toString() { return "NAMTOCTE(id = " + id + ", comp1 = " + comp1 + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java index 43d3cdd9fc..eba1190173 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.envers.entities.components.relations; import java.util.HashSet; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -80,4 +80,4 @@ public class OneToManyComponent { public String toString() { return "OneToManyComponent(data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java index 41d1ee6bf7..2e3de46203 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.entities.components.relations; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -87,4 +87,4 @@ public class OneToManyComponentTestEntity { public String toString() { return "OTMCTE(id = " + id + ", comp1 = " + comp1 + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java index 837bc42953..edeabd2ea4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.converter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java index e51cf080d2..f8b10a4a59 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.entities.converter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Steve Ebersole diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java index a156c1128b..32c56828a6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.entities.customtype; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java index 174eb40151..b9936b8910 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.customtype; -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; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; @@ -86,4 +86,4 @@ public class ParametrizedCustomTypeEntity { public String toString() { return "PCTE(id = " + id + ", str = " + str + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java index e9cb5e7fae..5b7d685931 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.entities.ids; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -77,4 +77,4 @@ public class CompositeDateIdTestEntity { result = 31 * result + (str1 != null ? str1.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java index c627ff464a..ce4cd9331f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import java.util.Date; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Adam Warski (adam at warski dot org) @@ -72,4 +72,4 @@ public class DateEmbId implements Serializable { public String toString() { return "DateEmbId(" + x + ", " + y + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java index 010bf2d095..ab3ce6394c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.entities.ids; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -78,4 +78,4 @@ public class DateIdTestEntity { result = 31 * result + (str1 != null ? str1.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java index 8834e16dec..5065fb6d38 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Adam Warski (adam at warski dot org) @@ -71,4 +71,4 @@ public class EmbId implements Serializable { public String toString() { return "EmbId(" + x + ", " + y + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java index a910038487..6bfb9a6fde 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.ids; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java index e5fe1eb31a..cd1a4c9097 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java index 1b93d5b2b6..053c106cdd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.ids; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java index f95cb1911d..7a2e705582 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java index 0da0133a02..0bfe272143 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java index a9a260a69b..d2ee219bdb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.ids; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java index fd311a10a1..86c43a03db 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java index d872b67fe8..b73b5529be 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.manytomany; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -98,4 +98,4 @@ public class ListOwnedEntity { public String toString() { return "ListOwnedEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java index 6c61f0c01f..5778940570 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.manytomany; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -98,4 +98,4 @@ public class ListOwningEntity { public String toString() { return "SetOwningEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java index 61fe3e7796..70fc161897 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.manytomany; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -98,4 +98,4 @@ public class MapOwnedEntity { public String toString() { return "MapOwnedEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java index 6320c57be3..90fcd7f10a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.entities.manytomany; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -101,4 +101,4 @@ public class MapOwningEntity { public String toString() { return "MapOwningEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java index 6d73c7055a..8395b25960 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.manytomany; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -98,4 +98,4 @@ public class SetOwnedEntity { public String toString() { return "SetOwnedEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java index fb958bd098..4ef31d6ac2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.manytomany; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -98,4 +98,4 @@ public class SetOwningEntity { public String toString() { return "SetOwningEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java index 10cadfec03..cccb946403 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java @@ -10,11 +10,11 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyJoinColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyJoinColumn; import org.hibernate.annotations.SortComparator; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java index f83b0221a3..2d7fed52af 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.entities.manytomany; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.WhereJoinTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java index 915f05a469..232db14feb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.entities.manytomany.biowned; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.envers.Audited; @@ -106,4 +106,4 @@ public class ListBiowning1Entity { public String toString() { return "ListBiowning1Entity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java index eab5d57dcd..ba2e2b293f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.entities.manytomany.biowned; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.envers.Audited; @@ -106,4 +106,4 @@ public class ListBiowning2Entity { public String toString() { return "ListBiowning2Entity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java index 3bb0793a36..ac0d3cbf2f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.entities.manytomany.sametable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.WhereJoinTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java index da6bcdf4d3..0ec3ce3185 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.entities.manytomany.sametable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.WhereJoinTable; import org.hibernate.envers.Audited; @@ -108,4 +108,4 @@ public class Child2Entity { public String toString() { return "C2E(id = " + id + ", child2Data = " + child2Data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java index ed3a12da8e..6387456b00 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.entities.manytomany.sametable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.WhereJoinTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java index 9e00ac96f9..ce18f0396d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java index e6014ded15..bce82180c4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -97,4 +97,4 @@ public class ListUniEntity { public String toString() { return "ListUniEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java index 201c716223..445dacfdbf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java @@ -8,14 +8,14 @@ package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java index ffadb64641..fc3c15f4f3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java index 1fca68a6f4..49b78e15f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java index dfff308e58..8605ba2e83 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -99,4 +99,4 @@ public class MapUniEntity { public String toString() { return "MapUniEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java index 8854948105..405342ac27 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -97,4 +97,4 @@ public class SetUniEntity { public String toString() { return "SetUniEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java index b79e6d482e..2fbe8b11df 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.entities.manytoone.unidirectional; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java index 5f91b691ee..0e363ff7a5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.envers.entities.manytoone.unidirectional; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java index dca0c74fa8..daba19b1e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.manytoone.unidirectional; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java index eeaa7ecf66..59b675acb7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.entities.onetomany; import java.io.Serializable; import java.util.Collection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -99,4 +99,4 @@ public class CollectionRefEdEntity implements Serializable { public String toString() { return "CollectionRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java index a261e3e7f5..63a6d0ddcb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.onetomany; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -100,4 +100,4 @@ public class CollectionRefIngEntity implements Serializable { public String toString() { return "CollectionRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java index 410224f697..b9b7854fe2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.onetomany; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -96,4 +96,4 @@ public class ListRefEdEntity { public String toString() { return "ListRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java index ea47a5a144..ec6dfc15da 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.onetomany; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -97,4 +97,4 @@ public class ListRefIngEntity { public String toString() { return "ListRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java index 64cfe826d6..cd1b356d7a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.envers.entities.onetomany; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java index 4d361903cb..43b56e73a2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.onetomany; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java index 87f8b33b5e..11ab218e55 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.onetomany; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java index dbfd66e595..4b57464332 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -109,4 +109,4 @@ public class DoubleListJoinColumnBidirectionalRefEdEntity1 { public String toString() { return "DoubleListJoinColumnBidirectionalRefIngEntity1(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java index bc04753ad5..04c14c9ba2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -109,4 +109,4 @@ public class DoubleListJoinColumnBidirectionalRefEdEntity2 { public String toString() { return "DoubleListJoinColumnBidirectionalRefIngEntity2(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java index 6c809526f8..31adae7545 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; @@ -119,4 +119,4 @@ public class DoubleListJoinColumnBidirectionalRefIngEntity { public String toString() { return "DoubleListJoinColumnBidirectionalRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java index bde48c8f79..f6dac924ea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -112,4 +112,4 @@ public class DoubleSetRefCollEntity { public String toString() { return "DoubleSetRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java index 9b5ec4c8f8..fc34321de9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -121,4 +121,4 @@ public class IndexedListJoinColumnBidirectionalRefEdEntity { public String toString() { return "IndexedListJoinColumnBidirectionalRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java index 7731f9b59a..43bd306811 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.IndexColumn; import org.hibernate.envers.AuditMappedBy; @@ -116,4 +116,4 @@ public class IndexedListJoinColumnBidirectionalRefIngEntity { public String toString() { return "IndexedListJoinColumnBidirectionalRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java index dfb2db4017..26d38c5893 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -87,4 +87,4 @@ public class ListJoinColumnBidirectionalInheritanceRefEdChildEntity return "ListJoinColumnBidirectionalInheritanceRefEdChildEntity(id = " + getId() + ", parentData = " + getParentData() + ", childData = " + childData + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java index 1f8373b988..7839ecc03f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java @@ -6,17 +6,17 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -117,4 +117,4 @@ public class ListJoinColumnBidirectionalInheritanceRefEdParentEntity { public String toString() { return "ListJoinColumnBidirectionalInheritanceRefEdParentEntity(id = " + id + ", parentData = " + parentData + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java index 67a30d5280..edf8993196 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; @@ -114,4 +114,4 @@ public class ListJoinColumnBidirectionalInheritanceRefIngEntity { public String toString() { return "ListJoinColumnBidirectionalInheritanceRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java index da75af4553..389ac67025 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java index 971b245863..b1ff4e4625 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java index ff361d9db9..bb72d706db 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -97,4 +97,4 @@ public class ListRefCollEntity { public String toString() { return "SetRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java index 3bcd3a1324..5654c3814a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; @@ -103,4 +103,4 @@ public class SetJoinColumnRefCollEntity { public String toString() { return "SetJoinColumnRefCollEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java index 061d4bffbf..af359b4b80 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -97,4 +97,4 @@ public class SetRefCollEntity { public String toString() { return "SetRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java index 3f7061d11f..844d0a94d0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached.ids; import java.util.Set; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.EmbId; @@ -100,4 +100,4 @@ public class SetRefCollEntityEmbId { public String toString() { return "SetRefCollEntityEmbId(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java index eaf6756dbc..60789d4bc3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached.ids; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.MulId; @@ -118,4 +118,4 @@ public class SetRefCollEntityMulId { public String toString() { return "SetRefCollEntityMulId(id1 = " + id1 + ", id2 = " + id2 + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java index 375022bb43..9531bd12f8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java index e39324e670..5ee083d70a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.IndexColumn; import org.hibernate.envers.AuditMappedBy; @@ -120,4 +120,4 @@ public abstract class ParentIndexedListJoinColumnBidirectionalRefIngEntity { public String toString() { return "ParentIndexedListJoinColumnBidirectionalRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java index a772c18b02..37751f585a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList; @@ -122,4 +122,4 @@ public class ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity { public String toString() { return "ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java index 8a1320dd7e..0ef4fd3915 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.onetomany.ids; import java.util.Set; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.EmbId; @@ -97,4 +97,4 @@ public class SetRefEdEmbIdEntity { public String toString() { return "SetRefEdEmbIdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java index 0eb6de8d9b..cc732ad22e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.entities.onetomany.ids; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.MulId; @@ -121,4 +121,4 @@ public class SetRefEdMulIdEntity { public String toString() { return "SetRefEdMulIdEntity(id1 = " + id1 + ", id2 = " + id2 + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java index 9d843d17a7..8d08c6bd9d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.ids; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.EmbId; @@ -98,4 +98,4 @@ public class SetRefIngEmbIdEntity { public String toString() { return "SetRefIngEmbIdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java index 60ede2c86f..827ebe0f9c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.onetomany.ids; -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; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.MulId; @@ -123,4 +123,4 @@ public class SetRefIngMulIdEntity { public String toString() { return "SetRefIngMulIdEntity(id1 = " + id1 + ", id2 = " + id2 + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java index 18851c4e17..ca341a5370 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.entities.onetoone; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Proxy; import org.hibernate.envers.Audited; @@ -112,4 +112,4 @@ public final class BidirectionalEagerAnnotationRefEdOneToOne { public void setData(String data) { this.data = data; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java index 312736db56..4d4d6be84a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java @@ -6,14 +6,14 @@ */ package org.hibernate.orm.test.envers.entities.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Proxy; import org.hibernate.envers.Audited; @@ -134,4 +134,4 @@ public final class BidirectionalEagerAnnotationRefIngOneToOne { public void setData(String data) { this.data = data; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java index 1a8821556f..d2101dc1b1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.reventity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -96,4 +96,4 @@ public class CustomDataRevEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java index 942cabcff2..3b55735e49 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.entities.reventity; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -83,4 +83,4 @@ public class CustomDateRevEntity { result = 31 * result + (dateTimestamp != null ? dateTimestamp.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java index fdd21f1cf5..1617506dc3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.reventity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -81,4 +81,4 @@ public class CustomPropertyAccessRevEntity { result = 31 * result + (int) (customTimestamp ^ (customTimestamp >>> 32)); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java index c3fca6c151..583509d799 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.entities.reventity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java index a96f47d2ee..afae231606 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.reventity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -84,4 +84,4 @@ public class CustomRevEntityColumnMapping { result = 31 * result + (int) (customTimestamp ^ (customTimestamp >>> 32)); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java index 3863931ea2..9a55bfb225 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java index 34330add1d..e1741b2024 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; 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.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java index de9603e334..9f9def2a20 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import org.hibernate.envers.RevisionEntity; import org.hibernate.envers.enhanced.SequenceIdTrackingModifiedEntitiesRevisionEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java index 8f3cbd2f69..1b3641d023 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Custom detail of revision entity. diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java index bc802a9e16..e6e14ca45b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.accesstype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.AttributeAccessor; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java index 184f865efd..8f36089c1d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.accesstype; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java index e6751e5fad..0374e32835 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -55,4 +55,4 @@ public class FieldAccessType extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( ver1, getAuditReader().find( FieldAccessTypeEntity.class, id1, 1 ) ); Assert.assertEquals( ver2, getAuditReader().find( FieldAccessTypeEntity.class, id1, 2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java index a347fe2059..6da4cf9b46 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.accesstype; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -87,4 +87,4 @@ public class FieldAccessTypeEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java index 8f3f638625..7c4108b9c6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -60,4 +60,4 @@ public class ImmutableClassAccessType extends BaseEnversJPAFunctionalTestCase { assertEquals( country, history ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java index 35b6ee587e..da6445c9ef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -60,4 +60,4 @@ public class MixedAccessType extends BaseEnversJPAFunctionalTestCase { assert rev1.equals( ver1 ); assert rev2.equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java index e68bff52d4..508a15b48c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.envers.integration.accesstype; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; -import javax.persistence.Access; +import jakarta.persistence.Access; import org.hibernate.envers.Audited; /** @@ -100,4 +100,4 @@ public class MixedAccessTypeEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java index 41e5da60ac..6e1a124b14 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -63,4 +63,4 @@ public class PropertyAccessType extends BaseEnversJPAFunctionalTestCase { assert rev1.equals( ver1 ); assert rev2.equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java index d129831eb6..63664b43f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.accesstype; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.envers.Audited; @@ -98,4 +98,4 @@ public class PropertyAccessTypeEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java index 5f121a1ea5..ec44e86edc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.auditReader; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.exception.NotAuditedException; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java index 7bb154983b..a0f2339463 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.auditReader; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java index 117df004ca..22b071a2b3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.auditReader; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java index 5a6c1bcb8c..7f92d0df2f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java index 933416b606..0e40752c71 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -94,4 +94,4 @@ public class BasicTestEntity2 { result = 31 * result + (str2 != null ? str2.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java index 9c40eae694..5676648f14 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.basic; -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 Adam Warski (adam at warski dot org) @@ -91,4 +91,4 @@ public class BasicTestEntity3 { result = 31 * result + (str2 != null ? str2.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java index 80b6293b00..665d1d26aa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -94,4 +94,4 @@ public class BasicTestEntity4 { result = 31 * result + (str2 != null ? str2.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java index 1c3ffae2e7..2088cf377a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTypeColumnDefinitionTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java index a63eb4a158..36e9259ea9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.envers.integration.basic; import java.math.BigDecimal; import java.util.Arrays; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java index bd921bf67d..79124e1d59 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ColumnScalePrecisionTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java index fa36ef1238..2782935174 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java index baafab3f45..9a870fd431 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java index 2ef2789bb7..cbca45fdb5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -55,4 +55,4 @@ public class GlobalVersioned extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( BasicTestEntity4.class, id1, 1 ).equals( ver1 ); assert getAuditReader().find( BasicTestEntity4.class, id1, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java index 3df8ee887e..08f9cd6d9e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java index 29789ed2f4..1971f4ce09 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.basic; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -51,4 +51,4 @@ public class NotVersioned extends BaseEnversJPAFunctionalTestCase { public void testHistoryOfId1() { getAuditReader().find( BasicTestEntity3.class, id1, 1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java index d2dbc078e3..7b5fefc0d5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -83,4 +83,4 @@ public class NullProperties extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( BasicTestEntity1.class, id2, 3 ).equals( ver1 ); assert getAuditReader().find( BasicTestEntity1.class, id2, 4 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java index 09b1ccbb00..cabf4fdaa9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Map; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.Session; import org.hibernate.dialect.MySQLDialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java index 68f27a2a6c..1e84553171 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.basic; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java index b6d6dd7f69..d575b56d83 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -56,4 +56,4 @@ public class Simple extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( ver1, getAuditReader().find( IntTestEntity.class, id1, 1 ) ); Assert.assertEquals( ver2, getAuditReader().find( IntTestEntity.class, id1, 2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java index 05e5ac5e26..d9fc83612d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.RevisionDoesNotExistException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java index 875c2567d1..890828499b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.entities.IntTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java index 1303ee373f..0689ec9972 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java index 1644a241d4..06f75a0453 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java index da41aefaee..a06be5a79c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.cache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -124,4 +124,4 @@ public class OneToManyCache extends BaseEnversJPAFunctionalTestCase { assert setRefIngEntity == ing1_rev1 || setRefIngEntity == ing2_rev1; } } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java index 5fcc574c26..50dfa88374 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.cache; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -82,4 +82,4 @@ public class OneToOneCache extends BaseEnversJPAFunctionalTestCase { assert ing1_rev2.getReference() == ed2_rev2; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java index 03139dcea1..7449c8ed85 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.cache; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -68,4 +68,4 @@ public class QueryCache extends BaseEnversJPAFunctionalTestCase { assert entFromFind == entFromQuery; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java index 5f331c4be0..44256ba615 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java @@ -14,13 +14,13 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java index d93cfacce8..251c8cd95b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.transaction.Status; -import javax.transaction.TransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.Oracle8iDialect; @@ -412,4 +412,4 @@ public class DetachedMultipleCollectionChangeTest extends BaseEnversJPAFunctiona tm.commit(); } } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java index 98ec72b43e..46c1bd5f17 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.collection; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.entities.collection.EmbeddableSetEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java index 7185a859ac..5e4dc18a8a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java @@ -10,11 +10,11 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java index 1344dc41ad..6f152a3686 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntitySameMapKeyMultiMapValueTest.java @@ -10,10 +10,10 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java index 6f13d53f51..68c6f76463 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumMapTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java index 4174ebe66f..e0f7f6a17a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EnumSet.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -113,4 +113,4 @@ public class EnumSet extends BaseEnversJPAFunctionalTestCase { // Compare the Strings to account for, as an example, Oracle returning a BigDecimal instead of an int. Assert.assertEquals( "0", enum2.toString() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java index 2f87e65982..f8ac78c85f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java index 521f5b39ea..8a172e04a6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java index 7acecb0762..fd802f3090 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -106,4 +106,4 @@ public class StringList extends BaseEnversJPAFunctionalTestCase { assert rev2.getStrings().equals( TestTools.makeList( "sle2_string1", "sle2_string2", "sle2_string1" ) ); assert rev3.getStrings().equals( TestTools.makeList( "sle2_string2", "sle2_string1" ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java index c9d43f6fe4..bdcae30397 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -117,4 +117,4 @@ public class StringMap extends BaseEnversJPAFunctionalTestCase { assert rev3.getStrings().equals( TestTools.makeMap( "1", "b" ) ); assert rev4.getStrings().equals( TestTools.makeMap( "1", "b" ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java index 632f8e6926..4606f50fad 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.DB2Dialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java index ad2092f899..a789b68184 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.AbstractHANADialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java index 1315b1d4a3..373eac1687 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -105,4 +105,4 @@ public class StringSet extends BaseEnversJPAFunctionalTestCase { assert rev2.getStrings().equals( TestTools.makeSet( "sse2_string1", "sse2_string2" ) ); assert rev3.getStrings().equals( TestTools.makeSet( "sse2_string2" ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java index 90ebfb46ba..82d59ca5d9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java index 9df096a9fc..9ddfcb2e38 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java index e2eabcc364..db60f582e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java index c4821905d0..c2a84d8923 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -217,4 +217,4 @@ public class EmbeddableList2 extends BaseEnversJPAFunctionalTestCase { assertNull( getAuditReader().find( EmbeddableListEntity2.class, ele_id1, 8 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java index 4a7e19f07d..0367403091 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -125,4 +125,4 @@ public class EmbeddableMap extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( TestTools.makeMap( "1", c3_2 ), rev3.getComponentMap() ); Assert.assertEquals( TestTools.makeMap( "1", c3_2 ), rev4.getComponentMap() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java index 6919122af0..15c01b8f10 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -140,4 +140,4 @@ public class EmbeddableSet extends BaseEnversJPAFunctionalTestCase { assertEquals( TestTools.makeSet( c3_2, c3_4 ), rev6.getComponentSet() ); assertEquals( TestTools.makeSet( c3_2, c3_4, c3_1 ), rev7.getComponentSet() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java index 3c8b921b84..06b922169f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.collection.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java index 0521d8674b..56dc2e3c37 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java @@ -11,11 +11,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java index ed59d8f9a0..44d70e56a0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java @@ -10,11 +10,11 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java index edc8feea79..e2c2d08291 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java @@ -11,10 +11,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java index a167052039..04bec83c2b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java @@ -10,10 +10,10 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull; * are audited that the same number of audit rows are generated regardless whether the embeddable * implements proper {@code equals} and {@code hashCode} methods. * - * The {@link org.hibernate.envers.strategy.ValidityAuditStrategy} with equals/hashcode. + * The {@link ValidityAuditStrategy} with equals/hashcode. * * +-----+---------+---------------+-----------+--------+--------+ * | REV | REVTYPE | TESTENTITY_ID | EMBS1_KEY | REVEND | VALUE | diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java index 09fc994a8f..caa13e2745 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java index 00699696aa..b90bb34a22 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OrderColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java index d2588c37b6..bfd6652b49 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java @@ -11,10 +11,10 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull; * are audited that the same number of audit rows are generated regardless whether the embeddable * implements proper {@code equals} and {@code hashCode} methods. * - * The {@link org.hibernate.envers.strategy.ValidityAuditStrategy} with equals/hashcode. + * The {@link ValidityAuditStrategy} with equals/hashcode. * * +-----+---------+---------------+-----------+--------+--------+ * | REV | REVTYPE | TESTENTITY_ID | EMBS1_KEY | REVEND | VALUE | diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java index 0451365365..3c2a4f6000 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java @@ -10,10 +10,10 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; * are audited that the same number of audit rows are generated regardless whether the embeddable * implements proper {@code equals} and {@code hashCode} methods. * - * The {@link org.hibernate.envers.strategy.ValidityAuditStrategy} with equals/hashcode. + * The {@link ValidityAuditStrategy} with equals/hashcode. * * +-----+---------+---------------+-----------+--------+--------+ * | REV | REVTYPE | TESTENTITY_ID | EMBS1_KEY | REVEND | VALUE | diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java index e54227e784..5a31da2bd5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.collection.embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java index 0036302395..61ddb1b89c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.collection.mapkey; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -102,4 +102,4 @@ public class ComponentMapKey extends BaseEnversJPAFunctionalTestCase { assert rev1.getIdmap().equals( TestTools.makeMap( cte1.getComp1(), cte1 ) ); assert rev2.getIdmap().equals( TestTools.makeMap( cte1.getComp1(), cte1, cte2.getComp1(), cte2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java index 08ea64b7b2..1e0dc35eb8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKeyEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.collection.mapkey; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.components.Component1; @@ -78,4 +78,4 @@ public class ComponentMapKeyEntity { public String toString() { return "CMKE(id = " + id + ", idmap = " + idmap + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java index 08150a89d2..ad0b3d5dae 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKey.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.collection.mapkey; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -86,4 +86,4 @@ public class IdMapKey extends BaseEnversJPAFunctionalTestCase { assert rev1.getIdmap().equals( TestTools.makeMap( ste1.getId(), ste1 ) ); assert rev2.getIdmap().equals( TestTools.makeMap( ste1.getId(), ste1, ste2.getId(), ste2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java index 49cb6203f4..8ed2b2ce70 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/IdMapKeyEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.collection.mapkey; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -77,4 +77,4 @@ public class IdMapKeyEntity { public String toString() { return "IMKE(id = " + id + ", idmap = " + idmap + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java index db66926ca4..cafcd453e8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java @@ -10,13 +10,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java index 076704325d..57bb4bf8c7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/MapKeyEnumeratedTest.java @@ -11,12 +11,12 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java index 0ee560dacb..6fc7169d6d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.collection.norevision; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java index 0dfe0872fa..b69ce60c77 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.collection.norevision; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java index 4abffce9d9..33b23b2791 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.collection.norevision; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java index b35e541a63..48e6b5335a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.collection.norevision; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java index aec2023280..fb8f1f02ee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java @@ -9,12 +9,12 @@ package org.hibernate.orm.test.envers.integration.collection.norevision; import java.io.Serializable; 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.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java index f36a6fb341..e2465c38c0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.components; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java index a7cf12ea67..6dc01afd59 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.components; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java index 5f3151ac3e..d8d848267d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.components.collections; import java.util.Arrays; import java.util.Collections; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -87,4 +87,4 @@ public class CollectionOfComponents extends BaseEnversJPAFunctionalTestCase { final ComponentSetTestEntity entityV1 = getAuditReader().find( ComponentSetTestEntity.class, id2, 1 ); assertEquals( "Expected a component", Collections.singleton( componentV1 ), entityV1.getComps() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java index 06535edb07..df79986de4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; /** * @author Jakob Braeuchi. @@ -68,4 +68,4 @@ public abstract class AbstractCode { } return true; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java index 1af5c90485..f35d950ca6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Jakob Braeuchi. @@ -20,4 +20,4 @@ public class Code extends AbstractCode { public Code(int code) { super( code ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java index 8d77eb5f5f..6e5fc820b5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.components.collections.mappeds import java.util.Arrays; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -89,4 +89,4 @@ public class CollectionOfMappedSuperclassComponentsTest extends BaseEnversJPAFun // The contents of entity.getCompsNotAudited() is unspecified, so no need to test. } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java index 8402861944..e36d04d2c3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.integration.components.collections.mappeds import java.util.HashSet; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; @@ -105,4 +105,4 @@ public class MappedSuperclassComponentSetTestEntity { ", comps=" + comps + '}'; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java index e75c47a4ed..d73fc851ee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; /** * @author Jakob Braeuchi. @@ -66,4 +66,4 @@ public abstract class AbstractEmbeddable { } return true; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java index 8110ed402b..0d6ad8f52f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java @@ -11,7 +11,7 @@ package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; * @author Gail Badner */ -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmbeddableWithDeclaredData extends AbstractEmbeddable { @@ -63,4 +63,4 @@ public class EmbeddableWithDeclaredData extends AbstractEmbeddable { return true; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java index 326751e6a4..c70573f8e7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java index 614c490c2d..8f13094179 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Jakob Braeuchi. @@ -22,4 +22,4 @@ public class EmbeddableWithNoDeclaredData extends AbstractEmbeddable { // Needed for @Embeddable protected EmbeddableWithNoDeclaredData() { } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java index 00a970be6e..11b53c2211 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java index 3ba76699ed..a3b84b66b0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java index 5c20aacacf..095954b413 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java @@ -7,14 +7,14 @@ package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java index 029e6c49b3..44812bcc99 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.components.relations; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java index 8e067cb22d..0a3360b294 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.components.relations; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -99,4 +99,4 @@ public class NotAuditedManyToOneInComponent extends BaseEnversJPAFunctionalTestC assert getAuditReader().find( NotAuditedManyToOneComponentTestEntity.class, mtocte_id1, 1 ).equals( ver1 ); assert getAuditReader().find( NotAuditedManyToOneComponentTestEntity.class, mtocte_id1, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java index 1baa6b7b79..724a756535 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.components.relations; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -106,4 +106,4 @@ public class OneToManyInComponent extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( OneToManyComponentTestEntity.class, otmcte_id1, 2 ).equals( ver2 ); assert getAuditReader().find( OneToManyComponentTestEntity.class, otmcte_id1, 3 ).equals( ver3 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java index 864e1324ef..e2b516591e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumTypeTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.customtype; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java index f1eee0db99..152e721502 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Dates.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.data; import java.util.Arrays; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.test.integration.data.DateTestEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -57,4 +57,4 @@ public class Dates extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( ver1, getAuditReader().find( DateTestEntity.class, id1, 1 ) ); Assert.assertEquals( ver2, getAuditReader().find( DateTestEntity.class, id1, 2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java index ad4f684753..0196631988 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Enums.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.data; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.test.integration.data.EnumTestEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -56,4 +56,4 @@ public class Enums extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( EnumTestEntity.class, id1, 1 ).equals( ver1 ); assert getAuditReader().find( EnumTestEntity.class, id1, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java index 7d2f279da7..4435f650c9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/LobSerializables.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.data; import java.util.Arrays; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.envers.test.integration.data.LobSerializableTestEntity; @@ -68,4 +68,4 @@ public class LobSerializables extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( LobSerializableTestEntity.class, id1, 1 ).equals( ver1 ); assert getAuditReader().find( LobSerializableTestEntity.class, id1, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java index 28c204ef30..0529043007 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/Serializables.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.data; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.test.integration.data.SerObject; import org.hibernate.envers.test.integration.data.SerializableTestEntity; @@ -56,4 +56,4 @@ public class Serializables extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( SerializableTestEntity.class, id1, 1 ).equals( ver1 ); assert getAuditReader().find( SerializableTestEntity.class, id1, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java index 8fb0fc3ee3..51ab78cec8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java @@ -10,7 +10,7 @@ import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java index 8dc5b9cebc..ce85e73d44 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.flush; import java.io.IOException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java index 26c124c005..a33c4884ec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java index 5f9156f1f9..2b29969c73 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java @@ -13,19 +13,19 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java index 9343c80d47..0744f910d8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.flush; import static org.junit.Assert.assertEquals; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java index 8fb3dedf89..958d1bce31 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.orm.test.envers.Priority; @@ -57,4 +57,4 @@ public class DoubleFlushAddDel extends AbstractFlushTest { public void testHistoryOfId() { assert getAuditReader().find( StrTestEntity.class, id, 1 ) == null; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java index 99bc63cf8a..e906925226 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; @@ -88,4 +88,4 @@ public class DoubleFlushAddMod extends AbstractFlushTest { assertEquals( results.get( 0 )[2], RevisionType.ADD ); assertEquals( results.get( 1 )[2], RevisionType.MOD ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java index 5f68adae98..03997b63e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; @@ -85,4 +85,4 @@ public class DoubleFlushModDel extends AbstractFlushTest { assertEquals( results.get( 0 )[2], RevisionType.ADD ); assertEquals( results.get( 1 )[2], RevisionType.DEL ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java index ef881ecfa7..74b8ad30c7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; @@ -86,4 +86,4 @@ public class DoubleFlushModMod extends AbstractFlushTest { assertEquals( results.get( 0 )[2], RevisionType.ADD ); assertEquals( results.get( 1 )[2], RevisionType.MOD ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java index 268d57b7f0..1e04edfbea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java index 887ce7264c..f29dde3b78 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/GeneratedColumnTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.generated; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java index d72ecef0d9..9bf2f08eb2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.generated; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java index 7741a44aba..0ecee1c73f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.hashcode; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -95,4 +95,4 @@ public class ChangingHashcode extends BaseEnversJPAFunctionalTestCase { ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java index aa862e8721..ae2e6b3a83 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java @@ -10,12 +10,12 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java index c60ca1f647..a7268d3ecd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java @@ -11,16 +11,16 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java index cd16a373e2..dac9317908 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java @@ -12,16 +12,16 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java index cadd8cce06..e5f90719d9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.hashcode; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java index 9be675b219..ec145c9ea5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.hashcode; import java.util.HashSet; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java index f95c6ed657..b00b181f8f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.ids; import java.util.Arrays; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -66,4 +66,4 @@ public class CompositeDateId extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( CompositeDateIdTestEntity.class, id1, 1 ).getStr1().equals( "x" ); assert getAuditReader().find( CompositeDateIdTestEntity.class, id1, 2 ).getStr1().equals( "y" ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java index 1ddaa69cf0..00d81b975a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeIds.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.ids; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java index b4caf8857d..f229bbb78a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.ids; import java.util.Arrays; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -65,4 +65,4 @@ public class DateId extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( DateIdTestEntity.class, id1, 1 ).getStr1().equals( "x" ); assert getAuditReader().find( DateIdTestEntity.class, id1, 2 ).getStr1().equals( "y" ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java index f35234b207..fe81c2de23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.ids; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java index 640c1d3448..c65b7c9b2d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.ids.embeddedid; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java index f6c4f0723c..9221d166ef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java index 9b1dfb2c25..8903a9c556 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/EmbeddedIdGenericsTest.java @@ -10,15 +10,15 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java index 58cabf3de0..736c2362c5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.ids.embeddedid; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java index 1bee7fe636..38249e83f5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java index 5bd5e0d335..ca3e7dd513 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -79,4 +79,4 @@ public class Item implements Serializable { public void setPrice(Double price) { this.price = price; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java index df2bd2b32d..d0ab6a0d34 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) @@ -96,4 +96,4 @@ public class ItemId implements Serializable { public void setProducer(Producer producer) { this.producer = producer; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java index bcb3d0c877..bfe56abccc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java index d1c333cbf9..ca33408d84 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -82,4 +82,4 @@ public class Producer implements Serializable { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java index 849193880f..88e7dbf9e7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -112,4 +112,4 @@ public class PurchaseOrder implements Serializable { public void setComment(String comment) { this.comment = comment; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java index 61f3d87cea..53ee4ff483 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java @@ -10,13 +10,13 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java index a08cc525fc..893cc3f2a6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java index b350316846..cf51bc35ab 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java index c9e3cde79c..7a252fd136 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.ids.idclass; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java index 0ed89b243f..00df259bc1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java @@ -12,7 +12,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Arrays; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java index 082de5dfe6..ed8a8eb7ec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassWithRelationTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.ids.idclass; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java index cb282c6fba..66d1c4eed5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.ids.idclass; import org.hibernate.envers.Audited; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.io.Serializable; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java index b715f380ff..71d5cf3003 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.ids.idclass; import org.hibernate.envers.Audited; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java index 9c9c0ae10a..42bfa6682b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.envers.integration.ids.idclass; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java index 0c46f36d53..4d3ba722ea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.ids.protectedmodifier; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java index 7333cf5c81..36d105ff28 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.ids.protectedmodifier; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java index 3ae5d41aef..df247958ac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.ids.protectedmodifier; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class WrappedStringId implements Serializable { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java index 5da455a7ae..fa2e4e56cb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -74,4 +74,4 @@ public class ChildAuditing extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().createQuery().forEntitiesAtRevision( ParentEntity.class, 1 ).getSingleResult() .equals( childVer1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java index 25dbd2f597..80367d139a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -66,4 +66,4 @@ public class ChildEntity extends ParentEntity { public String toString() { return "ChildEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java index f70406e241..3a3977ad34 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ChildNullAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -74,4 +74,4 @@ public class ChildNullAuditing extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().createQuery().forEntitiesAtRevision( ParentEntity.class, 1 ).getSingleResult() .equals( childVer1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java index de068aa670..b6a622d216 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java @@ -9,16 +9,16 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined; import java.util.Arrays; import java.util.List; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java index f67d7a876d..7870cfdc10 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -75,4 +75,4 @@ public class ParentAuditing extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().createQuery().forEntitiesAtRevision( ChildEntity.class, 1 ) .getResultList().size() == 0; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java index 969bd1acab..6700c6e85e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/ParentEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; @@ -82,4 +82,4 @@ public class ParentEntity { public String toString() { return "ParentEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java index b9acf3da00..1e48e325ec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildIngEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -78,4 +78,4 @@ public class ChildIngEntity extends ParentNotIngEntity { public String toString() { return "ChildIngEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java index 4571de0c80..b4f013f0af 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ChildReferencing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -107,4 +107,4 @@ public class ChildReferencing extends BaseEnversJPAFunctionalTestCase { new ReferencedEntity( re_id2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java index e592bc87a6..72dc126afb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ParentNotIngEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; @@ -82,4 +82,4 @@ public class ParentNotIngEntity { public String toString() { return "ParentNotIngEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java index cdffe9f9eb..72b8f8d933 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/childrelation/ReferencedEntity.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.childrelation; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -73,4 +73,4 @@ public class ReferencedEntity { public String toString() { return "ReferencedEntity(id = " + getId() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java index ee9770c908..a490a192db 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.emptychild; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java index 39707405e9..009cbd26e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/EmptyChildEntity.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.emptychild; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java index 36362fe272..ec48b42230 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/emptychild/ParentEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.emptychild; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java index beb561a030..4764fb2c0d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Address.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -87,4 +87,4 @@ public class Address implements Serializable { public String toString() { return "Address(id = " + getId() + ", address1 = " + getAddress1() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java index c679c45e2b..1f88586136 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/Contact.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrel import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -60,4 +60,4 @@ public class Contact implements Serializable { public void setAddresses(Set

          addresses) { this.addresses = addresses; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java index d9f8fe16cb..c1a7a1ea03 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -97,4 +97,4 @@ public class NotOwnedBidirectional extends BaseEnversJPAFunctionalTestCase { TestTools.makeSet( new Address( a1_id, "a1" ), new Address( a2_id, "a2" ) ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java index a34ce5e4dd..7503dc7eb0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/notownedrelation/PersonalContact.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.notownedrelation; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -31,4 +31,4 @@ public class PersonalContact extends Contact { public void setFirstname(String firstname) { this.firstname = firstname; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java index 64c9117aef..d82ce6ab2e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.primarykeyjoin; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -89,4 +89,4 @@ public class ChildPrimaryKeyJoinAuditing extends BaseEnversJPAFunctionalTestCase ).getKey().getColumnIterator().next()).getName() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java index 6c7daa4869..a3fdc93e8d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.primarykeyjoin; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.integration.inheritance.joined.ParentEntity; @@ -72,4 +72,4 @@ public class ChildPrimaryKeyJoinEntity extends ParentEntity { public String toString() { return "CPKJE(id = " + getId() + ", data = " + getData() + ", namVal = " + namVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java index e16351b7de..b5a5026198 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ChildIngEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -66,4 +66,4 @@ public class ChildIngEntity extends ParentIngEntity { public String toString() { return "ChildIngEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java index 5a4fd77802..d9ef51f660 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentIngEntity.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -94,4 +94,4 @@ public class ParentIngEntity { public String toString() { return "ParentIngEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java index bbabbd93b5..82629f733b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ParentReferencingChildTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java index b4b9963026..a9d980abf7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Person.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java index 5674737f2c..bb20df7b2f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/PolymorphicCollection.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -88,4 +88,4 @@ public class PolymorphicCollection extends BaseEnversJPAFunctionalTestCase { TestTools.makeSet( new ParentIngEntity( p_id, "x" ), new ChildIngEntity( c_id, "y", 1l ) ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java index b9214e39b5..1fde6a4e3d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/ReferencedEntity.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -73,4 +73,4 @@ public class ReferencedEntity { public String toString() { return "ReferencedEntity(id = " + getId() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java index 114b1c8d84..6fc1ba6e05 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/RightsSubject.java @@ -8,13 +8,13 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java index d15a387636..a43c57521c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/Role.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java index 256b978714..3f26c248f3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -61,4 +61,4 @@ public abstract class AbstractContainedEntity { public int hashCode() { return id != null ? id.hashCode() : 0; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java index 0d6a7e1df2..e4fbd7662b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.un import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -52,4 +52,4 @@ public abstract class AbstractSetEntity { public void setEntities(Set entities) { this.entities = entities; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java index 92907e7cfe..a7a161287d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -19,4 +19,4 @@ import org.hibernate.envers.Audited; @Table(name = "Contained") @Audited public class ContainedEntity extends AbstractContainedEntity { -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java index 88316e558f..3878997e78 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/SetEntity.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.unidirectional; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -17,4 +17,4 @@ import org.hibernate.envers.Audited; @Entity @Audited public class SetEntity extends AbstractSetEntity { -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java index e9025160a2..b761f98dbe 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.joined.relation.un import java.util.Arrays; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -69,4 +69,4 @@ public class UnidirectionalDoubleAbstract extends BaseEnversJPAFunctionalTestCas assert entities.iterator().next() instanceof ContainedEntity; assert entities.contains( cce1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java index 58bd979848..8ceba61fe0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractActivity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java index 5ec865c8d4..4289e07f42 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/AbstractCheckActivity.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java index 9e03e52fd6..26540af7a5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/ActivityId.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class ActivityId implements Serializable { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java index c51e2de4ca..05f9e4a063 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/CheckInActivity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java index 9ee3f75810..a9028534f5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/mixed/entities/NormalActivity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.mixed.entities; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java index 8162e4492e..9a2f783ce1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.single; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java index c0e4dec35e..30bfb0d210 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -72,4 +72,4 @@ public class ChildEntity extends ParentEntity { public String toString() { return "ChildPrimaryKeyJoinEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java index 58a7b55d6f..ec99c66cd3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.single; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -73,4 +73,4 @@ public class ParentAuditing extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().createQuery().forEntitiesAtRevision( ChildEntity.class, 1 ) .getResultList().size() == 0; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java index 57c3b45ca9..ff2cd53c9c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; @@ -92,4 +92,4 @@ public class ParentEntity { public String toString() { return "ParentEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java index 52571521b6..326c9303e8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -84,4 +84,4 @@ public class ChildIngEntity extends ParentNotIngEntity { public String toString() { return "ChildIngEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java index 4fe4114289..f0fe05376f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -104,4 +104,4 @@ public class ChildReferencing extends BaseEnversJPAFunctionalTestCase { new ReferencedEntity( re_id2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java index 3842b2b272..3ab5555636 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java @@ -6,15 +6,15 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; @@ -92,4 +92,4 @@ public class ParentNotIngEntity { public String toString() { return "ParentNotIngEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java index b9fadf949a..611f1e510e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -70,4 +70,4 @@ public class ReferencedEntity { public int hashCode() { return id; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java index 1ff7d1c25f..ffde53a800 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java index f9a286ca7a..c7b9d9b3a9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula; -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 Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java index f4de968bc4..3d18b12d27 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.discriminat import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java index dda09b86ab..65071acd00 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.DiscriminatorFormula; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java index 5dbfa7314b..2935c4a85a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java index ddc1fa42a8..30486770a9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java @@ -8,21 +8,21 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrel import java.io.Serializable; import java.util.Set; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @DiscriminatorValue("Contact") -@DiscriminatorColumn(name = "contactType", discriminatorType = javax.persistence.DiscriminatorType.STRING) +@DiscriminatorColumn(name = "contactType", discriminatorType = jakarta.persistence.DiscriminatorType.STRING) @Audited public class Contact implements Serializable { @Id diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java index 3b24959049..edcbb7ba74 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -103,4 +103,4 @@ public class NotOwnedBidirectional extends BaseEnversJPAFunctionalTestCase { TestTools.makeSet( new Address( a1_id, "a1" ), new Address( a2_id, "a2" ) ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java index 3140718a23..a9d06e1c85 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java index f4e49bdb01..0d27908bd2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.relation; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -72,4 +72,4 @@ public class ChildIngEntity extends ParentIngEntity { public String toString() { return "ChildIngEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java index c5347b488c..fb1e306fb5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.single.relation; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -104,4 +104,4 @@ public class ParentIngEntity { public String toString() { return "ParentIngEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java index 509c295023..b5de873aef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -84,4 +84,4 @@ public class PolymorphicCollection extends BaseEnversJPAFunctionalTestCase { TestTools.makeSet( new ParentIngEntity( p_id, "x" ), new ChildIngEntity( c_id, "y", 1l ) ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java index 5d19c598a7..98448112e8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java @@ -9,17 +9,17 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import java.util.Arrays; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java index a0cff87666..84fe0b8ba5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java index ec18306533..26bf714143 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -74,4 +74,4 @@ public class ChildAuditing extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().createQuery().forEntitiesAtRevision( ParentEntity.class, 1 ).getSingleResult() .equals( childVer1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java index 7386e01ad3..538be3a838 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -66,4 +66,4 @@ public class ChildEntity extends ParentEntity { public String toString() { return "ChildPrimaryKeyJoinEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java index df0b0376fd..9f19e09918 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -75,4 +75,4 @@ public class ParentAuditing extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().createQuery().forEntitiesAtRevision( ChildEntity.class, 1 ) .getResultList().size() == 0; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java index fa2df21d7e..e4175c5c68 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; @@ -82,4 +82,4 @@ public class ParentEntity { public String toString() { return "ParentEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java index 9e931a39ca..8990cdbc94 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java index bda79571b8..ca6eddc5a6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java index 25a8d7ee2b..f24f085a38 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java index 77bf3bba56..a3e003920f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -78,4 +78,4 @@ public class ChildIngEntity extends ParentNotIngEntity { public String toString() { return "ChildIngEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java index 1e60aab5d5..035caf2f09 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ChildReferencing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -107,4 +107,4 @@ public class ChildReferencing extends BaseEnversJPAFunctionalTestCase { new ReferencedEntity( re_id2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java index 0bd3068315..3926807685 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.envers.Audited; @@ -82,4 +82,4 @@ public class ParentNotIngEntity { public String toString() { return "ParentNotIngEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java index 73e32cf39f..267fd873f4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.childrelation; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -73,4 +73,4 @@ public class ReferencedEntity { public String toString() { return "ReferencedEntity(id = " + getId() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java index 6e0f1621bb..91829a85e8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -87,4 +87,4 @@ public class Address implements Serializable { public String toString() { return "Address(id = " + getId() + ", address1 = " + getAddress1() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java index ae10fe0d7a..ee169173f8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.noto import java.io.Serializable; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -60,4 +60,4 @@ public class Contact implements Serializable { public void setAddresses(Set
          addresses) { this.addresses = addresses; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java index e86357fba3..9535a96dcb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -97,4 +97,4 @@ public class NotOwnedBidirectional extends BaseEnversJPAFunctionalTestCase { TestTools.makeSet( new Address( a1_id, "a1" ), new Address( a2_id, "a2" ) ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java index e9191933b0..0a31492690 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -31,4 +31,4 @@ public class PersonalContact extends Contact { public void setFirstname(String firstname) { this.firstname = firstname; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java index e9d6cd39a8..381c1aff17 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; -import javax.persistence.Basic; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; @@ -66,4 +66,4 @@ public class ChildIngEntity extends ParentIngEntity { public String toString() { return "ChildIngEntity(id = " + getId() + ", data = " + getData() + ", numVal = " + numVal + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java index b8cab2c3fe..dd3a70bfbd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -94,4 +94,4 @@ public class ParentIngEntity { public String toString() { return "ParentIngEntity(id = " + getId() + ", data = " + getData() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java index 7e74cb46cd..d6f184bf43 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -88,4 +88,4 @@ public class PolymorphicCollection extends BaseEnversJPAFunctionalTestCase { TestTools.makeSet( new ParentIngEntity( p_id, "x" ), new ChildIngEntity( c_id, "y", 1l ) ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java index 9883970ca9..c5700ca70f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -73,4 +73,4 @@ public class ReferencedEntity { public String toString() { return "ReferencedEntity(id = " + getId() + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java index b766146421..9a2e36af9a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.interfaces.components; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Adam Warski (adam at warski dot org) @@ -59,4 +59,4 @@ public class Component1 implements IComponent { "data='" + data + '\'' + '}'; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java index d551b3f41a..1aa3ccc79d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.interfaces.components; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Target; import org.hibernate.envers.Audited; @@ -88,4 +88,4 @@ public class ComponentTestEntity { ", comp1=" + comp1 + '}'; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java index f0874da111..fedc30e4cf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.interfaces.components; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -76,4 +76,4 @@ public class InterfacesComponents extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( ComponentTestEntity.class, id1, 2 ).equals( ver2 ); assert getAuditReader().find( ComponentTestEntity.class, id1, 3 ).equals( ver3 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java index 6b9baad76d..bd9ea976da 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java index cb184ca322..ac3a9fb657 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java index 558883f928..de5cafb2e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java index 3649d88f9b..c334fbae3f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.interfaces.relation; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -96,4 +96,4 @@ public class InterfacesRelation extends BaseEnversJPAFunctionalTestCase { assert rev2.getReference().equals( ed1 ); assert rev3.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java index 4c5de681dc..fcca754ddf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.interfaces.relation; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -82,4 +82,4 @@ public class SetRefEdEntity implements ISetRefEdEntity { public String toString() { return "SetRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java index 358076410e..62f07861e1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.interfaces.relation; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -102,4 +102,4 @@ public class SetRefIngEntity { public String toString() { return "SetRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java index 46babb328e..f330b5f8b7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java @@ -10,13 +10,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java index 83ef12fe40..6710f07b40 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java @@ -11,16 +11,16 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.cfg.AvailableSettings; import org.hibernate.envers.AuditJoinTable; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java index 165fa43cc2..edfc2a8768 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.jta; import java.util.Map; -import javax.persistence.EntityManager; -import javax.transaction.RollbackException; +import jakarta.persistence.EntityManager; +import jakarta.transaction.RollbackException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java index 2b3517505f..7be3e91a38 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.jta; import java.util.Arrays; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java index f92c3d183e..b6d89034d6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.jta; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java index 9f252f490b..2154e64be6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.envers.integration.jta; import java.lang.reflect.Field; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Transaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; import org.hibernate.action.spi.BeforeTransactionCompletionProcess; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java index c627610d10..b93f173348 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java index a4f7f4c10f..ba49d4af91 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.manytomany; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -198,4 +198,4 @@ public class BasicList extends BaseEnversJPAFunctionalTestCase { assert TestTools.checkCollection( rev4.getReferences(), ed1, ed2 ); assert TestTools.checkCollection( rev5.getReferences(), ed1, ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java index 39ddf62d5d..efc98d6069 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.manytomany; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -167,4 +167,4 @@ public class BasicMap extends BaseEnversJPAFunctionalTestCase { assert rev2.getReferences().equals( TestTools.makeMap( "2", ed1 ) ); assert rev3.getReferences().equals( TestTools.makeMap( "1", ed2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java index 4e2ae0c788..3ccedb11a2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.manytomany; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -193,4 +193,4 @@ public class BasicSet extends BaseEnversJPAFunctionalTestCase { assert rev4.getReferences().equals( TestTools.makeSet( ed1, ed2 ) ); assert rev5.getReferences().equals( TestTools.makeSet( ed1, ed2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java index c98bca8783..e4c378c914 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java @@ -11,7 +11,7 @@ import java.util.Iterator; import java.util.Map; import java.util.SortedMap; import java.util.SortedSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java index ef4a0e5d48..5569f369db 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.manytomany; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java index 763cca2e0f..98d574e1c0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java @@ -11,12 +11,12 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java index cd4d237624..f477180f78 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java @@ -10,10 +10,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java index cdc484d928..98fae444d9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.biowned; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -206,4 +206,4 @@ public class BasicBiowned extends BaseEnversJPAFunctionalTestCase { assert TestTools.checkCollection( rev4.getReferences(), o1_2 ); assert TestTools.checkCollection( rev5.getReferences(), o1_1, o1_2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java index f318d3037e..2831411a0b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass; import java.util.ArrayList; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java index 67233a7752..f579c8ca91 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.sametable; import java.sql.Types; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -295,4 +295,4 @@ public class BasicSametable extends BaseEnversJPAFunctionalTestCase { assert TestTools.checkCollection( rev4.getParents(), p1, p2 ); assert TestTools.checkCollection( rev5.getParents(), p1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java index 9865d00258..bc6d58e445 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.ternary; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.HSQLDialect; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -184,4 +184,4 @@ public class TernaryMap extends BaseEnversJPAFunctionalTestCase { assert rev3.getMap().equals( TestTools.makeMap( int2, str1 ) ); assert rev4.getMap().equals( TestTools.makeMap( int1, str2, int2, str1 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java index c7bbefa4e2..c7a2399fb9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.envers.integration.manytomany.ternary; import java.util.HashMap; import java.util.Map; -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; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.IntTestPrivSeqEntity; @@ -28,7 +28,7 @@ public class TernaryMapEntity { @Audited @ManyToMany - @javax.persistence.MapKeyJoinColumn + @jakarta.persistence.MapKeyJoinColumn private Map map; public TernaryMapEntity() { @@ -75,4 +75,4 @@ public class TernaryMapEntity { public String toString() { return "TME(id = " + id + ", map = " + map + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java index 89c509782f..c152ef9ae2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.ternary; import java.util.Arrays; import java.util.HashMap; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.HSQLDialect; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -129,4 +129,4 @@ public class TernaryMapFlush extends BaseEnversJPAFunctionalTestCase { assertEquals( rev2.getMap(), TestTools.makeMap( int1, str1, int2, str2 ) ); assertEquals( rev3.getMap(), TestTools.makeMap( int2, str1 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java index 7c21025b3a..307fe13e0e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -157,4 +157,4 @@ public class BasicUniList extends BaseEnversJPAFunctionalTestCase { assert TestTools.checkCollection( rev4.getReferences(), ed1, ed2 ); assert TestTools.checkCollection( rev5.getReferences(), ed1, ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java index 85beec4e32..ab68d58a27 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.HashMap; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -119,4 +119,4 @@ public class BasicUniMap extends BaseEnversJPAFunctionalTestCase { assert "coll1".equals( rev3.getData() ); assert "coll1".equals( rev4.getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java index a1d9e74640..3e49b9d6a4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -157,4 +157,4 @@ public class BasicUniSet extends BaseEnversJPAFunctionalTestCase { assert rev4.getReferences().equals( TestTools.makeSet( ed1, ed2 ) ); assert rev5.getReferences().equals( TestTools.makeSet( ed1, ed2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java index e31a455c31..b83e299a09 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java index 5026fb58e7..61c62c151f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java index 8592782bac..f3f4673aea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java index 8183d7bbb3..6635e05115 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java @@ -10,11 +10,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java index 87c4e3031f..a0874a5ac9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java @@ -10,15 +10,15 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java index 6a44a0dc1b..737532ba7c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefedOptionalEntity.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.manytoone.bidirectional; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java index c840928a98..07045205d2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BiRefingOptionalEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.integration.manytoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java index 83836b3a57..ab71f22f2a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.manytoone.bidirectional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java index 69b11dc67e..c64335dd5e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ImplicitMappedByTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.manytoone.bidirectional; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -113,4 +113,4 @@ public class ImplicitMappedByTest extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( owning3, ver3 ); Assert.assertEquals( owned.getId(), ver3.getReferences().getId() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java index 1b7b419db2..80ee85a753 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/ManyToOneOwning.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.integration.manytoone.bidirectional; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java index 76a1915b34..e5f0df3bbe 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/OneToManyOwned.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.manytoone.bidirectional; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java index 7ddd95b4c6..99a5b77dc3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/LeafLayer.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.envers.integration.manytoone.foreignkey; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java index 94018d4d82..5098cf5bdd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/MiddleLayer.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.envers.integration.manytoone.foreignkey; import java.time.LocalDate; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java index 00c8e4e795..d16c108f41 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/foreignkey/RootLayer.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.manytoone.foreignkey; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java index 72e3bbbcd9..f257e27b6f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.manytoone.unidirectional; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Hibernate; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java index 3c17e4eee2..8b400c48cc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.merge; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.AuditTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java index cad91dddd3..e80517cd3f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java index b5461cca03..3bd367b14b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAPITest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java index 063742e498..c7eedbebb0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java index b4839d25c4..708d32fa80 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectional2.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; @@ -110,4 +110,4 @@ public class HasChangedBidirectional2 extends AbstractModifiedFlagsEntityTest { assertEquals( 1, list.size() ); assertEquals( makeList( 4 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java index 1cf54b222d..e409fb10ba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java @@ -10,11 +10,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java index 9311cb0a23..153efcb03a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity1; @@ -105,4 +105,4 @@ public class HasChangedComponentCollection extends AbstractModifiedFlagsEntityTe assertEquals( 3, list.size() ); assertEquals( makeList( 1, 2, 6 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java index d1c1035c49..9a0136241d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.components.Component1; @@ -121,4 +121,4 @@ public class HasChangedComponentMapKey extends AbstractModifiedFlagsEntityTest { list = queryForPropertyHasNotChanged( ComponentTestEntity.class, cte2_id, "comp1" ); assertEquals( 0, list.size() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java index 10f08d613a..cba4bdadda 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.components.Component1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java index ec49959001..9230564f1d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.OracleDialect; import org.hibernate.orm.test.envers.Priority; @@ -153,4 +153,4 @@ public class HasChangedDetachedMultipleCollection extends AbstractModifiedFlagsE assertEquals( 1, list.size() ); assertEquals( makeList( 5 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java index b7d6ec8936..365eaaecf6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity1; @@ -272,4 +272,4 @@ public class HasChangedDoubleJoinColumnBidirectionalList extends AbstractModifie ); assertEquals( 0, list.size() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java index eb47ba7814..ab28ee89ad 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedEnumSet.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity; @@ -104,4 +104,4 @@ public class HasChangedEnumSet extends AbstractModifiedFlagsEntityTest { assertEquals( 2, list.size() ); assertEquals( makeList( 2, 3 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java index bf601052e2..f560438b5b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedForDefaultNotUsing.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -276,4 +276,4 @@ public class HasChangedForDefaultNotUsing extends AbstractModifiedFlagsEntityTes assertEquals( makeList( 1, 11 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java index fbaf14e1a6..ae92110736 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -84,4 +84,4 @@ public class HasChangedIdMapKey extends AbstractModifiedFlagsEntityTest { ); assertEquals( 0, list.size() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java index f0d985a56a..6b27634936 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java index 055acd3c30..24f133a660 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java index f0a7b3b340..21c677f5e8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java index 504811ab71..b72f6ca83f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.onetomany.ListRefEdEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java index c43ae89a95..e0ecbcab6d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.Priority; @@ -99,4 +99,4 @@ public class HasChangedNullProperties extends AbstractModifiedFlagsEntityTest { assertEquals( 1, list.size() ); assertEquals( makeList( 1 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java index acb4be0565..cc634400af 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -89,4 +89,4 @@ public class HasChangedOneToManyInComponent extends AbstractModifiedFlagsEntityT ); assertEquals( 0, list.size() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java index ddeffbccc5..a119b54768 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.collection.StringMapEntity; @@ -116,4 +116,4 @@ public class HasChangedStringMap extends AbstractModifiedFlagsEntityTest { ); assertEquals( 0, list.size() ); // in rev 2 there was no version generated for sme2_id } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java index 6915269fcb..1c4716454d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.entities.collection.StringSetEntity; @@ -108,4 +108,4 @@ public class HasChangedStringSet extends AbstractModifiedFlagsEntityTest { ); assertEquals( 0, list.size() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java index 0734117771..727d4904c6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.Priority; import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity2; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java index da6e50b46c..a8041386a8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; @@ -92,4 +92,4 @@ public class ModifiedFlagSuffix extends AbstractModifiedFlagsEntityTest { assertEquals( 1, list.size() ); assertEquals( makeList( 1 ), extractRevisionNumbers( list ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java index 8961fd921f..fccd5926ef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.modifiedflags.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java index 6fd4c4d312..9303bf3351 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java @@ -10,16 +10,16 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java index 06ace8b442..4f3483cf31 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java @@ -9,16 +9,16 @@ package org.hibernate.orm.test.envers.integration.modifiedflags.entities; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java index e8a33e126e..36faca5bb6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.envers.integration.modifiedflags.entities; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java index e831558d57..b281375a94 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.modifiedflags.entities; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java index 4f9db0a78b..6942246306 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.modifiedflags.naming; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java index d59eff05c8..92bd401248 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/OtherEntityId.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.modifiedflags.naming; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java index 51c357a13c..0ed85d4e36 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/SingleIdEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.modifiedflags.naming; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java index be7841fdfc..30b1396227 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEmbeddable.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.modifiedflags.naming; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java index ae94ab8e6b..80fd1cb24c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/naming/TestEntity.java @@ -6,17 +6,17 @@ */ package org.hibernate.orm.test.envers.integration.modifiedflags.naming; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java index d386e48db9..f96028b574 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java @@ -9,13 +9,13 @@ package org.hibernate.orm.test.envers.integration.multiplerelations; import java.io.Serializable; 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.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java index c3403b121d..58445d5dd7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java @@ -11,15 +11,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Query; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Query; import org.hibernate.Session; import org.hibernate.envers.AuditMappedBy; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java index dec760238d..4db0c9458d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.multiplerelations; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java index b0297be200..170c298bb4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java @@ -9,14 +9,14 @@ package org.hibernate.orm.test.envers.integration.multiplerelations; import java.io.Serializable; 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.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java index f626c3d8df..5976440233 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java index facbb8ea8b..b4461b9fe5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java index b2d018ada8..cc315750fc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -60,4 +60,4 @@ public class EstonianTableAlias extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( parent, ver1 ); Assert.assertEquals( TestTools.makeSet( child ), ver1.getCollection() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java index b77741bb7e..461f67b44c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -118,4 +118,4 @@ public class JoinNaming extends BaseEnversJPAFunctionalTestCase { assertEquals( "jnree_column_reference", columns.next().getText() ); assertFalse( columns.hasNext() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java index 17031e0b5a..a9a40c6dc4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -100,4 +100,4 @@ public class JoinNamingRefEdEntity { public String toString() { return "JoinNamingRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java index 90e72034cf..a7444f99d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -103,4 +103,4 @@ public class JoinNamingRefIngEntity { public String toString() { return "JoinNamingRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java index 1c9967d8fd..6cea98aebc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.AuditTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java index 93512e7037..1b274af116 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.envers.AuditTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java index 0eccc5b352..687a83615f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java index c244a1fe01..e354f772bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -118,4 +118,4 @@ public class VersionsJoinTableNaming extends BaseEnversJPAFunctionalTestCase { assert id1Found && id2Found; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java index e13230dcc9..03a9e468d5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java index 6fbb94c4d4..9ea10de1a8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java @@ -6,16 +6,16 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.AssociationOverride; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java index 7a46b29051..be7f8f99ad 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * Alternate implementation of mapped superclass for Audit join table test. diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java index ec2729b259..73866cda63 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * Concrete implementation of mapped superclass for Audit join table test. diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java index c293ae17cd..9f306faa8d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.naming; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Mapped superclass for Audit join table test. diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java index 608bce8280..23bf3fa3aa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.naming; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; @@ -101,4 +101,4 @@ public class VersionsJoinTableTestEntity { public String toString() { return "VersionsJoinTableTestEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java index d70cf325a3..bf60b1c07f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.naming.ids; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** * @author Adam Warski (adam at warski dot org) @@ -75,4 +75,4 @@ public class EmbIdNaming implements Serializable { public String toString() { return "EmbIdNaming(" + x + ", " + y + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java index c5e2211c6b..996bcadd56 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java index 7c92db86eb..e89a36ef07 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -100,4 +100,4 @@ public class JoinEmbIdNamingRefEdEntity { public String toString() { return "JoinEmbIdNamingRefEdEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java index 203d6298ba..a1f39472bd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.envers.integration.naming.ids; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -107,4 +107,4 @@ public class JoinEmbIdNamingRefIngEntity { public String toString() { return "JoinEmbIdNamingRefIngEntity(id = " + id + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java index 7f38680746..06b6cffaa5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -140,4 +140,4 @@ public class JoinMulIdNaming extends BaseEnversJPAFunctionalTestCase { assertEquals( "ID2_reference", columns.next().getText() ); assertFalse( columns.hasNext() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java index 10120ff0a4..40ec08968f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -116,4 +116,4 @@ public class JoinMulIdNamingRefEdEntity { public String toString() { return "JoinMulIdNamingRefEdEntity(id1 = " + id1 + ", id2 = " + id2 + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java index 7a99dee8c3..a14b500645 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.envers.integration.naming.ids; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; @@ -115,4 +115,4 @@ public class JoinMulIdNamingRefIngEntity { public String toString() { return "JoinMulIdNamingRefIngEntity(id1 = " + id1 + ", id2 = " + id2 + ", data = " + data + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java index 99edaab7b4..dca7a72b70 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.naming.ids; import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; /** * @author Adam Warski (adam at warski dot org) @@ -73,4 +73,4 @@ public class MulIdNaming implements Serializable { public String toString() { return "MulIdNaming(" + id1 + ", " + id2 + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java index 3f53f7a1c5..453ee46078 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.naming.quotation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java index 4cd6f9f90f..466ce36c79 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.naming.quotation; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java index 5ac4bee937..7507e10711 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/EntityResultNativeQueryTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.nativequery; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java index 89ea6efd27..4a9f089803 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SecondSimpleEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.nativequery; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java index 9a311e8209..ed556f9ad2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/nativequery/SimpleEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.nativequery; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java index 58cb822cf6..ce4c4c70ac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Account.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.naturalid; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java index a00b46f35c..d8c5496a72 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Customer.java @@ -12,11 +12,11 @@ import java.util.Collection; 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.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.envers.Audited; @@ -131,4 +131,4 @@ public class Customer implements Serializable { ", devices=" + devices + '}'; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java index af53cb5673..8f86bfc73f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/Device.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.naturalid; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java index 80119868de..a057c7c356 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naturalid/JoinColumnNaturalIdTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.naturalid; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java index fbc415cb91..31ea8021ef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.notinsertable; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -54,4 +54,4 @@ public class NotInsertable extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( NotInsertableTestEntity.class, id1, 1 ).equals( ver1 ); assert getAuditReader().find( NotInsertableTestEntity.class, id1, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java index c3e32fe465..f1a6676ac1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.notinsertable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -96,4 +96,4 @@ public class NotInsertableTestEntity { result = 31 * result + (dataCopy != null ? dataCopy.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java index c3369cec0e..ad14577f2f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.notinsertable.manytoone; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java index a487a5bdd6..401fd9e7cf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.orm.test.envers.integration.notinsertable.manytoone; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java index c4a671f45e..df11d109ed 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.notinsertable.manytoone; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java index b3eca71556..b7b636ba5a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableEntity.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.notupdatable; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java index c90a3ff473..919c067f3f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notupdatable/PropertyNotUpdatableTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.notupdatable; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java index 03f8752010..e628b467e0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -169,4 +169,4 @@ public class BasicCollection extends BaseEnversJPAFunctionalTestCase { assert rev2.getReference().equals( ed1 ); assert rev3.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java index 26e1c11d62..f117204eab 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -147,4 +147,4 @@ public class BasicList extends BaseEnversJPAFunctionalTestCase { assert rev2.getReference().equals( ed1 ); assert rev3.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java index 806f142571..eaaca086df 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java index 05c788f6bc..eeacc457a8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -157,4 +157,4 @@ public class BasicSetWithEmbId extends BaseEnversJPAFunctionalTestCase { assert rev2.getReference().equals( ed1 ); assert rev3.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java index 043d539c59..4df1c3aea7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -157,4 +157,4 @@ public class BasicSetWithMulId extends BaseEnversJPAFunctionalTestCase { assert rev2.getReference().equals( ed1 ); assert rev3.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java index 612d527b12..830806da10 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java index 812cf18b10..a1131459a5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -90,4 +90,4 @@ public class BidirectionalMapKey extends BaseEnversJPAFunctionalTestCase { assert rev1.getIdmap().equals( TestTools.makeMap( "a", ing1 ) ); assert rev2.getIdmap().equals( TestTools.makeMap( "a", ing1, "b", ing2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java index aafedc0566..1684731443 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java @@ -9,11 +9,11 @@ package org.hibernate.orm.test.envers.integration.onetomany; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java index 09956dbe6e..08c4a2411f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java @@ -10,7 +10,7 @@ package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -88,4 +88,4 @@ public class InverseSideChanges extends BaseEnversJPAFunctionalTestCase { assert rev2.getReference() == null; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java index 6b360a9395..7bb7fc6b71 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java @@ -10,11 +10,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java index faf55a5352..adad8c86ff 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.integration.onetomany; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKey; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -74,4 +74,4 @@ public class RefEdMapKeyEntity { public String toString() { return "RedMKE(id = " + id + ", idmap = " + idmap + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java index 9f034d904b..0a209bc792 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.onetomany; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -77,4 +77,4 @@ public class RefIngMapKeyEntity { public String toString() { return "RingMKE(id = " + id + ", data = " + data + ", reference = " + reference + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java index 27df5a7ada..2123ea0a2f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -119,4 +119,4 @@ public class BasicDetachedList extends BaseEnversJPAFunctionalTestCase { assert "coll1".equals( rev3.getData() ); assert "coll1".equals( rev4.getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java index 0c62058583..eebaa0b1f6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java index d1b9705fea..4bf00ae608 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -123,4 +123,4 @@ public class BasicDetachedSetWithEmbId extends BaseEnversJPAFunctionalTestCase { assert "coll1".equals( rev3.getData() ); assert "coll1".equals( rev4.getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java index 076d7e6fe8..8d1b40866a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -123,4 +123,4 @@ public class BasicDetachedSetWithMulId extends BaseEnversJPAFunctionalTestCase { assert "coll1".equals( rev3.getData() ); assert "coll1".equals( rev4.getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java index af295a3427..c0648bd132 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -128,4 +128,4 @@ public class BasicJoinColumnSet extends BaseEnversJPAFunctionalTestCase { assert "coll1".equals( rev3.getData() ); assert "coll1".equals( rev4.getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java index e32263ec9b..56c30f0777 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -88,4 +88,4 @@ public class DataChangesDetachedSet extends BaseEnversJPAFunctionalTestCase { assert "coll1".equals( rev1.getData() ); assert "coll2".equals( rev2.getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java index 6fd26aa9c0..3158ff962c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -117,4 +117,4 @@ public class DoubleDetachedSet extends BaseEnversJPAFunctionalTestCase { assert rev2.getCollection2().equals( TestTools.makeSet( str2 ) ); assert rev3.getCollection2().equals( TestTools.makeSet( str1, str2 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java index b1b0883481..b44312ecc6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -484,4 +484,4 @@ public class DoubleJoinColumnBidirectionalList extends BaseEnversJPAFunctionalTe assertEquals( rev3.getData(), "ed2_2 bis" ); assertEquals( rev4.getData(), "ed2_2 bis" ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java index c76ebac3fa..13c3dc0042 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -382,4 +382,4 @@ public class IndexedJoinColumnBidirectionalList extends BaseEnversJPAFunctionalT assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) ); assertEquals( rev4.getPosition(), Integer.valueOf( 1 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java index c170637f57..308d249929 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -386,4 +386,4 @@ public class InheritanceIndexedJoinColumnBidirectionalList extends BaseEnversJPA assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) ); assertEquals( rev4.getPosition(), Integer.valueOf( 1 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java index d38cda44d3..9cd148145c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java index 09ddb50890..212cffe1c7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -226,4 +226,4 @@ public class JoinColumnBidirectionalListWithInheritance extends BaseEnversJPAFun assertTrue( rev2.getOwner().equals( ing1 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java index 81b73e4199..aac6ccfd0f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java index 29635a8ad1..873fc009eb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/MapsIdTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -165,4 +165,4 @@ public class MapsIdTest extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( personCVer2, person ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java index 6ccff63899..1292844fcd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java @@ -11,21 +11,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java index a671c2ef94..d72e4f78ac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -110,4 +110,4 @@ public class Person implements Serializable { public void setPersonATuples(Set personATuples) { this.personATuples = personATuples; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java index e225d3360b..549d5145c2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; import org.hibernate.envers.Audited; @@ -197,4 +197,4 @@ public class PersonTuple implements Serializable { public void setHelloWorld(boolean helloWorld) { this.helloWorld = helloWorld; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java index d8d2c132ab..ef107d213e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/HierarchyTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.hierarchy; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -110,4 +110,4 @@ public class HierarchyTest extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( parent.getId(), ver2.getParent().getId() ); Assert.assertEquals( parent.getData(), ver2.getParent().getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java index 655cf10f9c..102e0715d1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/hierarchy/Node.java @@ -9,15 +9,15 @@ package org.hibernate.orm.test.envers.integration.onetomany.hierarchy; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java index 438f3a12b4..70d811d4e1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.integration.onetomany.idclass; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java index 70fa14b500..5cec424410 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.onetomany.idclass; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java index 6ba5bf0cc9..231a6201eb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.integration.onetomany.idclass; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java index 872a7e04cd..e86838a35f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass; import java.util.ArrayList; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java index 135405ed30..8e5230c6e0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.onetomany.relatedid; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java index 976311ff6b..641561bf28 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java @@ -9,10 +9,10 @@ package org.hibernate.orm.test.envers.integration.onetomany.relatedid; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java index e1ab9c2458..5f410f6e69 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.onetomany.relatedid; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java index 5bdb8c7f26..4a8b8262e4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java index 8455aa119b..68b841f251 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java index 261eedfc74..6cc080379c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java index 094fb340bb..a74b2eb30c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java @@ -6,12 +6,12 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java index e7d920722d..7ed4a4a7d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -96,4 +96,4 @@ public class Bidirectional extends BaseEnversJPAFunctionalTestCase { assert rev1.getReferencing() == null; assert rev2.getReferencing().equals( ing1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java index ebd95f74c8..e1d2052147 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -131,4 +131,4 @@ public class Bidirectional2 extends BaseEnversJPAFunctionalTestCase { assert rev3.getReferencing() == null; assert rev4.getReferencing().equals( ing1 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java index 1fb61a0595..91e3c85142 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -61,4 +61,4 @@ public class BidirectionalEagerAnnotationTest extends BaseEnversJPAFunctionalTes getAuditReader().find( BidirectionalEagerAnnotationRefIngOneToOne.class, refIngId1, 1 ); assertNotNull( referencing.getRefedOne().getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java index f27588f24c..c11d848d7a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -55,4 +55,4 @@ public class BidirectionalEagerHbmTest extends BaseEnversJPAFunctionalTestCase { getAuditReader().find( BidirectionalEagerHbmRefIngPK.class, refIngId1, 1 ); assertNotNull( referencing.getReference().getData() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java index bb7ef0fdda..d8adf48503 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java index 25ec7ca499..04358c0c5f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.EmbId; @@ -92,4 +92,4 @@ public class BiEmbIdRefEdEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java index cc1a615fa6..e6b36285d2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.EmbId; @@ -92,4 +92,4 @@ public class BiEmbIdRefIngEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java index 08e43ab3e7..e451b4a075 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.MulId; @@ -104,4 +104,4 @@ public class BiMulIdRefEdEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java index 1c89491040..31bd0c343f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.MulId; @@ -104,4 +104,4 @@ public class BiMulIdRefIngEntity { result = 31 * result + (data != null ? data.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java index a8f65433c5..f15640876c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -107,4 +107,4 @@ public class EmbIdBidirectional extends BaseEnversJPAFunctionalTestCase { assert rev1.getReference().equals( ed1 ); assert rev2.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java index 98d6b23438..e22308a63e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -107,4 +107,4 @@ public class MulIdBidirectional extends BaseEnversJPAFunctionalTestCase { assert rev1.getReference().equals( ed1 ); assert rev2.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java index 669fe2c452..7df1777196 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java index 8187bf5bf0..8730af72b6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; @@ -114,4 +114,4 @@ public class AccountNotAuditedOwners implements Serializable { public void setType(String type) { this.type = type; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java index 6737d3764d..adec998ce1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java @@ -7,12 +7,12 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java index 3f0c2d0879..d8209b15bf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java @@ -7,13 +7,13 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java index 74cdfe5799..8e0c674c5f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java index 475f0f2a90..1bd82959aa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java @@ -7,11 +7,11 @@ package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java index 81d4cae665..aa470e4496 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java index 81615c2363..073ff2e545 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java index 79d50ec9ec..91894454c9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.ids.EmbIdTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java index a100c199b5..d9e71e3955 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java index dee5d9010b..404f959cc6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -62,4 +62,4 @@ public class UnidirectionalMulIdWithNulls extends BaseEnversJPAFunctionalTestCas assertNotNull( notNullRef.getReference() ); assertEquals( notNullRef.getReference(), eite ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java index 99aa93712d..1906875650 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -116,4 +116,4 @@ public class UnidirectionalWithNulls extends BaseEnversJPAFunctionalTestCase { assert rev2.getReference() == null; assert rev3.getReference().equals( ed2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java index 846460b4b5..29dc1b7b61 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.primitive; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -79,4 +79,4 @@ public class PrimitiveAddDelete extends BaseEnversJPAFunctionalTestCase { assert entities.get( 1 ).equals( new PrimitiveTestEntity( id1, 20, 0 ) ); assert entities.get( 2 ).equals( new PrimitiveTestEntity( id1, 0, 0 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java index e225070df4..202e9a66e7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.properties; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -78,4 +78,4 @@ public class PropertiesTestEntity { result = 31 * result + (str != null ? str.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java index 4c37f8e05e..3b5dd2ba52 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.properties; import java.util.Arrays; import java.util.Iterator; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java index 9fa1d94511..a440be3f89 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.properties; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java index 47b79ab2cb..ad9fa5b2da 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.properties; import java.util.Arrays; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -65,4 +65,4 @@ public class VersionsProperties extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( PropertiesTestEntity.class, id1, 1 ).equals( ver1 ); assert getAuditReader().find( PropertiesTestEntity.class, id1, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java index 7eba933d0d..5a575b9365 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.proxy; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java index 293cb77a7a..caae5292ad 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.proxy; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java index d9db5d2a2c..224bf65ed4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Hibernate; import org.hibernate.dialect.HSQLDialect; @@ -601,4 +601,4 @@ public class RemovedObjectQueryTest extends BaseEnversJPAFunctionalTestCase { private Number getRevisionNumber(Object revisionEntity) { return ((SequenceIdRevisionEntity) revisionEntity).getId(); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java index c664d2d38d..2afef84407 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java @@ -11,9 +11,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java index 88d5160743..e358c1b819 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -168,4 +168,4 @@ public class AggregateQuery extends BaseEnversJPAFunctionalTestCase { } Assert.fail(); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java index 8ce0ad18f1..1af6b13a69 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java @@ -8,10 +8,10 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.criteria.JoinType; import org.hibernate.envers.Audited; import org.hibernate.envers.query.AuditEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java index 71d48de333..60f802e71a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java @@ -11,8 +11,8 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.JoinType; import org.hibernate.envers.AuditReader; import org.hibernate.envers.query.AuditEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java index 2cb98bb34c..5d75dc2f23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -106,4 +106,4 @@ public class CustomRevEntityQuery extends BaseEnversJPAFunctionalTestCase { assert ((CustomRevEntity) result.get( 0 )[1]).getCustomId() == 2; assert ((CustomRevEntity) result.get( 0 )[1]).getCustomTimestamp() >= timestamp; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java index be3447bc9a..62c8245dbf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java index ea482f1bdc..4fe2b96bd6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToOne; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.criteria.JoinType; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java index f48396ef2a..a9d1797834 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; @@ -200,4 +200,4 @@ public class MaximalizePropertyQuery extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( revision, ((SequenceIdRevisionEntity) result[1]).getId() ); Assert.assertEquals( type, result[2] ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java index 95f0f8dfd0..52fe03baa1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.query; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java index 799827ae9a..151533c39d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.query; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -117,4 +117,4 @@ public class NullPropertyQuery extends BaseEnversJPAFunctionalTestCase { assert ver.getId().equals( idReferenceToParentNotNull ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java index 763410f7ea..386ad52470 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; @@ -201,4 +201,4 @@ public class RevisionConstraintQuery extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( 1, results.size() ); Assert.assertEquals( new StrIntTestEntity( "a", 10, id1 ), results.get( 0 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java index f48fd82925..04dc515733 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java index c8458d0d34..18d774d188 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.EnversSettings; @@ -130,4 +130,4 @@ public class StoreDeletedData extends BaseEnversJPAFunctionalTestCase { Assert.assertEquals( 3, ((SequenceIdRevisionEntity) result2[1]).getId() ); Assert.assertEquals( RevisionType.ADD, result2[2] ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java index 489a43a1f9..69abb52cf8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.query.embeddables; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.AuditException; import org.hibernate.envers.query.AuditEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java index 6ff744c91f..7d67dfa419 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.query.embeddables; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java index d3af09b29b..c7227fbaa3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.query.embeddables; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java index e10a8b7301..61de4fd62e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.query.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Felix Feisst (feisst dot felix at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java index f780be5550..0807ba43b7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java @@ -8,11 +8,11 @@ package org.hibernate.orm.test.envers.integration.query.entities; 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 javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java index fa30e81220..7600b2e619 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.query.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java index 875306cb14..635bd431eb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/EmbIdOneToManyQuery.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.query.ids; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java index b3126c94ba..9b19b54371 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/ids/MulIdOneToManyQuery.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.query.ids; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -216,4 +216,4 @@ public class MulIdOneToManyQuery extends BaseEnversJPAFunctionalTestCase { assertEquals( 0, rev2_related.size() ); assertEquals( new SetRefIngMulIdEntity( id2, "y", null ), rev3_related ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java index feeee812b9..b2c010811a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.reference; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -131,4 +131,4 @@ public class BidirectionalReference extends BaseEnversJPAFunctionalTestCase { assert rev2.getGreetings().size() == 0; assert rev3.getGreetings().equals( TestTools.makeSet( g1 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java index eea7fbb955..b4bae37279 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.reference; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -76,4 +76,4 @@ public class GreetingPO { result = 31 * result + (theGreeting != null ? theGreeting.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java index 78f3f97988..046e3a2ceb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.integration.reference; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -77,4 +77,4 @@ public class GreetingSetPO { result = 31 * result + (name != null ? name.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java index 3f71e24f3c..dbe3b20853 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java index d470882d04..18ac2f1c88 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java index 34803dac5d..a164d683ee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.reventity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -83,4 +83,4 @@ public class CustomBoxedRevEntity { result = 31 * result + (customTimestamp != null ? customTimestamp.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java index dc051fb44e..347bba5dea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; @@ -119,4 +119,4 @@ public class CustomColumnMapping extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( StrTestEntity.class, id, 1l ).equals( ver1 ); assert getAuditReader().find( StrTestEntity.class, id, 2l ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java index 02272a9cb5..77be8a07f6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; @@ -121,4 +121,4 @@ public class CustomDate extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( StrTestEntity.class, id, 1 ).equals( ver1 ); assert getAuditReader().find( StrTestEntity.class, id, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java index e1df3936f2..01a33e815d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; @@ -115,4 +115,4 @@ public class CustomNoListener extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( StrTestEntity.class, id, 3 ).equals( ver2 ); assert getAuditReader().find( StrTestEntity.class, id, 4 ).equals( ver3 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java index d4b39fc61c..f72c16004f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; @@ -118,4 +118,4 @@ public class CustomPropertyAccess extends BaseEnversJPAFunctionalTestCase { assert getAuditReader().find( StrTestEntity.class, id, 1 ).equals( ver1 ); assert getAuditReader().find( StrTestEntity.class, id, 2 ).equals( ver2 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java index a1a1aea04e..a1e4c342ec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java index d01139830c..4c0a6a486e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.reventity; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -43,4 +43,4 @@ public class ExceptionListener extends BaseEnversJPAFunctionalTestCase { assert count == 0l; em.getTransaction().commit(); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java index 3fe5e95740..c68c8dfe23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.reventity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -81,4 +81,4 @@ public class ExceptionListenerRevEntity { result = 31 * result + (int) (timestamp ^ (timestamp >>> 32)); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java index 7f8f1e3f22..bf5b27f0e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.reventity; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java index dea32de321..ceb9b5bbc3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java index dc6d0f44f5..42d50c2428 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.reventity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.RevisionEntity; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java index 7ac603536c..520bebf675 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java index 72d8848292..9355999845 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.reventity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java index e7c0e31eae..0d1ed610fc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java index 10dad3e25b..8d9523e926 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.reventity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; @@ -83,4 +83,4 @@ public class LongRevNumberRevEntity { result = 31 * result + (int) (customTimestamp ^ (customTimestamp >>> 32)); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java index dba28a62bd..3e3d4944c2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.envers.integration.reventity; import java.util.List; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java index ceab26230c..84a835b8eb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.reventity.removal; import java.util.ArrayList; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java index 34e6fc0664..f10ee4cdf1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.EntityTrackingRevisionListener; import org.hibernate.envers.exception.AuditException; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java index 67deb6f7c3..ee4060acc6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentitie import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.CrossTypeRevisionChangesReader; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java index c9ddf87f0d..238cad129d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentitie import java.util.HashSet; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.CrossTypeRevisionChangesReader; import org.hibernate.envers.configuration.EnversSettings; @@ -105,4 +105,4 @@ public class TrackingEntitiesMultipleChangesTest extends BaseEnversJPAFunctional private CrossTypeRevisionChangesReader getCrossTypeRevisionChangesReader() { return getAuditReader().getCrossTypeRevisionChangesReader(); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java index 9771f5172a..208c2dd52d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.revfordate; import java.util.Date; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java index 6c57a7f8b6..0c12491cd0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.sameids; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -76,4 +76,4 @@ public class SameIdTestEntity1 { result = 31 * result + (str1 != null ? str1.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java index d57d8a4c1b..6a8f0d981d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.sameids; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -76,4 +76,4 @@ public class SameIdTestEntity2 { result = 31 * result + (str1 != null ? str1.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java index cf1693cba3..83368ba735 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.sameids; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java index 94f537c0c5..da2a5a60fe 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/BasicSecondary.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.secondary; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -80,4 +80,4 @@ public class BasicSecondary extends BaseEnversJPAFunctionalTestCase { .next().getTable().getName() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java index fd20c4aa41..2847c68aa9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/NamingSecondary.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.secondary; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java index 3b7205bef9..0c5bf00427 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryNamingTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.secondary; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; import org.hibernate.envers.Audited; import org.hibernate.envers.SecondaryAuditTable; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java index 862e2f4a2a..27e13c0ccf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/SecondaryTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.secondary; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; import org.hibernate.envers.Audited; @@ -98,4 +98,4 @@ public class SecondaryTestEntity { result = 31 * result + (s2 != null ? s2.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java index d06a36c042..e620d55a39 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/EmbIdSecondary.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.secondary.ids; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -77,4 +77,4 @@ public class EmbIdSecondary extends BaseEnversJPAFunctionalTestCase { ).getJoinIterator()).next().getTable().getName() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java index b6587c0e65..b7e30b4fae 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/MulIdSecondary.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.integration.secondary.ids; import java.util.Arrays; import java.util.Iterator; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -79,4 +79,4 @@ public class MulIdSecondary extends BaseEnversJPAFunctionalTestCase { .next().getTable().getName() ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java index 60f6e214b6..53054162d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryEmbIdTestEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.secondary.ids; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SecondaryTable; import org.hibernate.envers.Audited; import org.hibernate.envers.SecondaryAuditTable; @@ -99,4 +99,4 @@ public class SecondaryEmbIdTestEntity { result = 31 * result + (s2 != null ? s2.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java index 4223919a00..beebc7f652 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/secondary/ids/SecondaryMulIdTestEntity.java @@ -6,11 +6,11 @@ */ package org.hibernate.orm.test.envers.integration.secondary.ids; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.SecondaryTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.SecondaryTable; import org.hibernate.envers.Audited; import org.hibernate.envers.SecondaryAuditTable; @@ -117,4 +117,4 @@ public class SecondaryMulIdTestEntity { result = 31 * result + (s2 != null ? s2.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java index 11fa268190..697441a830 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java @@ -10,7 +10,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java index 245e20ed4f..224d356cb3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java @@ -8,8 +8,8 @@ package org.hibernate.orm.test.envers.integration.strategy; import java.util.Arrays; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java index 2daed06c9a..30368eb54a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java @@ -11,13 +11,13 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OrderColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.envers.configuration.EnversSettings; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java index 8ab4f6f5c1..cd42a4cfba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.integration.strategy; import java.util.Arrays; import java.util.HashSet; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java index 54928fcdc4..23bd147e68 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java @@ -13,8 +13,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.Session; import org.hibernate.envers.configuration.EnversSettings; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java index 9df7800268..d32c6c96e1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java @@ -13,8 +13,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.Session; import org.hibernate.dialect.Dialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java index e4aff0ef90..f93810662f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java index 04f7137809..aed69775b8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel; -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; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java index aa490bdce3..9b5492b1c4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java index 1ebdde42b5..bd3349321f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java index 95f7d08848..c7a8185140 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass; -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; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java index 9d821965a9..20e5feb11f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java index 86e0d1aefd..42ed3df73d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java index be80ab7cae..02c04db9ba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel; -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; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java index 03a053a8a0..bfdad336c5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java index 95a0eec6b9..232b75529e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java index 2005d5bcfd..9c5325800e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass; -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; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java index 5e064f986f..09ae99e3e4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass; import java.util.Arrays; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java index 2bf69471d1..8faf95be0d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java index 2cba4634f1..9ca9bdb489 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java @@ -12,10 +12,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.UnknownEntityTypeException; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java index b8fae8ab4a..0e6832d02f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java index 3a09f98ea0..4a686f74b4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java index 916ab641c0..6c510c76a0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java index 510d6d68b7..e4251a3691 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java index df8536ee64..acdd6ab12c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java index c530d49f3d..61f1dd62d5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java index f6e8e4d5c2..80ae81bccb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java index d4cf9bec65..3fe648ba09 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java index 63dde02947..dba883a7c5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; @@ -63,4 +63,4 @@ public class MixedOverrideTest extends BaseEnversJPAFunctionalTestCase { MixedOverrideEntity ver1 = new MixedOverrideEntity( null, 1, mixedEntityId, "data 2" ); Assert.assertEquals( ver1, getAuditReader().find( MixedOverrideEntity.class, mixedEntityId, 1 ) ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java index 6e2d3eef66..a154102847 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java @@ -7,9 +7,9 @@ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) @@ -96,4 +96,4 @@ public class NotAuditedBaseEntity implements Serializable { public String toString() { return "NotAuditedBaseEntity(id = " + id + ", str1 = " + str1 + ", number1 = " + number1 + ")"; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java index 02f32a2c8c..5be5fc3f1e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java index 3010f6c2c2..7acf1120f7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditoverride; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java index 33c142c1e7..fbf450c342 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrIntTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java index 257a18ff13..3d62289e65 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrIntTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java index f924d0187a..a67af36db7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrIntTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java index a4749aa6f1..2c1696c838 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.entities.StrIntTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java index d7fb3619d4..4eae2ce706 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java index 032ba7d83d..3b2835e1d7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java index 19852238f9..a55e1f0c76 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.NotAudited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java index 00a6d5f1bb..59385256cb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import org.hibernate.orm.test.envers.entities.StrIntTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java index b22ce9c561..c9de044f49 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.EntityManager; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java index ef47fe8299..a2a2304c0b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.EntityManager; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java index 84bb8cd08e..81d2f8927b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java index a24845dc53..4811f1070a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java index a91376cdea..0064d3b472 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.envers.integration.superclass.auditparents; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java index 585d02b55d..28b2a98450 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java @@ -10,7 +10,7 @@ import java.io.File; import java.nio.file.Files; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.Oracle8iDialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java index 7069d1eb44..e761ffb8c8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.integration.update; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.SelectBeforeUpdate; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java index f8aa065adf..00ca9f7364 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.orm.test.envers.integrator; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.Configuration; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java index 79e818f4e2..1b7ef517cf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.envers.performance; import java.io.IOException; import java.util.Arrays; import java.util.Properties; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java index 8ea2aa478c..c8bc67cddd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java @@ -10,7 +10,7 @@ package org.hibernate.orm.test.envers.performance; import java.io.IOException; import java.util.Date; import java.util.HashSet; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.performance.complex.ChildEntity1; import org.hibernate.orm.test.envers.performance.complex.ChildEntity2; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java index f1d2d59999..133044e37e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.envers.performance; import java.io.IOException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.entities.StrTestEntity; @@ -41,4 +41,4 @@ public class InsertsOneTransactionPerformance extends AbstractPerformanceTest { InsertsOneTransactionPerformance insertsOneTransactionPerformance = new InsertsOneTransactionPerformance(); insertsOneTransactionPerformance.test( 3 ); } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java index d06ddd3a23..3c442afe5a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.envers.performance; import java.io.IOException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.entities.StrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java index 7f517f6a98..418d091bfa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.orm.test.envers.entities.StrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java index 5ad874795f..8c2b053e8b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.performance.complex; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java index b27a765d9b..3473fe07ee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java @@ -8,9 +8,9 @@ package org.hibernate.orm.test.envers.performance.complex; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; @@ -92,4 +92,4 @@ public class ChildEntity2 { result = 31 * result + (number != null ? number.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java index cb6dd887ea..35e2b5a452 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java @@ -8,12 +8,12 @@ package org.hibernate.orm.test.envers.performance.complex; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java index 22b98652c7..3ed0222e0c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java @@ -11,10 +11,10 @@ import java.util.Map; import java.util.TreeMap; import java.util.function.Supplier; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java index 5933a29a9c..d22232f01e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java @@ -7,10 +7,10 @@ package org.hibernate.orm.test.envers.various; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.envers.Audited; @@ -110,4 +110,4 @@ public class Address { result = 31 * result + (flatNumber != null ? flatNumber.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java index f5206d5bb3..9da38b65a8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java @@ -9,9 +9,9 @@ package org.hibernate.orm.test.envers.various; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.hibernate.Session; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java index eda34e79e3..7b5c081447 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.test.envers.various; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.envers.Audited; @@ -94,4 +94,4 @@ public class Person { result = 31 * result + (surname != null ? surname.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java index 4d30fe01a9..0d430e6def 100644 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java +++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EntityManagerFactoryAccess.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.envers; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.dialect.Dialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java index dbfff5ab72..51af4d1954 100644 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java +++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryProducer.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.envers; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; /** * Envers contract for something that can build an EntityManagerFactory based on an audit strategy. diff --git a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java index 421debf36e..2f258ed8a7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java +++ b/hibernate-envers/src/test/java/org/hibernate/testing/envers/EnversEntityManagerFactoryScope.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.testing.jta.TestingJtaPlatformImpl; diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java index 2049890329..496864e564 100644 --- a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java +++ b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java @@ -9,8 +9,8 @@ package org.hibernate.test.hikaricp; import java.sql.Connection; import java.sql.SQLException; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; @@ -40,7 +40,7 @@ public class HikariCPSkipAutoCommitTest extends BaseCoreFunctionalTestCase { @Override protected void configure(Configuration configuration) { configuration.getProperties().put( - org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER, + AvailableSettings.CONNECTION_PROVIDER, connectionProvider ); configuration.getProperties().put( AvailableSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT, Boolean.TRUE ); diff --git a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle index 74a13c116c..339fa5f355 100644 --- a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle +++ b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle @@ -20,8 +20,6 @@ checkstyleMain.exclude '**/module-info.java' dependencies { api project( ':hibernate-core' ) api project( ':hibernate-envers' ) - api libraries.jpa - implementation libraries.jpa } test { diff --git a/hibernate-integrationtest-java-modules/src/test/java/module-info.java b/hibernate-integrationtest-java-modules/src/test/java/module-info.java index 2d39f0a55d..6386d86ec7 100644 --- a/hibernate-integrationtest-java-modules/src/test/java/module-info.java +++ b/hibernate-integrationtest-java-modules/src/test/java/module-info.java @@ -13,7 +13,7 @@ module org.hibernate.orm.integrationtest.java.module.test { opens org.hibernate.orm.integrationtest.java.module.test.entity to org.hibernate.orm.core; - requires java.persistence; + requires jakarta.persistence; // IDEA will not find the modules below because it apparently doesn't support automatic module names // for modules in the current project. // Everything should work fine when building from the command line, though. diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java index 143ef766d9..d2554b2a0e 100644 --- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java +++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/entity/Author.java @@ -6,10 +6,10 @@ */ package org.hibernate.orm.integrationtest.java.module.test.entity; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.NaturalId; import org.hibernate.envers.Audited; diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java index a3a98ecd64..6816398002 100644 --- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java +++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java @@ -8,7 +8,7 @@ package org.hibernate.orm.integrationtest.java.module.test.service; import java.util.List; -import javax.persistence.Persistence; +import jakarta.persistence.Persistence; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/hibernate-micrometer/hibernate-micrometer.gradle b/hibernate-micrometer/hibernate-micrometer.gradle index 29c4637875..67adc6cf3d 100644 --- a/hibernate-micrometer/hibernate-micrometer.gradle +++ b/hibernate-micrometer/hibernate-micrometer.gradle @@ -2,10 +2,8 @@ description = 'Integration for Micrometer metrics into Hibernate as a metrics co apply from: rootProject.file( 'gradle/published-java-module.gradle' ) - dependencies { implementation project( ':hibernate-core' ) - implementation libraries.jpa implementation libraries.micrometer testImplementation project( ':hibernate-testing' ) diff --git a/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java b/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java index 339fc6d159..5babc5cb52 100644 --- a/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java +++ b/hibernate-micrometer/src/main/java/org/hibernate/stat/HibernateMetrics.java @@ -19,8 +19,8 @@ import io.micrometer.core.lang.Nullable; import org.hibernate.SessionFactory; import org.hibernate.stat.Statistics; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; import java.util.Arrays; import java.util.concurrent.TimeUnit; import java.util.function.ToDoubleFunction; diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java index 0cc4ea1eb3..14cac2f77e 100644 --- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java +++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/Account.java @@ -6,10 +6,10 @@ */ package org.hibernate.test.stat; -import javax.persistence.Basic; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java index 1112721949..755e243445 100644 --- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java +++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/AccountId.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.stat; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class AccountId implements java.io.Serializable { diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java index 0430e3db28..df26a63f7d 100644 --- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java +++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java @@ -8,11 +8,11 @@ package org.hibernate.test.stat; import java.util.List; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Cache; diff --git a/hibernate-spatial/hibernate-spatial.gradle b/hibernate-spatial/hibernate-spatial.gradle index dcffbdbefa..914ae82011 100644 --- a/hibernate-spatial/hibernate-spatial.gradle +++ b/hibernate-spatial/hibernate-spatial.gradle @@ -14,30 +14,25 @@ apply plugin: 'org.hibernate.matrix-test' dependencies { - compile( project(':hibernate-core') ) - compile( libraries.geolatte ) + compile project(':hibernate-core') + compile libraries.geolatte - compile( libraries.postgresql ) + compileOnly libraries.postgresql + testCompile project(':hibernate-testing') + testCompile project( path: ':hibernate-core', configuration: 'tests' ) - testCompile(project(':hibernate-testing')) + testCompile libraries.jakarta_validation + testCompile libraries.jandex + testCompile libraries.classmate + testCompile libraries.jakarta_validator + testCompile libraries.dom4j - testCompile( project( path: ':hibernate-core', configuration: 'tests' ) ) - testCompile(libraries.validation) - testCompile(libraries.jandex) - testCompile(libraries.classmate) - testCompile(libraries.validator) { - // for test runtime - transitive = true - } - testCompile(libraries.dom4j) { - transitive = false - } + testImplementation libraries.postgresql - testRuntime( libraries.expression_language ) - - testRuntime('jaxen:jaxen:1.1') - testRuntime(libraries.byteBuddy) + testRuntime libraries.jakarta_el + testRuntime 'jaxen:jaxen:1.1' + testRuntime libraries.byteBuddy } sourceSets.test.resources { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryType.java index 694791342b..20504f7ede 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryType.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryType.java @@ -30,7 +30,7 @@ public class JTSGeometryType extends AbstractSingleColumnStandardBasicType. - */ - -description = 'Support for testing Hibernate ORM Jakarta functionality' - - -apply from: rootProject.file( 'gradle/published-jakarta-java-module.gradle' ) - -evaluationDependsOn( ':hibernate-testing' ) - -dependencies { - api project( ':hibernate-core-jakarta' ) - - api libraries.junit - api libraries.junit5_api - api libraries.junit5_params - api 'org.hamcrest:hamcrest-all:1.3' - api libraries.byteman - api libraries.byteman_install - api libraries.byteman_bmunit - - api libraries.xapool - api( libraries.jboss_tx_spi_jakarta ) { - transitive=false; - } - api( libraries.jboss_jta_jakarta ) { - transitive=false; - } - - api 'javax.money:money-api:1.0.1' - api 'org.javamoney:moneta:1.1' - - api libraries.log4j2 - - implementation project( ':hibernate-transaction-client' ) - - testImplementation fileTree(dir: 'libs', include: '*.jar') -} - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// main jar - -//tasks.jar { -// enabled false -//} -// -//task jakartafyJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-testing').tasks.jar.archiveFile -// targetJar = tasks.jar.archiveFile -//} -// -//tasks.jar.dependsOn project(':hibernate-testing').tasks.jar -//tasks.jar.finalizedBy tasks.jakartafyJar -//tasks.jakartafyJar.dependsOn tasks.jar -//tasks.jakartafyJar.mustRunAfter tasks.jar -// - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// javadoc jar - -//tasks.javadocJar { -// enabled false -//} -// -//task jakartafyJavadocJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-testing').tasks.javadocJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.javadocJar.dependsOn project(':hibernate-testing').tasks.javadocJar -//tasks.javadocJar.finalizedBy tasks.jakartafyJavadocJar -//tasks.jakartafyJavadocJar.dependsOn tasks.javadocJar -//tasks.jakartafyJavadocJar.mustRunAfter tasks.javadocJar - - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// sources jar - -//tasks.sourcesJar { -// enabled false -//} -// -//task jakartafySourcesJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-testing').tasks.sourcesJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.sourcesJar.dependsOn project(':hibernate-testing').tasks.sourcesJar -//tasks.sourcesJar.finalizedBy tasks.jakartafySourcesJar -//tasks.jakartafySourcesJar.dependsOn tasks.sourcesJar -//tasks.jakartafySourcesJar.mustRunAfter tasks.sourcesJar -// - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// testing - -//project.ext { -// testClassesUnpackTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/unpack/classes' ) -// testClassesTransformationTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/test/classes' ) -//} -// -//tasks.compileTestJava { -// enabled false -//} -// -//tasks.processTestResources { -// enabled false -//} -// -//task unpackTests(type: Copy) { -// from zipTree( project( ':hibernate-testing' ).tasks.testJar.archiveFile ) -// into project.testClassesUnpackTargetDirectory -//} -// -//task jakartafyTests(type: JakartaDirectoryTransformation) { -// sourceDirectory = project.testClassesUnpackTargetDirectory -// targetDirectory = project.testClassesTransformationTargetDirectory -//} -// -// -//tasks.compileTestJava.dependsOn tasks.unpackTests -//tasks.compileTestJava.finalizedBy tasks.jakartafyTests -// -//tasks.unpackTests.dependsOn project(':hibernate-testing').tasks.testJar -// -//tasks.jakartafyTests.dependsOn tasks.unpackTests -// -//tasks.test { -// testClassesDirs += project.files( tasks.jakartafyTests.targetDirectory ) -// classpath += project.files( tasks.jakartafyTests.targetDirectory ) -// -// systemProperty 'file.encoding', 'utf-8' -// -// if ( gradle.ext.javaVersions.test.launcher.asInt() >= 9 ) { -// // See org.hibernate.boot.model.naming.NamingHelperTest.DefaultCharset.set -// jvmArgs( ['--add-opens', 'java.base/java.nio.charset=ALL-UNNAMED'] ) -// // Weld needs this to generate proxies -// jvmArgs( ['--add-opens', 'java.base/java.security=ALL-UNNAMED'] ) -// jvmArgs( ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] ) -// } -//} -// -//task testJar(type: Jar, dependsOn: testClasses) { -// duplicatesStrategy = DuplicatesStrategy.EXCLUDE -// archiveClassifier.set( 'test' ) -// from tasks.jakartafyTests.targetDirectory -//} -// -//artifacts { -// tests tasks.testJar -//} -// diff --git a/hibernate-testing/hibernate-testing.gradle b/hibernate-testing/hibernate-testing.gradle index 86a1125604..20a178880c 100644 --- a/hibernate-testing/hibernate-testing.gradle +++ b/hibernate-testing/hibernate-testing.gradle @@ -9,29 +9,28 @@ description = 'Support for testing Hibernate ORM functionality' apply from: rootProject.file( 'gradle/published-java-module.gradle' ) -configurations { - tests -} - dependencies { api project( ':hibernate-core' ) api libraries.junit api libraries.junit5_api api libraries.junit5_params + api 'org.hamcrest:hamcrest-all:1.3' api libraries.assertj + api libraries.mockito api libraries.mockito_inline + api libraries.byteman api libraries.byteman_install api libraries.byteman_bmunit api libraries.xapool - api( libraries.jboss_tx_spi ) { + api( libraries.jboss_tx_spi_jakarta ) { transitive=false; } - api( libraries.jboss_jta ) { + api( libraries.jboss_jta_jakarta ) { transitive=false; } @@ -39,18 +38,17 @@ dependencies { api 'org.javamoney:moneta:1.1' api libraries.log4j2 + + implementation libraries.wildfly_transaction_client } + tasks.test.include '**/*' -task testJar(type: Jar, dependsOn: testClasses) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - archiveClassifier.set( 'test' ) - from sourceSets.test.output -} - -artifacts { - tests tasks.testJar +tasks.checkstyleMain { + exclude '**/org/hibernate/orm/test/legacy/**' } + + diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java index 7f5810768f..407b2efaeb 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Properties; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java index 23c2ff32cd..485a7f946b 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java @@ -6,10 +6,10 @@ */ package org.hibernate.testing.jta; -import javax.transaction.Status; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.JtaSynchronizationStrategy; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java index ca3f914cbb..0ac912917a 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Properties; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.HibernateException; import org.hibernate.Interceptor; @@ -519,7 +519,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase { } protected boolean readCommittedIsolationMaintained(String scenario) { - int isolation = java.sql.Connection.TRANSACTION_READ_UNCOMMITTED; + int isolation = Connection.TRANSACTION_READ_UNCOMMITTED; Session testSession = null; try { testSession = openSession(); @@ -543,7 +543,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase { } } } - if ( isolation < java.sql.Connection.TRANSACTION_READ_COMMITTED ) { + if ( isolation < Connection.TRANSACTION_READ_COMMITTED ) { SkipLog.reportSkip( "environment does not support at least read committed isolation", scenario ); return false; } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java index fb074c6c72..10b74ec85c 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java @@ -71,7 +71,7 @@ import static org.junit.Assert.fail; /** * Applies functional testing logic for core Hibernate testing on top of {@link BaseUnitTestCase}. - * Much like {@link org.hibernate.testing.junit4.BaseCoreFunctionalTestCase}, except that + * Much like {@link BaseCoreFunctionalTestCase}, except that * this form uses the new bootstrapping APIs while BaseCoreFunctionalTestCase continues to * use (the neutered form of) Configuration. * diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java index fe9ed06f9a..06a91e8b6f 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java @@ -11,7 +11,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java index be1d65a192..0c718be1ec 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomParameterized.java @@ -39,7 +39,7 @@ import org.junit.runners.model.Statement; * Hibernate-specific {@link org.hibernate.testing.BeforeClassOnce} and {@link org.hibernate.testing.AfterClassOnce} * will be executed before and after each set of tests with given parameters. * - * Class can override the parameters list (annotated by {@link org.junit.runners.Parameterized.Parameters} + * Class can override the parameters list (annotated by {@link Parameterized.Parameters} * by defining static method of the same name in inheriting class (this works although usually static * methods cannot override each other in Java). * @@ -47,9 +47,9 @@ import org.junit.runners.model.Statement; * of all the options, concatenating the argument list according to {@link Order} values. * * Contrary to {@link Parameterized}, non-static parameters methods are allowed, but the test class needs - * to have parameterless constructor, and therefore use {@link org.junit.runners.Parameterized.Parameter} + * to have parameterless constructor, and therefore use {@link Parameterized.Parameter} * for setting these parameters. This allow type-safe overriding of the method; note that only the base - * method needs the {@link org.junit.runners.Parameterized.Parameters} annotation, overriding methods + * method needs the {@link Parameterized.Parameters} annotation, overriding methods * are invoked automatically. * * @author Radim Vansa <rvansa@redhat.com> diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java index 2088ed3a4f..35692a1d61 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java @@ -110,7 +110,7 @@ public class CustomRunner extends BlockJUnit4ClassRunner { /** * {@inheritDoc} * - * @see org.junit.runners.ParentRunner#classBlock(org.junit.runner.notification.RunNotifier) + * @see org.junit.runners.ParentRunner#classBlock(RunNotifier) */ @Override protected Statement classBlock(RunNotifier notifier) { diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java index f6360eef55..cf207a1259 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/DomainModelDescriptor.java @@ -38,7 +38,7 @@ public interface DomainModelDescriptor { * to use which would not need any (more) test-specific Dialect feature. * * Note however that this might be a useful feature as well for users instead of - * JPA's {@link javax.persistence.Table#catalog} / {@link javax.persistence.Table#schema}. + * JPA's {@link jakarta.persistence.Table#catalog} / {@link jakarta.persistence.Table#schema}. * AKA, something like `@org.hibernate.annotations.Namespace("a_name")` or * `@org.hibernate.annotations.Table( namespace="a_name", ... )`. * diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java index 536992fa6c..a5c225e1a5 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MappingFeature.java @@ -14,7 +14,7 @@ import java.util.EnumSet; * The intent is to help categorize which models use specific mapping features * to help facilitate testing various outcomes based on those features. * - * For example, when writing a test that depends on JPA's {@link javax.persistence.AttributeConverter}, + * For example, when writing a test that depends on JPA's {@link jakarta.persistence.AttributeConverter}, * we could just see which DomainModel reports using {@link #CONVERTER} and re-use that * model. * diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java index ee605d16eb..aff8c0153b 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/MonetaryAmountConverter.java @@ -10,8 +10,8 @@ import java.util.Locale; import javax.money.CurrencyUnit; import javax.money.Monetary; import javax.money.MonetaryAmount; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java index c70d65984c..c2d8c6789b 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Address.java @@ -6,9 +6,9 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Embeddable; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Embeddable public class Address { diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java index d7aca8c0e2..b63088a3fb 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Animal.java @@ -8,15 +8,15 @@ package org.hibernate.testing.orm.domain.animal; import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; @Entity @Inheritance( strategy = InheritanceType.JOINED ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java index dc2419eb5d..781c52f361 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Cat.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity @PrimaryKeyJoinColumn( name = "cat_id_fk" ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java index 908ef4461b..b48061b3c7 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Dog.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity @PrimaryKeyJoinColumn( name = "dog_id_fk" ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java old mode 100755 new mode 100644 index d7d4cfecbd..75120a386a --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java @@ -6,10 +6,10 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity @PrimaryKeyJoinColumn( name = "domestic_animal_id_fk" ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java old mode 100755 new mode 100644 index ecaae1dd31..6a428d6eb7 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java @@ -11,18 +11,18 @@ import java.math.BigInteger; import java.util.Collection; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.annotations.SortNatural; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java index fc73da12a9..479feb842a 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Lizard.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity @PrimaryKeyJoinColumn( name = "lizard_id_fk" ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java index 681b56f2d5..90cfd44e48 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Mammal.java @@ -7,10 +7,10 @@ package org.hibernate.testing.orm.domain.animal; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; @Entity @PrimaryKeyJoinColumn( name = "mammal_id_fk" ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java old mode 100755 new mode 100644 index 834dd96d48..b0422ee30f --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class Name { diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java old mode 100755 new mode 100644 index 7a35f65ec5..a76c60cd62 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue( "P" ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java index 709236df64..57d9b76f80 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Reptile.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Entity; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity @PrimaryKeyJoinColumn( name = "reptile_id_fk" ) diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java index dd575f842c..ef505a5044 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/StateProvince.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.animal; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class StateProvince { diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java index 6c871b3af2..4a6b1fc00d 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Zoo.java @@ -8,21 +8,21 @@ package org.hibernate.testing.orm.domain.animal; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; @Entity @Inheritance diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java index 229619abaf..3d495eca06 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Address.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.domain.contacts; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java index 4aa3b7e3cf..c60f681044 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/Contact.java @@ -8,17 +8,17 @@ package org.hibernate.testing.orm.domain.contacts; import java.time.LocalDate; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java index f0084ded5f..5ae077cba1 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/contacts/PhoneNumber.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.domain.contacts; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java index e6a48211aa..43d28281a9 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/BasicEntity.java @@ -7,8 +7,8 @@ package org.hibernate.testing.orm.domain.gambit; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Chris Cranford diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java index 6dd38eb9d8..0d5d078851 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Component.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java index 33cad28062..67c91c3147 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EmbeddedIdEntity.java @@ -8,9 +8,9 @@ package org.hibernate.testing.orm.domain.gambit; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Chris Cranford diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java index 1be2720fad..4a3a7d3918 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfArrays.java @@ -6,10 +6,10 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; /** * @author Koen Aers diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java index 251ee48972..10928a514d 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfBasics.java @@ -17,17 +17,17 @@ import java.time.LocalTime; import java.time.OffsetDateTime; import java.time.ZonedDateTime; import java.util.Date; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.JdbcTypeCode; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java index 03eb5221d9..ad942b2ede 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfComposites.java @@ -6,9 +6,9 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java index 94a9403d7d..7533e99e1d 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfLists.java @@ -8,16 +8,16 @@ package org.hibernate.testing.orm.domain.gambit; import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java index 846c1fdb9e..194969fb60 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfMaps.java @@ -11,19 +11,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.OrderBy; import org.hibernate.annotations.SortComparator; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java index 43ac318ca5..a6139f9923 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityOfSets.java @@ -10,18 +10,18 @@ import java.util.HashSet; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java index 20e31f6a03..ab033d7b9a 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithAggregateId.java @@ -7,9 +7,9 @@ package org.hibernate.testing.orm.domain.gambit; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java index b0b7de5ed9..d51a4d3afd 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyManyToOneSelfReference.java @@ -6,12 +6,12 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Andrea Boriero diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java index cd5464ebc2..7d795f3bbd 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithLazyOneToOne.java @@ -6,10 +6,10 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Andrea Boriero diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java index 88f2b15fea..614d0d9bac 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneJoinTable.java @@ -6,13 +6,13 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; /** * @author Andrea Boriero diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java index 9d0cc97cf7..175457913f 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneSelfReference.java @@ -6,11 +6,11 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java index 075c43a97f..d42ca1b4f4 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithManyToOneWithoutJoinTable.java @@ -6,9 +6,9 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Chris Cranford diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java index 88dd98761d..8d3b5d49f0 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNonIdAttributeNamedId.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java index 24679f35c8..034862762a 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithNotAggregateId.java @@ -7,9 +7,9 @@ package org.hibernate.testing.orm.domain.gambit; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; /** * @author Andrea Boriero diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java index e0e30f7593..a2b0dd8512 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToMany.java @@ -10,12 +10,12 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java index 8edeff3466..eff2c74b0b 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToManyNotOwned.java @@ -8,9 +8,9 @@ package org.hibernate.testing.orm.domain.gambit; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Chris Cranford diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java index e017ba092d..6fc3f1a945 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOne.java @@ -6,9 +6,9 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; /** * @author Andrea Boriero diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java index e8eca72757..064532d3c0 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneJoinTable.java @@ -6,11 +6,11 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; /** * @author Andrea Boriero diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java index 0706261b7e..f2755b8fa7 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EntityWithOneToOneSharingPrimaryKey.java @@ -6,11 +6,11 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; /** * @author Andrea Boriero diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java index c8899fd8eb..8a7fb005a3 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/EnumValueConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java index 7ff8e489e0..2e75d16424 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/Shirt.java @@ -6,13 +6,13 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.AttributeConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; /** * @author Chris Cranford diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java index b586ee849b..d9b0b70b12 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleComponent.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.domain.gambit; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java index 27b4095e83..d4aa70c594 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/gambit/SimpleEntity.java @@ -8,11 +8,11 @@ package org.hibernate.testing.orm.domain.gambit; import java.time.Instant; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java index 1cc8b9d5ff..bbd53a3fe9 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Account.java @@ -6,13 +6,13 @@ */ package org.hibernate.testing.orm.domain.helpdesk; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java index 3496954f1e..9be9d3aa0a 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Incident.java @@ -7,10 +7,10 @@ package org.hibernate.testing.orm.domain.helpdesk; import java.time.Instant; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java index 1b4f6f5ab3..4e13815151 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/helpdesk/Ticket.java @@ -6,9 +6,9 @@ */ package org.hibernate.testing.orm.domain.helpdesk; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java index 941bdcf992..040b227101 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CardPayment.java @@ -7,7 +7,7 @@ package org.hibernate.testing.orm.domain.retail; import javax.money.MonetaryAmount; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java index f5fcc5d917..8b7b79960e 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/CashPayment.java @@ -7,7 +7,7 @@ package org.hibernate.testing.orm.domain.retail; import javax.money.MonetaryAmount; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java index e0be8c01cb..f9051ea6c1 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/DomesticVendor.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.retail; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java index 1639bfaf41..cfc6259153 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/ForeignVendor.java @@ -6,8 +6,8 @@ */ package org.hibernate.testing.orm.domain.retail; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java index f738151a1d..6f4471b006 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/LineItem.java @@ -7,10 +7,10 @@ package org.hibernate.testing.orm.domain.retail; import javax.money.MonetaryAmount; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java index da5f4eff9f..7c3b7a4465 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Name.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.domain.retail; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java index c0a1ac0fa2..154ff8d615 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Order.java @@ -7,11 +7,11 @@ package org.hibernate.testing.orm.domain.retail; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java index 21a6b50410..d99e993fad 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Payment.java @@ -7,11 +7,11 @@ package org.hibernate.testing.orm.domain.retail; import javax.money.MonetaryAmount; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java index dcda0f9c44..9ac0a5cf57 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Product.java @@ -8,10 +8,10 @@ package org.hibernate.testing.orm.domain.retail; import java.util.UUID; import javax.money.MonetaryAmount; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java index 6e22d4f0a7..512a6eb097 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/SalesAssociate.java @@ -6,9 +6,9 @@ */ package org.hibernate.testing.orm.domain.retail; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java index 2e499ec1e1..3dd9863f8b 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/retail/Vendor.java @@ -6,12 +6,12 @@ */ package org.hibernate.testing.orm.domain.retail; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.SecondaryTable; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.SecondaryTable; /** * @author Steve Ebersole diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java index 347087ac66..9f69ec73ba 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitDescriptorAdapter.java @@ -10,9 +10,9 @@ import java.net.URL; import java.util.Collections; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.bytecode.enhance.spi.EnhancementContext; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java index d9c4be3ed9..91ea39a4af 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoAdapter.java @@ -10,11 +10,11 @@ import java.net.URL; import java.util.Collections; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java index 9e5a7d9b4a..e664301d02 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/jpa/PersistenceUnitInfoImpl.java @@ -11,11 +11,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java index f26a3abe27..5a0191deb8 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AbstractEntityManagerFactoryScope.java @@ -8,8 +8,8 @@ package org.hibernate.testing.orm.junit; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; @@ -21,13 +21,13 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.jboss.logging.Logger; abstract class AbstractEntityManagerFactoryScope implements EntityManagerFactoryScope, ExtensionContext.Store.CloseableResource { - private static final org.jboss.logging.Logger log = Logger.getLogger( EntityManagerFactoryScope.class ); + private static final Logger log = Logger.getLogger( EntityManagerFactoryScope.class ); - protected javax.persistence.EntityManagerFactory emf; + protected EntityManagerFactory emf; protected boolean active = true; @Override - public javax.persistence.EntityManagerFactory getEntityManagerFactory() { + public EntityManagerFactory getEntityManagerFactory() { if ( emf == null ) { if ( !active ) { throw new IllegalStateException( "EntityManagerFactoryScope is no longer active" ); diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java index 74ba6bd9e5..19d15bcad1 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java @@ -12,7 +12,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.cache.spi.access.AccessType; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java index 6d12cc6520..a517c847cb 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java @@ -15,11 +15,11 @@ import java.util.Map; import java.util.Properties; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java index d2716c260f..3f1a4f77c6 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryExtension.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitInfo; import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.registry.StandardServiceRegistry; @@ -311,7 +311,7 @@ public class EntityManagerFactoryExtension this.integrationSettings = integrationSettings; } - protected javax.persistence.EntityManagerFactory createEntityManagerFactory() { + protected jakarta.persistence.EntityManagerFactory createEntityManagerFactory() { final EntityManagerFactoryBuilder emfBuilder = Bootstrap.getEntityManagerFactoryBuilder( new PersistenceUnitInfoDescriptor( persistenceUnitInfo ), integrationSettings diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryParameterResolver.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryParameterResolver.java index ef467038dd..acc9bb00b9 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryParameterResolver.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryParameterResolver.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.junit; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryProducer.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryProducer.java index a836d5aa3b..bf6a39ac33 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryProducer.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryProducer.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.orm.junit; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; /** * Contract for something that can build a SessionFactory. diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScope.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScope.java index bd78171c92..740805d40b 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScope.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScope.java @@ -8,8 +8,8 @@ package org.hibernate.testing.orm.junit; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.resource.jdbc.spi.StatementInspector; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScopeExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScopeExtension.java index 2c02cc437c..d29a650bbb 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScopeExtension.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScopeExtension.java @@ -7,7 +7,7 @@ package org.hibernate.testing.orm.junit; import java.util.Optional; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java index f705f177e9..44949e7ffc 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/Jpa.java @@ -12,9 +12,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.jpa.spi.JpaCompliance; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java index 9a427c59bc..b27aa9e286 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/logger/LoggerInspectionExtension.java @@ -19,14 +19,14 @@ import org.jboss.logging.BasicLogger; public class LoggerInspectionExtension implements AfterEachCallback { - public static LoggerInspectionExtension.LoggerInspectionRuleBuilder builder() { - return new LoggerInspectionExtension.LoggerInspectionRuleBuilder(); + public static LoggerInspectionRuleBuilder builder() { + return new LoggerInspectionRuleBuilder(); } public static class LoggerInspectionRuleBuilder { BasicLogger log; - public LoggerInspectionExtension.LoggerInspectionRuleBuilder setLogger(BasicLogger log) { + public LoggerInspectionRuleBuilder setLogger(BasicLogger log) { this.log = log; return this; } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java index 604287fabb..f5c7f04d83 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java @@ -8,7 +8,7 @@ package org.hibernate.testing.orm.transaction; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.SharedSessionContract; import org.hibernate.StatelessSession; @@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.jboss.logging.Logger; public abstract class TransactionUtil { - private static final org.jboss.logging.Logger log = Logger.getLogger( TransactionUtil.class ); + private static final Logger log = Logger.getLogger( TransactionUtil.class ); public static void inTransaction(SessionImplementor session, Consumer action) { wrapInTransaction( session, session, action ); diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java index 56318f5590..69baba0685 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/transaction/TransactionUtil.java @@ -16,9 +16,9 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; import org.hibernate.Session; import org.hibernate.SessionBuilder; @@ -634,13 +634,13 @@ public class TransactionUtil { } /** - * Use the supplied settings for building a new {@link org.hibernate.service.ServiceRegistry} and + * Use the supplied settings for building a new {@link ServiceRegistry} and * create a new JDBC {@link Connection} in auto-commit mode. * * A new JDBC {@link Statement} is created and passed to the supplied callback. * * @param consumer {@link Statement} callback to execute statements in auto-commit mode - * @param settings Settings to build a new {@link org.hibernate.service.ServiceRegistry} + * @param settings Settings to build a new {@link ServiceRegistry} */ public static void doInAutoCommit(Consumer consumer, Map settings) { StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder(); @@ -667,7 +667,7 @@ public class TransactionUtil { } /** - * Use the default settings for building a new {@link org.hibernate.service.ServiceRegistry} and + * Use the default settings for building a new {@link ServiceRegistry} and * create a new JDBC {@link Connection} in auto-commit mode. * * A new JDBC {@link Statement} is created and passed to the supplied callback. @@ -679,12 +679,12 @@ public class TransactionUtil { } /** - * Use the supplied settings for building a new {@link org.hibernate.service.ServiceRegistry} and + * Use the supplied settings for building a new {@link ServiceRegistry} and * create a new JDBC {@link Connection} in auto-commit mode. * * The supplied statements will be executed using the previously created connection * - * @param settings Settings to build a new {@link org.hibernate.service.ServiceRegistry} + * @param settings Settings to build a new {@link ServiceRegistry} * @param statements statements to be executed in auto-commit mode */ public static void doInAutoCommit(Map settings, String... statements) { @@ -701,7 +701,7 @@ public class TransactionUtil { } /** - * Use the default settings for building a new {@link org.hibernate.service.ServiceRegistry} and + * Use the default settings for building a new {@link ServiceRegistry} and * create a new JDBC {@link Connection} in auto-commit mode. * * The supplied statements will be executed using the previously created connection diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java index c2ef8bef79..bf7bc2612c 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/ExceptionUtil.java @@ -6,7 +6,7 @@ */ package org.hibernate.testing.util; -import javax.persistence.LockTimeoutException; +import jakarta.persistence.LockTimeoutException; import org.hibernate.PessimisticLockException; import org.hibernate.exception.GenericJDBCException; @@ -72,7 +72,7 @@ public class ExceptionUtil { || LockTimeoutException.class.isInstance( e ) || GenericJDBCException.class.isInstance( e ) || PessimisticLockException.class.isInstance( e ) - || javax.persistence.PessimisticLockException.class.isInstance( e ) + || jakarta.persistence.PessimisticLockException.class.isInstance( e ) || JDBCConnectionException.class.isInstance( e ) ) { return true; } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java index dcb44b942b..e16bceb975 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/DelegatingPersistenceUnitInfo.java @@ -6,11 +6,11 @@ */ package org.hibernate.testing.util.jpa; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import java.net.URL; import java.util.List; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java index 00d29ffcaa..2e2bc9e038 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoAdapter.java @@ -6,11 +6,11 @@ */ package org.hibernate.testing.util.jpa; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import java.net.URL; import java.util.Collections; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java index abfa5d7023..597ac77fb1 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/jpa/PersistenceUnitInfoPropertiesWrapper.java @@ -34,11 +34,11 @@ import java.net.URL; import java.util.Collections; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java index 67166e04f0..9c89b48141 100644 --- a/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java +++ b/hibernate-testing/src/test/java/org/hibernate/testing/annotations/AnEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.testing.annotations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity( name = "AnEntity" ) @Table( name = "a_tbl" ) diff --git a/hibernate-transaction-client/hibernate-transaction-client.gradle b/hibernate-transaction-client/hibernate-transaction-client.gradle deleted file mode 100644 index 7e73b6bbfc..0000000000 --- a/hibernate-transaction-client/hibernate-transaction-client.gradle +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -import org.hibernate.orm.jakarta.JakartaJarTransformation - -description = 'Wildfly Transaction Client transformed to be JTA 2.0 compatible' - -apply from: rootProject.file( 'gradle/published-java-module.gradle' ) - -tasks.withType(PublishToMavenRepository) { - onlyIf { - repository.name == "MavenLocal" - } -} - -configurations { - wildFlyTxnClient { - description = 'Used to access the WildFly transaction client jar to be able to transform it' - } -} - -dependencies { - api libraries.jakarta_jta - - wildFlyTxnClient( libraries.wildfly_transaction_client ) { - transitive = false; - } -} - -tasks.compileJava.enabled = false -tasks.processResources.enabled = false -tasks.compileTestJava.enabled = false -tasks.processTestResources.enabled = false -tasks.test.enabled = false -tasks.jar.enabled = false - -task jakartafyDependency(type: JakartaJarTransformation) { - sourceJar = project.provider({ - project.configurations.wildFlyTxnClient.resolvedConfiguration.resolvedArtifacts.find().file - }) - - targetJar = tasks.jar.archiveFile -} \ No newline at end of file diff --git a/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java b/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java index 8cb6b7354a..3766b83d2c 100644 --- a/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java +++ b/hibernate-vibur/src/test/java/org/hibernate/test/vibur/ViburDBCPConnectionProviderTest.java @@ -23,9 +23,9 @@ import org.vibur.dbcp.ViburDBCPDataSource; import org.vibur.dbcp.stcache.StatementHolder; import org.vibur.dbcp.stcache.StatementMethod; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.util.*; import java.util.concurrent.ConcurrentMap; diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-ant-patched-sources.jar b/patched-libs/jaxb2-basics/jaxb2-basics-ant-patched-sources.jar new file mode 100644 index 0000000000..3cdd2a9a9b Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-ant-patched-sources.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-ant-patched.jar b/patched-libs/jaxb2-basics/jaxb2-basics-ant-patched.jar new file mode 100644 index 0000000000..f1fbce66ec Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-ant-patched.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-patched-sources.jar b/patched-libs/jaxb2-basics/jaxb2-basics-patched-sources.jar new file mode 100644 index 0000000000..f04c832848 Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-patched-sources.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-patched.jar b/patched-libs/jaxb2-basics/jaxb2-basics-patched.jar new file mode 100644 index 0000000000..e9ad751601 Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-patched.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched-sources.jar b/patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched-sources.jar new file mode 100644 index 0000000000..319d896706 Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched-sources.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched.jar b/patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched.jar new file mode 100644 index 0000000000..f14e70f38e Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched-sources.jar b/patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched-sources.jar new file mode 100644 index 0000000000..8cf2f8b912 Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched-sources.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched.jar b/patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched.jar new file mode 100644 index 0000000000..42a37cc5e9 Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-tools-patched-sources.jar b/patched-libs/jaxb2-basics/jaxb2-basics-tools-patched-sources.jar new file mode 100644 index 0000000000..7e8d38c0fd Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-tools-patched-sources.jar differ diff --git a/patched-libs/jaxb2-basics/jaxb2-basics-tools-patched.jar b/patched-libs/jaxb2-basics/jaxb2-basics-tools-patched.jar new file mode 100644 index 0000000000..cbfad6b997 Binary files /dev/null and b/patched-libs/jaxb2-basics/jaxb2-basics-tools-patched.jar differ diff --git a/release/release.gradle b/release/release.gradle index 514467fff6..a2ec05f684 100644 --- a/release/release.gradle +++ b/release/release.gradle @@ -25,6 +25,7 @@ configurations { // testing envers + spatial agroal c3p0 @@ -35,30 +36,21 @@ configurations { jcache jpamodelgen - - coreJakarta -// testingJakarta - enversJakarta - jpamodelgenJakarta } dependencies { core project( ':hibernate-core' ) // testing project( ':hibernate-testing' ) envers project( ':hibernate-envers' ) + spatial project( ':hibernate-spatial' ) agroal project( ':hibernate-agroal' ) c3p0 project( ':hibernate-c3p0' ) hikaricp project( ':hibernate-hikaricp' ) proxool project( ':hibernate-proxool' ) vibur project( ':hibernate-vibur' ) - jcache project( ':hibernate-jcache' ) +// jcache project( ':hibernate-jcache' ) jpamodelgen project( ':hibernate-jpamodelgen' ) - - coreJakarta project( ':hibernate-core-jakarta' ) -// testingJakarta project( ':hibernate-testing-jakarta' ) - enversJakarta project( ':hibernate-envers-jakarta' ) - jpamodelgenJakarta project( ':hibernate-jpamodelgen-jakarta' ) } /** @@ -153,15 +145,9 @@ distributions { // from project( ':project-template' ).files( 'src/main/dist' ) // } - // todo (6.0) - add back spatial -// into( 'lib/spatial' ) { -// from( -// ( parent.project( 'hibernate-spatial' ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') } -// + parent.project( 'hibernate-spatial' ).configurations.runtime ) -// - parent.project( 'hibernate-core' ).configurations.runtime -// - parent.project( 'hibernate-core' ).configurations.archives.allArtifacts.files -// ) -// } + into( 'lib/spatial' ) { + from( configurations.spatial - configurations.core ) + } into( 'lib/jpa-metamodel-generator' ) { from( configurations.jpamodelgen - configurations.core ) @@ -174,7 +160,7 @@ distributions { // into( 'lib/testing' ) { // from( configurations.testing - configurations.core ) // } - +// into( 'lib/optional' ) { into( 'agroal' ) { from( configurations.agroal - configurations.core ) @@ -196,21 +182,6 @@ distributions { } } - into( 'lib/jakarta' ) { - into( 'required' ) { - from configurations.coreJakarta - } -// into( 'testing' ) { -// from( configurations.testingJakarta - configurations.coreJakarta ) -// } - into( 'envers' ) { - from( configurations.enversJakarta - configurations.coreJakarta ) - } - into( 'jpa-metamodel-generator' ) { - from( configurations.jpamodelgenJakarta - configurations.coreJakarta ) - } - } - into('documentation') { from "${buildDir}/documentation" } diff --git a/settings.gradle b/settings.gradle index cc207e2f23..5ef1fd2ff6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -112,17 +112,12 @@ logger.lifecycle "Java versions for main code: " + gradle.ext.javaVersions.main logger.lifecycle "Java versions for tests: " + gradle.ext.javaVersions.test include 'hibernate-core' -include 'hibernate-core-jakarta' - include 'hibernate-testing' -include 'hibernate-testing-jakarta' -include 'hibernate-transaction-client' include 'hibernate-envers' -include 'hibernate-envers-jakarta' +include 'hibernate-spatial' include 'hibernate-community-dialects' -include 'hibernate-spatial' include 'hibernate-c3p0' include 'hibernate-proxool' @@ -130,7 +125,7 @@ include 'hibernate-hikaricp' include 'hibernate-vibur' include 'hibernate-agroal' -include 'hibernate-jcache' +//include 'hibernate-jcache' include 'hibernate-micrometer' include 'hibernate-graalvm' @@ -154,10 +149,6 @@ include 'metamodel-generator' project(':metamodel-generator').projectDir = new File(rootProject.projectDir, "tooling/metamodel-generator") project(':metamodel-generator').name = 'hibernate-jpamodelgen' -include 'metamodel-generator-jakarta' -project(':metamodel-generator-jakarta').projectDir = new File(rootProject.projectDir, "tooling/metamodel-generator-jakarta") -project(':metamodel-generator-jakarta').name = 'hibernate-jpamodelgen-jakarta' - include 'hibernate-gradle-plugin' project(':hibernate-gradle-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-gradle-plugin") diff --git a/tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle b/tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle index 364fd26dda..5acbca3306 100644 --- a/tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle +++ b/tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle @@ -22,8 +22,8 @@ processResources { dependencies { implementation( project(':hibernate-core') ) { transitive = false } - implementation( libraries.jpa ) { transitive = false } - implementation( libraries.jta ) { transitive = false } + implementation( libraries.jakarta_jpa ) { transitive = false } + implementation( libraries.jakarta_jta ) { transitive = false } implementation( libraries.maven_core ) { transitive = false } implementation( libraries.maven_artifact ) { transitive = false } implementation( libraries.maven_plugin ) { transitive = false } @@ -47,9 +47,9 @@ task processPluginXml(type: Copy) { from "src/main/resources/META-INF/maven/plugin.xml" into "$processResources.destinationDir/META-INF/maven" filter(ReplaceTokens, tokens: ['version' : project.version, 'generated-dependencies' :\ - generateMavenDependency(libraries.jpa)\ + generateMavenDependency(libraries.jakarta_jpa)\ + generateMavenDependency(libraries.antlr)\ - + generateMavenDependency(libraries.jta)\ + + generateMavenDependency(libraries.jakarta_jta)\ + generateMavenDependency(libraries.commons_annotations)\ + generateMavenDependency(libraries.byteBuddy)\ + generateMavenDependency(libraries.logging)\ @@ -71,21 +71,21 @@ def generateMavenDependency(String gradleDependency) { // Writes pom.xml using merged Gradle dependency and MavenPom configuration. processResources.doLast { ext.pomDefinition = pom { - configurations { - // avoiding test dependencies in generated pom - compile - runtime - } + configurations { + // avoiding test dependencies in generated pom + compile + runtime + } - project { - groupId project.group - packaging 'maven-plugin' - name 'Hibernate Enhance Maven Plugin' - description 'Enhance Plugin of the Hibernate project for use with Maven build system.' - properties { - 'project.build.sourceEncoding' 'UTF-8' - } - } + project { + groupId project.group + packaging 'maven-plugin' + name 'Hibernate Enhance Maven Plugin' + description 'Enhance Plugin of the Hibernate project for use with Maven build system.' + properties { + 'project.build.sourceEncoding' 'UTF-8' + } + } } // HHH-9679 --- build in pom{} conflicts with FactoryBuilderSupport#build so we write that portion of XML by hand diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java index 1a8cf2656e..a2b878a0c7 100644 --- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java +++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ChildEntity.java @@ -1,6 +1,6 @@ package org.hibernate.orm.tooling.maven; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class ChildEntity extends ParentEntity { diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java index d23b39191b..e5e3b830d3 100644 --- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java +++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/ParentEntity.java @@ -1,6 +1,6 @@ package org.hibernate.orm.tooling.maven; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class ParentEntity { diff --git a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java index ca9e4c85e0..2d25cbc2b2 100644 --- a/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java +++ b/tooling/hibernate-enhance-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/TestEntity.java @@ -1,7 +1,7 @@ package org.hibernate.orm.tooling.maven; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TestEntity extends ChildEntity { diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle index 96919212fc..3ee5b76bc4 100644 --- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle +++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle @@ -24,18 +24,11 @@ ext { } dependencies { -// compileOnly project( ':hibernate-core' ) -// -// implementation gradleApi() -// implementation localGroovy() -// -// testRuntimeOnly project( ':hibernate-core' ) { -// } - implementation project( ':hibernate-core' ) - implementation libraries.jpa implementation libraries.byteBuddy implementation gradleApi() + // for Gradle + implementation 'jakarta.inject:jakarta.inject-api:2.0.0' implementation localGroovy() } diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java index fd238be553..73c5368d94 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.tooling.gradle; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.gradle.api.Action; import org.gradle.api.Project; diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java index ab46075d59..7dfc8860f8 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.tooling.gradle.enhance; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.gradle.api.Project; import org.gradle.api.provider.Property; diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java index d56048936d..061f77c4ff 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementTask.java @@ -7,7 +7,7 @@ package org.hibernate.orm.tooling.gradle.enhance; import java.util.concurrent.atomic.AtomicBoolean; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.gradle.api.DefaultTask; import org.gradle.api.Project; diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationSpec.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationSpec.java index 5fc18fc4c2..17e37cd406 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationSpec.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationSpec.java @@ -7,7 +7,7 @@ package org.hibernate.orm.tooling.gradle.metamodel; import java.util.Arrays; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.gradle.api.JavaVersion; import org.gradle.api.Project; diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationTask.java index abdf36bf2e..3aa6f84717 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationTask.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/JpaMetamodelGenerationTask.java @@ -14,12 +14,12 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import javax.inject.Inject; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.inject.Inject; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.gradle.api.DefaultTask; diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/JpaStaticMetamodelGenerator.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/JpaStaticMetamodelGenerator.java index 645d766a51..fd0eaa3f91 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/JpaStaticMetamodelGenerator.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/JpaStaticMetamodelGenerator.java @@ -11,7 +11,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitInfo; import org.gradle.api.file.Directory; import org.gradle.api.file.RegularFile; diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/MetamodelClass.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/MetamodelClass.java index bcde5938fd..28a17ba59b 100644 --- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/MetamodelClass.java +++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/metamodel/model/MetamodelClass.java @@ -103,9 +103,9 @@ public class MetamodelClass { writer.write( LINE_SEPARATOR ); writer.write( LINE_SEPARATOR ); - writer.write( "import javax.persistence.*;" ); + writer.write( "import jakarta.persistence.*;" ); writer.write( LINE_SEPARATOR ); - writer.write( "import javax.persistence.metamodel.*;" ); + writer.write( "import jakarta.persistence.metamodel.*;" ); writer.write( LINE_SEPARATOR ); writer.write( LINE_SEPARATOR ); @@ -117,7 +117,7 @@ public class MetamodelClass { final JavaVersion javaVersion = spec.getTargetJavaVersionAccess().getOrElse( JavaVersion.current() ); final String qualifiedAnnotationName = javaVersion.isJava9Compatible() ? "javax.annotation.processing.Generated" - : "javax.annotation.Generated"; + : "jakarta.annotation.Generated"; final String generatedAnnotationFragment = String.format( Locale.ROOT, "@%s( value=\"%s\", date=\"%s\", comments=\"%s\" )", diff --git a/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEmbeddable.java b/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEmbeddable.java index 78827d75f9..3223c777e1 100644 --- a/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEmbeddable.java +++ b/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEmbeddable.java @@ -1,4 +1,4 @@ -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class TheEmbeddable { @@ -20,4 +20,4 @@ public class TheEmbeddable { public void setValueTwo(String valueTwo) { this.valueTwo = valueTwo; } -} \ No newline at end of file +} diff --git a/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEntity.java b/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEntity.java index 4e84a53205..d1900a97d0 100644 --- a/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEntity.java +++ b/tooling/hibernate-gradle-plugin/src/testKit/resources/simple/src/main/java/TheEntity.java @@ -1,10 +1,10 @@ -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.Set; @@ -76,4 +76,4 @@ public class TheEntity { public void setTheEmbeddableCollection(Set theEmbeddableCollection) { this.theEmbeddableCollection = theEmbeddableCollection; } -} \ No newline at end of file +} diff --git a/tooling/metamodel-generator-jakarta/hibernate-jpamodelgen-jakarta.gradle b/tooling/metamodel-generator-jakarta/hibernate-jpamodelgen-jakarta.gradle deleted file mode 100644 index f52f77ae9a..0000000000 --- a/tooling/metamodel-generator-jakarta/hibernate-jpamodelgen-jakarta.gradle +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -description = 'Annotation Processor to generate JPA 3 static metamodel classes' - -evaluationDependsOn( ':hibernate-jpamodelgen' ) - -apply from: rootProject.file( 'gradle/published-jakarta-java-module.gradle' ) - -configurations { - jakartaeeTransformJars -} - -dependencies { - // JAXB - implementation( libraries.jakarta_jaxb_api ) - implementation( libraries.jakarta_jaxb_runtime ) - - jakartaeeTransformJars 'biz.aQute.bnd:biz.aQute.bnd.transform:5.1.1', - 'commons-cli:commons-cli:1.4', - 'org.slf4j:slf4j-simple:1.7.30', - 'org.slf4j:slf4j-api:1.7.26', - 'org.eclipse.transformer:org.eclipse.transformer:0.2.0', - 'org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0' - testImplementation fileTree(dir: 'libs', include: '*.jar') -} - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// main jar - -//task jakartafyJar( type: JakartaJarTransformation ) { -// dependsOn project(':hibernate-jpamodelgen').tasks.jar -// sourceJar = project(':hibernate-jpamodelgen').tasks.jar.archiveFile -// targetJar = tasks.jar.archiveFile -//} -// -//tasks.jar { -// enabled false -// dependsOn tasks.jakartafyJar -//} - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// javadoc jar - -//tasks.javadocJar { -// enabled false -//} -// -//task jakartafyJavadocJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.javadocJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.javadocJar.dependsOn project(':hibernate-core').tasks.javadocJar -//tasks.javadocJar.finalizedBy tasks.jakartafyJavadocJar -//tasks.jakartafyJavadocJar.dependsOn tasks.javadocJar -//tasks.jakartafyJavadocJar.mustRunAfter tasks.javadocJar -// -// - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// sources jar - -//tasks.sourcesJar { -// enabled false -//} -// -//task jakartafySourcesJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.sourcesJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.sourcesJar.dependsOn project(':hibernate-core').tasks.sourcesJar -//tasks.sourcesJar.finalizedBy tasks.jakartafySourcesJar -//tasks.jakartafySourcesJar.dependsOn tasks.sourcesJar -//tasks.jakartafySourcesJar.mustRunAfter tasks.sourcesJar diff --git a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle b/tooling/metamodel-generator/hibernate-jpamodelgen.gradle index 0582261416..d0d230d9ac 100644 --- a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle +++ b/tooling/metamodel-generator/hibernate-jpamodelgen.gradle @@ -4,13 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ +plugins { + id 'org.hibernate.build.xjc-jakarta' +} description = 'Annotation Processor to generate JPA 2 static metamodel classes' apply from: rootProject.file( 'gradle/published-java-module.gradle' ) apply plugin: 'version-injection' -apply plugin: 'org.hibernate.build.gradle.xjc' - ext { xjcTargetDir = file( "${buildDir}/generated/sources/xjc/main" ) @@ -21,11 +22,9 @@ dependencies { implementation libraries.jaxb_api implementation libraries.jaxb_runtime - xjc libraries.jaxb_runtime - xjc libraries.jaxb_xjc - xjc libraries.jaxb2_basics - xjc libraries.jaxb2_basics_ant - xjc libraries.activation + xjc libraries.jakarta_jaxb_xjc + xjc libraries.jakarta_jaxb_runtime + xjc rootProject.fileTree(dir: 'patched-libs/jaxb2-basics', include: '*.jar') testImplementation project( ':hibernate-core' ) testImplementation libraries.junit diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java index 0d5af2ce72..a0c7976e45 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java @@ -218,6 +218,6 @@ public final class ClassWriter { } private static String writeStaticMetaModelAnnotation(MetaEntity entity) { - return "@" + entity.importType( "javax.persistence.metamodel.StaticMetamodel" ) + "(" + entity.getSimpleName() + ".class)"; + return "@" + entity.importType( "jakarta.persistence.metamodel.StaticMetamodel" ) + "(" + entity.getSimpleName() + ".class)"; } } diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java index 5b1721fedb..cb713288a3 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java @@ -44,7 +44,7 @@ import org.hibernate.jpamodelgen.xml.JpaDescriptorParser; * @author Emmanuel Bernard */ @SupportedAnnotationTypes({ - "javax.persistence.Entity", "javax.persistence.MappedSuperclass", "javax.persistence.Embeddable" + "jakarta.persistence.Entity", "jakarta.persistence.MappedSuperclass", "jakarta.persistence.Embeddable" }) @SupportedOptions({ JPAMetaModelEntityProcessor.DEBUG_OPTION, diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java index ea0defcb55..73f1928d96 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java @@ -23,6 +23,6 @@ public class AnnotationMetaSingleAttribute extends AnnotationMetaAttribute imple @Override public final String getMetaType() { - return "javax.persistence.metamodel.SingularAttribute"; + return "jakarta.persistence.metamodel.SingularAttribute"; } } diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/Constants.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/Constants.java index 47b1f9f33c..863f5e6ee7 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/Constants.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/Constants.java @@ -14,52 +14,52 @@ import java.util.Map; */ public final class Constants { // we are trying to to reference jpa annotations directly - public static final String ENTITY = "javax.persistence.Entity"; - public static final String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass"; - public static final String EMBEDDABLE = "javax.persistence.Embeddable"; - public static final String ID = "javax.persistence.Id"; - public static final String EMBEDDED_ID = "javax.persistence.EmbeddedId"; - public static final String TRANSIENT = "javax.persistence.Transient"; - public static final String BASIC = "javax.persistence.Basic"; - public static final String ONE_TO_ONE = "javax.persistence.OneToOne"; - public static final String ONE_TO_MANY = "javax.persistence.OneToMany"; - public static final String MANY_TO_ONE = "javax.persistence.ManyToOne"; - public static final String MANY_TO_MANY = "javax.persistence.ManyToMany"; - public static final String MAP_KEY_CLASS = "javax.persistence.MapKeyClass"; - public static final String ELEMENT_COLLECTION = "javax.persistence.ElementCollection"; - public static final String ACCESS = "javax.persistence.Access"; - public static final String MAP_ATTRIBUTE = "javax.persistence.metamodel.MapAttribute"; - public static final String CONVERT = "javax.persistence.Convert"; + public static final String ENTITY = "jakarta.persistence.Entity"; + public static final String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; + public static final String EMBEDDABLE = "jakarta.persistence.Embeddable"; + public static final String ID = "jakarta.persistence.Id"; + public static final String EMBEDDED_ID = "jakarta.persistence.EmbeddedId"; + public static final String TRANSIENT = "jakarta.persistence.Transient"; + public static final String BASIC = "jakarta.persistence.Basic"; + public static final String ONE_TO_ONE = "jakarta.persistence.OneToOne"; + public static final String ONE_TO_MANY = "jakarta.persistence.OneToMany"; + public static final String MANY_TO_ONE = "jakarta.persistence.ManyToOne"; + public static final String MANY_TO_MANY = "jakarta.persistence.ManyToMany"; + public static final String MAP_KEY_CLASS = "jakarta.persistence.MapKeyClass"; + public static final String ELEMENT_COLLECTION = "jakarta.persistence.ElementCollection"; + public static final String ACCESS = "jakarta.persistence.Access"; + public static final String MAP_ATTRIBUTE = "jakarta.persistence.metamodel.MapAttribute"; + public static final String CONVERT = "jakarta.persistence.Convert"; public static final String HIBERNATE_TYPE = "org.hibernate.annotations.Type"; public static final Map COLLECTIONS = allCollectionTypes(); - private static java.util.Map allCollectionTypes() { + private static Map allCollectionTypes() { Map map = new java.util.HashMap<>(); - map.put( java.util.Collection.class.getName(), "javax.persistence.metamodel.CollectionAttribute" ); - map.put( java.util.Set.class.getName(), "javax.persistence.metamodel.SetAttribute" ); - map.put( java.util.List.class.getName(), "javax.persistence.metamodel.ListAttribute" ); - map.put( java.util.Map.class.getName(), "javax.persistence.metamodel.MapAttribute" ); + map.put( java.util.Collection.class.getName(), "jakarta.persistence.metamodel.CollectionAttribute" ); + map.put( java.util.Set.class.getName(), "jakarta.persistence.metamodel.SetAttribute" ); + map.put( List.class.getName(), "jakarta.persistence.metamodel.ListAttribute" ); + map.put( Map.class.getName(), "jakarta.persistence.metamodel.MapAttribute" ); // Hibernate also supports the SortedSet and SortedMap interfaces - map.put( java.util.SortedSet.class.getName(), "javax.persistence.metamodel.SetAttribute" ); - map.put( java.util.SortedMap.class.getName(), "javax.persistence.metamodel.MapAttribute" ); + map.put( java.util.SortedSet.class.getName(), "jakarta.persistence.metamodel.SetAttribute" ); + map.put( java.util.SortedMap.class.getName(), "jakarta.persistence.metamodel.MapAttribute" ); return java.util.Collections.unmodifiableMap( map ); } public static final List BASIC_TYPES = allBasicTypes(); - private static java.util.List allBasicTypes() { + private static List allBasicTypes() { java.util.ArrayList strings = new java.util.ArrayList<>(); - strings.add( java.lang.String.class.getName() ); - strings.add( java.lang.Boolean.class.getName() ); - strings.add( java.lang.Byte.class.getName() ); - strings.add( java.lang.Character.class.getName() ); - strings.add( java.lang.Short.class.getName() ); - strings.add( java.lang.Integer.class.getName() ); - strings.add( java.lang.Long.class.getName() ); - strings.add( java.lang.Float.class.getName() ); - strings.add( java.lang.Double.class.getName() ); + strings.add( String.class.getName() ); + strings.add( Boolean.class.getName() ); + strings.add( Byte.class.getName() ); + strings.add( Character.class.getName() ); + strings.add( Short.class.getName() ); + strings.add( Integer.class.getName() ); + strings.add( Long.class.getName() ); + strings.add( Float.class.getName() ); + strings.add( Double.class.getName() ); strings.add( java.math.BigInteger.class.getName() ); strings.add( java.math.BigDecimal.class.getName() ); strings.add( java.util.Date.class.getName() ); @@ -73,10 +73,10 @@ public final class Constants { public static final List BASIC_ARRAY_TYPES = allBasicArrayTypes(); - private static java.util.List allBasicArrayTypes() { + private static List allBasicArrayTypes() { java.util.ArrayList strings = new java.util.ArrayList<>(); - strings.add( java.lang.Character.class.getName() ); - strings.add( java.lang.Byte.class.getName() ); + strings.add( Character.class.getName() ); + strings.add( Byte.class.getName() ); return java.util.Collections.unmodifiableList( strings ); } diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/ContextProvidingValidationEventHandler.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/ContextProvidingValidationEventHandler.java index 0047eda1fd..4193257093 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/ContextProvidingValidationEventHandler.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/ContextProvidingValidationEventHandler.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.util.xml; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEventLocator; /** * Validation event handler used for obtaining line and column numbers in case of parsing failures. diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/XmlParserHelper.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/XmlParserHelper.java index 29ad231388..d22222a88a 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/XmlParserHelper.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/xml/XmlParserHelper.java @@ -13,9 +13,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.tools.FileObject; import javax.tools.StandardLocation; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/JpaDescriptorParser.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/JpaDescriptorParser.java index 537a963fcd..5619ab4f99 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/JpaDescriptorParser.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/JpaDescriptorParser.java @@ -219,13 +219,13 @@ public class JpaDescriptorParser { final File file = getSerializationTmpFile(); if ( file.exists() ) { try { - try ( java.io.FileInputStream fileInputStream = new java.io.FileInputStream( file ) ) { - try ( java.io.ObjectInputStream in = new java.io.ObjectInputStream( fileInputStream ) ) { - return (org.hibernate.jpamodelgen.util.FileTimeStampChecker) in.readObject(); + try ( FileInputStream fileInputStream = new FileInputStream( file ) ) { + try ( ObjectInputStream in = new ObjectInputStream( fileInputStream ) ) { + return (FileTimeStampChecker) in.readObject(); } } } - catch (java.io.IOException e) { + catch (IOException e) { //handled in the outer scope } catch (ClassNotFoundException e) { diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java index f1ff7b9274..18466bac1b 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java @@ -54,10 +54,10 @@ public class XmlMetaEntity implements MetaEntity { static final Map COLLECTIONS = new HashMap(); static { - COLLECTIONS.put( "java.util.Collection", "javax.persistence.metamodel.CollectionAttribute" ); - COLLECTIONS.put( "java.util.Set", "javax.persistence.metamodel.SetAttribute" ); - COLLECTIONS.put( "java.util.List", "javax.persistence.metamodel.ListAttribute" ); - COLLECTIONS.put( "java.util.Map", "javax.persistence.metamodel.MapAttribute" ); + COLLECTIONS.put( "java.util.Collection", "jakarta.persistence.metamodel.CollectionAttribute" ); + COLLECTIONS.put( "java.util.Set", "jakarta.persistence.metamodel.SetAttribute" ); + COLLECTIONS.put( "java.util.List", "jakarta.persistence.metamodel.ListAttribute" ); + COLLECTIONS.put( "java.util.Map", "jakarta.persistence.metamodel.MapAttribute" ); } private final String clazzName; @@ -244,7 +244,7 @@ public class XmlMetaEntity implements MetaEntity { String[] types = new String[3]; determineTargetType( type, propertyName, explicitTargetEntity, types ); determineCollectionType( type, types ); - if ( types[1].equals( "javax.persistence.metamodel.MapAttribute" ) ) { + if ( types[1].equals( "jakarta.persistence.metamodel.MapAttribute" ) ) { determineMapType( type, explicitMapKeyClass, types ); } return types; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java index abd140791e..8250737d11 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java @@ -19,6 +19,6 @@ public class XmlMetaSingleAttribute extends XmlMetaAttribute implements MetaSing @Override public String getMetaType() { - return "javax.persistence.metamodel.SingularAttribute"; + return "jakarta.persistence.metamodel.SingularAttribute"; } } diff --git a/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java b/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java index 8803f74dde..f75f3b86f7 100644 --- a/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java +++ b/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java @@ -6,8 +6,8 @@ */ -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java index 918d05e805..0eee5ea043 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java @@ -7,16 +7,16 @@ package org.hibernate.jpamodelgen.test.accesstype; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Access; -import javax.persistence.ElementCollection; -import javax.persistence.CollectionTable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.CollectionTable; /** * @author Emmanuel Bernard */ @Embeddable -@Access(javax.persistence.AccessType.PROPERTY) +@Access(jakarta.persistence.AccessType.PROPERTY) public class Address { private String street1; private String city; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java index a258bfb985..3d0a05798c 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java index 2b1e832176..cd86e499cd 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java index 8c1612dc7c..b06016101d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java index 91498f10aa..48ef205625 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java @@ -7,10 +7,10 @@ package org.hibernate.jpamodelgen.test.accesstype; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Access; -import javax.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java index fc8e8068f4..77b055323b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java index 9a8e3ad6f4..723745b29c 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java @@ -6,14 +6,14 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Entity; -import javax.persistence.Access; +import jakarta.persistence.Entity; +import jakarta.persistence.Access; /** * @author Emmanuel Bernard */ @Entity -@Access(javax.persistence.AccessType.FIELD) +@Access(jakarta.persistence.AccessType.FIELD) public class Hominidae extends Mammals { private int intelligence; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hotel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hotel.java index 0f996610c1..7651a23269 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hotel.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hotel.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Embeddable; -import javax.persistence.OneToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToOne; /** * @author gsmet diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/HotelRoom.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/HotelRoom.java index 29c846827b..a63a1952a4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/HotelRoom.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/HotelRoom.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Embedded; -import javax.persistence.Entity; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; /** * @author gsmet diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java index 8100f149e1..e8fb80ca5e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java index bb0cbd66cc..0e319f27a0 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java index 16c664dcd8..b0b98a7c0a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java @@ -7,15 +7,15 @@ package org.hibernate.jpamodelgen.test.accesstype; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Access; -import javax.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Access; +import jakarta.persistence.ElementCollection; /** * @author Emmanuel Bernard */ @Embeddable -@Access(javax.persistence.AccessType.FIELD) +@Access(jakarta.persistence.AccessType.FIELD) public class Inhabitant { private String name; @ElementCollection diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java index ca9dbd17d6..f8752311d7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java @@ -8,10 +8,10 @@ package org.hibernate.jpamodelgen.test.accesstype; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java index e8542a7bfd..72a00075bf 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java @@ -6,14 +6,14 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.MappedSuperclass; -import javax.persistence.Access; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Access; /** * @author Emmanuel Bernard */ @MappedSuperclass -@Access(javax.persistence.AccessType.FIELD) +@Access(jakarta.persistence.AccessType.FIELD) public class LivingBeing { boolean isReallyAlive; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java index 329284c4e9..6f00194d8a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java index a6935da495..4273ed1985 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java index 1634eb6657..4484398394 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java @@ -8,10 +8,10 @@ package org.hibernate.jpamodelgen.test.accesstype; import java.math.BigDecimal; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * @author Max Andersen diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Room.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Room.java index f9591ae763..fa1d2136d1 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Room.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Room.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author gsmet diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java index b02f6aefc6..36b817e789 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Max Andersen diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java index 488e08b762..a7afb6af1c 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.accesstype; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java index 1e3af52a91..5dd03a3717 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.arraytype; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java index ab7d3059d5..2110d56720 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.arraytype; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TestEntity.java index 720755622a..74c5f37b19 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TestEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TestEntity.java @@ -9,8 +9,8 @@ package org.hibernate.jpamodelgen.test.arraytype; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.TYPE_USE; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java index 9a4b72c15a..5c425f082d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java @@ -7,10 +7,10 @@ package org.hibernate.jpamodelgen.test.blob; import java.sql.Blob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ConcreteLike.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ConcreteLike.java index 7cbb14ea8e..5d1ff7007e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ConcreteLike.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ConcreteLike.java @@ -1,6 +1,6 @@ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity(name = "ConcreteLike") public class ConcreteLike extends Like { @@ -10,6 +10,6 @@ public class ConcreteLike extends Like { return new Reference<>(); } - public static class Target implements Like.I1, Like.I2 { + public static class Target implements I1, I2 { } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/EnumHolder.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/EnumHolder.java index 7f8ea324a4..1e85ea4f8d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/EnumHolder.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/EnumHolder.java @@ -1,6 +1,6 @@ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EnumHolder { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Goods.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Goods.java index c1ddafefe9..c41bfc54b4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Goods.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Goods.java @@ -6,11 +6,11 @@ */ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.validation.constraints.NotNull; import java.util.List; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Item.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Item.java index 85b600ae6a..4c41091020 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Item.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Item.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ItemRoleConverter.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ItemRoleConverter.java index 8241871cc5..d33b7e0ff3 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ItemRoleConverter.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/ItemRoleConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Like.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Like.java index a7f12494a3..c81dac503e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Like.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Like.java @@ -1,9 +1,9 @@ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * @author Thomas Heigl diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Person.java index c648f25e8d..7f6065c0b2 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Person.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Person.java @@ -2,8 +2,8 @@ package org.hibernate.jpamodelgen.test.collectionbasictype; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PersonPhone.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PersonPhone.java index 7d4c05417b..19e863f280 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PersonPhone.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PersonPhone.java @@ -2,8 +2,8 @@ package org.hibernate.jpamodelgen.test.collectionbasictype; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PhoneBook.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PhoneBook.java index 4ea42b0439..998f141081 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PhoneBook.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/PhoneBook.java @@ -2,8 +2,8 @@ package org.hibernate.jpamodelgen.test.collectionbasictype; import java.util.HashMap; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Product.java index 275c509254..5a86df5abd 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Product.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/Product.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author helloztt diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleExternal.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleExternal.java index dcf2963b74..d105bd9296 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleExternal.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleExternal.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleInternal.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleInternal.java index dc7b113667..b9039cf38a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleInternal.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/RoleInternal.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToListConverter.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToListConverter.java index 41b96aacf0..dce2d3d958 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToListConverter.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToListConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToUppercaseConverter.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToUppercaseConverter.java index 330ca000c5..5c478c2375 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToUppercaseConverter.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/collectionbasictype/StringToUppercaseConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.collectionbasictype; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java index 922fff13c4..761ca9e105 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.elementcollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Homework.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Homework.java index d096de4839..dc55c902f0 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Homework.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Homework.java @@ -9,7 +9,7 @@ package org.hibernate.jpamodelgen.test.elementcollection; import java.util.List; import java.util.Set; import java.util.TreeSet; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Bogdan Știrbăț diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java index a479e24471..d408620303 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java @@ -7,8 +7,8 @@ package org.hibernate.jpamodelgen.test.elementcollection; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.MapKeyClass; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.MapKeyClass; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java index 0da0d582d9..e535e50f05 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java @@ -7,12 +7,12 @@ package org.hibernate.jpamodelgen.test.elementcollection; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyClass; -import javax.persistence.OneToMany; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.OneToMany; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java index bdf9f6642a..232b60fbd3 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java @@ -7,9 +7,9 @@ package org.hibernate.jpamodelgen.test.elementcollection; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.MapKeyColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.MapKeyColumn; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuilding.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuilding.java index 03e12d78d3..ec323f6849 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuilding.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuilding.java @@ -8,8 +8,8 @@ package org.hibernate.jpamodelgen.test.elementcollection; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; @Entity public class OfficeBuilding { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuildingValidated.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuildingValidated.java index 0d912ee2a8..6c91afcfd5 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuildingValidated.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/OfficeBuildingValidated.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java index 24108dcf56..ea3905c3b5 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java @@ -7,7 +7,7 @@ package org.hibernate.jpamodelgen.test.elementcollection; import java.math.BigDecimal; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Base.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Base.java index 69908e2727..281acdc713 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Base.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Base.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.embeddable; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class Base { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/EmbeddableEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/EmbeddableEntity.java index 3ea948ecf4..79ed06ea64 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/EmbeddableEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/EmbeddableEntity.java @@ -8,8 +8,8 @@ package org.hibernate.jpamodelgen.test.embeddable; import java.util.HashSet; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.OneToMany; +import jakarta.persistence.Embeddable; +import jakarta.persistence.OneToMany; /* Here the getter is mandatory to reproduce the issue. No @Access(FIELD) annotation. */ @Embeddable diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/MyEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/MyEntity.java index 9ebb396302..df4b532061 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/MyEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/MyEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; @Entity public class MyEntity extends Base { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEmbeddable.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEmbeddable.java index 9f536a3370..d5d0e27345 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEmbeddable.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEmbeddable.java @@ -9,7 +9,7 @@ package org.hibernate.jpamodelgen.test.embeddable; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEntity.java index a61944a331..cdc1bc4952 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/SimpleEntity.java @@ -11,10 +11,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Stuff.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Stuff.java index c3ee15c439..4319f6ac16 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Stuff.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/Stuff.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.embeddable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Stuff extends Base implements IStuff { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ChildEmbeddable.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ChildEmbeddable.java index d3a3fcfef9..1910d5a85c 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ChildEmbeddable.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ChildEmbeddable.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.embeddable.generics; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ParentEmbeddable.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ParentEmbeddable.java index edd1d9ac5e..6eb19a5cf7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ParentEmbeddable.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddable/generics/ParentEmbeddable.java @@ -8,7 +8,7 @@ package org.hibernate.jpamodelgen.test.embeddable.generics; import java.util.Set; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Chris Cranford diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withinheritance/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withinheritance/TestEntity.java index 0c784982c8..732950c74a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withinheritance/TestEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withinheritance/TestEntity.java @@ -7,10 +7,10 @@ package org.hibernate.jpamodelgen.test.embeddedid.withinheritance; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.annotations.Immutable; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/Person.java index 2d117eb4e1..8a18803946 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/Person.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/Person.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.embeddedid.withoutinheritance; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/PersonId.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/PersonId.java index 9e03cd6522..75b13ed9ca 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/PersonId.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddedid/withoutinheritance/PersonId.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.embeddedid.withoutinheritance; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/TestEntity.java index c8cddbf4aa..0236b9eba7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/TestEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/TestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.generatedannotation; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java index de2323c56d..68de00558c 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java @@ -6,10 +6,10 @@ */ package org.hibernate.jpamodelgen.test.generics; -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 Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java index 14be09c34f..be38da82e9 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java @@ -7,14 +7,14 @@ package org.hibernate.jpamodelgen.test.generics; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/hashcode/HashEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/hashcode/HashEntity.java index b2e4c4604d..cae8fb9a05 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/hashcode/HashEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/hashcode/HashEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.hashcode; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/AbstractEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/AbstractEntity.java index a361aa00f3..e990ef1a6b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/AbstractEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/AbstractEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.inheritance.basic; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Area.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Area.java index d5c178419e..0759a322f9 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Area.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Area.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.inheritance.basic; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Building.java index f84237b79a..4979dacac7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Building.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Building.java @@ -7,7 +7,7 @@ package org.hibernate.jpamodelgen.test.inheritance.basic; import java.sql.Date; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Customer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Customer.java index be9ce48622..012ccda16a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Customer.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Customer.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.inheritance.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/House.java index 68015442f8..11f64f27e3 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/House.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/House.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.inheritance.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Person.java index 619a99bec3..876f807365 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Person.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/Person.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.inheritance.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/User.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/User.java index 56cbf4a32e..3cc81edb3f 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/User.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/basic/User.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.inheritance.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/DeepInheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/DeepInheritanceTest.java old mode 100755 new mode 100644 diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/JetPlane.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/JetPlane.java old mode 100755 new mode 100644 index 425e8e52da..7015071ff1 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/JetPlane.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/JetPlane.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.inheritance.deep; -import javax.persistence.Basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Basic; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * A {@link Plane} subclass entity that defines extra attributes diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/PersistenceBase.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/PersistenceBase.java old mode 100755 new mode 100644 index e77f68e4fb..7f3fdf8461 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/PersistenceBase.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/PersistenceBase.java @@ -7,8 +7,8 @@ package org.hibernate.jpamodelgen.test.inheritance.deep; import java.util.Date; -import javax.persistence.MappedSuperclass; -import javax.persistence.PrePersist; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; /** * A mapped super class that does not define an id attribute. diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/Plane.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/Plane.java old mode 100755 new mode 100644 index 857b2d6610..97ce308071 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/Plane.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/Plane.java @@ -6,14 +6,14 @@ */ package org.hibernate.jpamodelgen.test.inheritance.deep; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * A base entity that defines an id attribute. Default access level should be diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/BaseEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/BaseEntity.java index d708cec7d2..03e7ea5045 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/BaseEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/BaseEntity.java @@ -6,13 +6,13 @@ */ package org.hibernate.jpamodelgen.test.inheritance.unmappedclassinhierarchy; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity @Access(AccessType.FIELD) diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/MappedBase.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/MappedBase.java index 09181121a4..ed42cb7f78 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/MappedBase.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/MappedBase.java @@ -7,9 +7,9 @@ package org.hibernate.jpamodelgen.test.inheritance.unmappedclassinhierarchy; import java.util.Date; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass @Access(AccessType.FIELD) diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubA.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubA.java index a513cfbbc2..057fb6d256 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubA.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubA.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.inheritance.unmappedclassinhierarchy; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; @Entity @Access(AccessType.FIELD) diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubB.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubB.java index 252d11e891..93e9ae333e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubB.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/unmappedclassinhierarchy/SubB.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.inheritance.unmappedclassinhierarchy; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; @Entity @Access(AccessType.FIELD) diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java index 3776e7a70b..6e7f7c55f0 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/embeddablemappedsuperclass/EmbeddableAndMappedSuperClass.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.embeddablemappedsuperclass; -import javax.persistence.Embeddable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.MappedSuperclass; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java index 428c795ab7..0cf3053789 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/ConcreteProduct.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.mappedsuperclasswithoutid; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java index 68d9a2b1d9..215e3ff813 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Product.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.mappedsuperclasswithoutid; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import org.hibernate.jpamodelgen.test.accesstype.Shop; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java index bf5163f4d6..611ce8f10b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/mappedsuperclasswithoutid/Shop.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.mappedsuperclasswithoutid; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java index b78a9fa80d..8ad5ac20df 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroup.java @@ -7,9 +7,9 @@ package org.hibernate.jpamodelgen.test.mappedsuperclass.typedmappedsuperclass; import java.util.Set; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; @MappedSuperclass public abstract class AttachmentGroup, UserRoleType extends UserRole> { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupInTopic.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupInTopic.java index 6610c177f2..9fc70bbbd7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupInTopic.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupInTopic.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.typedmappedsuperclass; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachmentGroupInTopic diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java index e9fb58c927..78e759de4d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPost.java @@ -7,7 +7,7 @@ package org.hibernate.jpamodelgen.test.mappedsuperclass.typedmappedsuperclass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AttachmentGroupPost diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java index de58c8f90a..2b016af3ed 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/AttachmentGroupPostInTopic.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.typedmappedsuperclass; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class AttachmentGroupPostInTopic extends AttachmentGroupPost { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/Post.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/Post.java index 4db72f80e6..61d7149b10 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/Post.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/Post.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.typedmappedsuperclass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class Post { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/UserRole.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/UserRole.java index 9c462f4aa0..c1a9044b30 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/UserRole.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mappedsuperclass/typedmappedsuperclass/UserRole.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mappedsuperclass.typedmappedsuperclass; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class UserRole { diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java index f83cf10e03..38bdf4e5cf 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java index 42e12c228b..66d34e9cc4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java index 64af2a6744..cce27da2da 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java @@ -6,11 +6,11 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java index cb813523a6..2fe37fee09 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -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 Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java index 9e1608f544..246f5c4d4c 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java index 757f872e4a..7873d4a438 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -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 Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java index fd88f8a24b..7a8f49e142 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -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 Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java index d5b5ed1fc7..a62334bbd7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.mixedmode; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java index 94a6e0c2b3..9102c50e76 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java @@ -7,13 +7,13 @@ package org.hibernate.jpamodelgen.test.rawtypes; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java index e57a5a08e4..5357f8c9fc 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java @@ -7,11 +7,11 @@ package org.hibernate.jpamodelgen.test.rawtypes; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; /** * @author Emmanuel Bernard diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/Entity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/Entity.java index c858926ab5..5f34f3281b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/Entity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/Entity.java @@ -11,7 +11,7 @@ import org.hibernate.jpamodelgen.test.separatecompilationunits.superclass.Mapped /** * @author Hardy Ferentschik */ -@javax.persistence.Entity +@jakarta.persistence.Entity public class Entity extends MappedSuperclass { private String name; } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/superclass/MappedSuperclass.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/superclass/MappedSuperclass.java index 3d1d7a80a8..3bc6f6fb1b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/superclass/MappedSuperclass.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/superclass/MappedSuperclass.java @@ -6,12 +6,12 @@ */ package org.hibernate.jpamodelgen.test.separatecompilationunits.superclass; -import javax.persistence.Id; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik */ -@javax.persistence.MappedSuperclass +@jakarta.persistence.MappedSuperclass public class MappedSuperclass { @Id private long id; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/PrintJob.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/PrintJob.java index 4b40f2dee0..487cdebc3b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/PrintJob.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/PrintJob.java @@ -6,10 +6,10 @@ */ package org.hibernate.jpamodelgen.test.sortedcollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/Printer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/Printer.java index bdb00f6f25..f9ec5bd9f7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/Printer.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/Printer.java @@ -8,10 +8,10 @@ package org.hibernate.jpamodelgen.test.sortedcollection; import java.util.SortedMap; import java.util.SortedSet; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.SortNatural; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/supresswarnings/TestEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/supresswarnings/TestEntity.java index 43867c531e..46a1269a53 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/supresswarnings/TestEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/supresswarnings/TestEntity.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.supresswarnings; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/Address.java index c2416e48dd..213a64dbf2 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/Address.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/Address.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpamodelgen.test.targetannotation; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/House.java index f9604c3563..d95f48d98e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/House.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/targetannotation/House.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.targetannotation; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Target; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java index 7cd638dfdf..2ba46583c8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.usertype; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java index 4ea8102182..7a264dbc8d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java @@ -18,8 +18,8 @@ import java.lang.reflect.Type; import java.net.URL; import java.net.URLClassLoader; import java.util.List; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.SetAttribute; import javax.tools.Diagnostic; import org.jboss.logging.Logger; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlembeddable/Foo.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlembeddable/Foo.java index bae6cb3ca9..21f48ce1e7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlembeddable/Foo.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlembeddable/Foo.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.xmlembeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java index 3728046feb..16342eb7bc 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java @@ -19,7 +19,7 @@ public class Building extends Area { return address; } - public void setAddress(org.hibernate.jpamodelgen.test.accesstype.Address address) { + public void setAddress(Address address) { this.address = address; } } diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java index 6cc2f738a9..602d9615e9 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java @@ -6,9 +6,9 @@ */ package org.hibernate.jpamodelgen.test.xmlmapped; -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 Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/multiplepus/Dummy.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/multiplepus/Dummy.java index 71cbf352d0..9586aa1fb8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/multiplepus/Dummy.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/multiplepus/Dummy.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.xmlmetacomplete.multiplepus; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/singlepu/Dummy.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/singlepu/Dummy.java index 934b765468..7d10d66b35 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/singlepu/Dummy.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/singlepu/Dummy.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpamodelgen.test.xmlmetacomplete.singlepu; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Hardy Ferentschik