diff --git a/framework/dependencies.yml b/framework/dependencies.yml index 27cb6832b1..d213878548 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -7,7 +7,6 @@ transitiveDependencies: false # This core dependencies are required by Play framework require: &allDependencies - - antlr 2.7.7 - com.mchange -> c3p0 0.10.1 - com.zaxxer -> HikariCP 5.1.0 - org.ow2.asm -> asm 9.7 @@ -55,19 +54,16 @@ require: &allDependencies - org.codehaus.groovy -> groovy-xml 3.0.22 - org.eclipse.jdt -> org.eclipse.jdt.core 3.33.0 - org.eclipse.jdt -> ecj 3.33.0 - - org.hibernate -> hibernate-core 5.6.5.Final.patched + - org.hibernate.orm -> hibernate-core 6.6.4.Final - net.bytebuddy -> byte-buddy 1.15.0 - - javax.persistence -> javax.persistence-api 2.2 - - org.hibernate.common -> hibernate-commons-annotations 5.1.2.Final + - jakarta.persistence -> jakarta.persistence-api 3.1.0 + - jakarta.transaction -> jakarta.transaction-api 2.0.1 - org.hibernate -> hibernate-validator 5.4.3.Final - io.smallrye -> jandex 3.2.2 - org.jboss.logging -> jboss-logging 3.6.0.Final - - org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.1.1.Final - javax.xml.bind -> jaxb-api 2.3.1 - org.glassfish.jaxb -> jaxb-runtime 2.3.9 - com.fasterxml -> classmate 1.7.0 - - org.hibernate -> hibernate-c3p0 5.6.15.Final - - org.hibernate -> hibernate-ehcache 5.6.15.Final - com.mchange -> mchange-commons-java 0.3.1 - org.javassist -> javassist 3.30.2-GA - io.netty -> netty 3.10.6.Final diff --git a/framework/lib/antlr-2.7.7.jar b/framework/lib/antlr-2.7.7.jar deleted file mode 100644 index 5e5f14b355..0000000000 Binary files a/framework/lib/antlr-2.7.7.jar and /dev/null differ diff --git a/framework/lib/hibernate-c3p0-5.6.15.Final.jar b/framework/lib/hibernate-c3p0-5.6.15.Final.jar deleted file mode 100644 index 21e5801556..0000000000 Binary files a/framework/lib/hibernate-c3p0-5.6.15.Final.jar and /dev/null differ diff --git a/framework/lib/hibernate-commons-annotations-5.1.2.Final.jar b/framework/lib/hibernate-commons-annotations-5.1.2.Final.jar deleted file mode 100644 index 0b2e88ff76..0000000000 Binary files a/framework/lib/hibernate-commons-annotations-5.1.2.Final.jar and /dev/null differ diff --git a/framework/lib/hibernate-core-5.6.5.Final.patched.jar b/framework/lib/hibernate-core-5.6.5.Final.patched.jar deleted file mode 100644 index 8ca50a34d3..0000000000 Binary files a/framework/lib/hibernate-core-5.6.5.Final.patched.jar and /dev/null differ diff --git a/framework/lib/hibernate-core-6.6.4.Final.jar b/framework/lib/hibernate-core-6.6.4.Final.jar new file mode 100644 index 0000000000..1f668ef1b5 Binary files /dev/null and b/framework/lib/hibernate-core-6.6.4.Final.jar differ diff --git a/framework/lib/hibernate-ehcache-5.6.15.Final.jar b/framework/lib/hibernate-ehcache-5.6.15.Final.jar deleted file mode 100644 index 7e927e4911..0000000000 Binary files a/framework/lib/hibernate-ehcache-5.6.15.Final.jar and /dev/null differ diff --git a/framework/lib/jakarta.persistence-api-3.1.0.jar b/framework/lib/jakarta.persistence-api-3.1.0.jar new file mode 100644 index 0000000000..4030796989 Binary files /dev/null and b/framework/lib/jakarta.persistence-api-3.1.0.jar differ diff --git a/framework/lib/jakarta.transaction-api-2.0.1.jar b/framework/lib/jakarta.transaction-api-2.0.1.jar new file mode 100644 index 0000000000..b1e7da4be4 Binary files /dev/null and b/framework/lib/jakarta.transaction-api-2.0.1.jar differ diff --git a/framework/lib/javax.persistence-api-2.2.jar b/framework/lib/javax.persistence-api-2.2.jar deleted file mode 100644 index 164ef3a99e..0000000000 Binary files a/framework/lib/javax.persistence-api-2.2.jar and /dev/null differ diff --git a/framework/lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar b/framework/lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar deleted file mode 100644 index 627f7cea80..0000000000 Binary files a/framework/lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar and /dev/null differ diff --git a/framework/src/play/classloading/enhancers/Enhancer.java b/framework/src/play/classloading/enhancers/Enhancer.java index 04743fb644..a3afeb106a 100644 --- a/framework/src/play/classloading/enhancers/Enhancer.java +++ b/framework/src/play/classloading/enhancers/Enhancer.java @@ -111,7 +111,7 @@ public URL find(String className) { * @param ctClass * the javassist class representation * @param annotation - * fully qualified name of the annotation class eg."javax.persistence.Entity" + * fully qualified name of the annotation class eg."jakarta.persistence.Entity" * @return true if class has the annotation * @throws java.lang.ClassNotFoundException * if class not found @@ -132,7 +132,7 @@ protected boolean hasAnnotation(CtClass ctClass, String annotation) throws Class * @param ctField * the javassist field representation * @param annotation - * fully qualified name of the annotation class eg."javax.persistence.Entity" + * fully qualified name of the annotation class eg."jakarta.persistence.Entity" * @return true if field has the annotation * @throws java.lang.ClassNotFoundException * if class not found @@ -153,7 +153,7 @@ protected boolean hasAnnotation(CtField ctField, String annotation) throws Class * @param ctMethod * the javassist method representation * @param annotation - * fully qualified name of the annotation class eg."javax.persistence.Entity" + * fully qualified name of the annotation class eg."jakarta.persistence.Entity" * @return true if field has the annotation * @throws java.lang.ClassNotFoundException * if class not found diff --git a/framework/src/play/db/DB.java b/framework/src/play/db/DB.java index 8c2de5eaee..c32073202b 100644 --- a/framework/src/play/db/DB.java +++ b/framework/src/play/db/DB.java @@ -16,8 +16,6 @@ import javax.sql.rowset.CachedRowSet; import javax.sql.rowset.RowSetProvider; -import org.hibernate.internal.SessionImpl; - import play.Logger; import play.db.jpa.JPA; import play.exceptions.DatabaseException; @@ -171,7 +169,8 @@ public static void close(String name) { public static Connection getConnection(String name) { try { if (JPA.isEnabled()) { - return JPA.em(name).unwrap(SessionImpl.class).getSession().connection(); + return JPA.em(name).unwrap(org.hibernate.Session.class) + .doReturningWork(connection -> connection); } Connection localConnection = getLocalConnection(name); diff --git a/framework/src/play/db/evolutions/EvolutionQuery.java b/framework/src/play/db/evolutions/EvolutionQuery.java index 92ff710621..d248c778c4 100644 --- a/framework/src/play/db/evolutions/EvolutionQuery.java +++ b/framework/src/play/db/evolutions/EvolutionQuery.java @@ -259,7 +259,7 @@ private static synchronized boolean isOracleDialectInUse(String dbName) { Class dialectClass = Play.classloader.loadClass(jpaDialect); // Oracle 8i dialect is the base class for oracle dialects (at least for now) - isOracle = org.hibernate.dialect.Oracle8iDialect.class.isAssignableFrom(dialectClass); + isOracle = org.hibernate.dialect.OracleDialect.class.isAssignableFrom(dialectClass); } catch (ClassNotFoundException e) { // swallow Logger.warn("jpa.dialect class %s not found", jpaDialect); diff --git a/framework/src/play/db/helper/JpaHelper.java b/framework/src/play/db/helper/JpaHelper.java index 29c0d2c140..170b5e0720 100644 --- a/framework/src/play/db/helper/JpaHelper.java +++ b/framework/src/play/db/helper/JpaHelper.java @@ -1,7 +1,7 @@ package play.db.helper; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import play.db.jpa.JPA; public class JpaHelper { diff --git a/framework/src/play/db/jpa/Blob.java b/framework/src/play/db/jpa/Blob.java index 74bd42505f..2fe9f1a607 100644 --- a/framework/src/play/db/jpa/Blob.java +++ b/framework/src/play/db/jpa/Blob.java @@ -12,7 +12,6 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.type.StringType; import org.hibernate.usertype.UserType; import play.Play; @@ -21,7 +20,7 @@ import play.libs.Codec; import play.libs.IO; -public class Blob implements BinaryField, UserType { +public class Blob implements BinaryField, UserType { private String UUID; private String type; @@ -81,45 +80,45 @@ public File getFile() { } return file; } - + public String getUUID() { return UUID; } @Override - public int[] sqlTypes() { - return new int[] {Types.VARCHAR}; + public int getSqlType() { + return Types.VARCHAR; } @Override - public Class returnedClass() { + public Class returnedClass() { return Blob.class; } @Override - public boolean equals(Object o, Object o1) throws HibernateException { + public boolean equals(Blob o, Blob o1) throws HibernateException { if(o instanceof Blob && o1 instanceof Blob) { - return Objects.equals(((Blob) o).UUID, ((Blob) o1).UUID) && - Objects.equals(((Blob)o).type, ((Blob)o1).type); + return Objects.equals(o.UUID, o1.UUID) && + Objects.equals(o.type, o1.type); } return Objects.equals(o, o1); } @Override - public int hashCode(Object o) throws HibernateException { + public int hashCode(Blob o) throws HibernateException { return o.hashCode(); } @Override - public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException { - String val = (String) StringType.INSTANCE.nullSafeGet(rs, names[0], session, owner); + public Blob nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException { + String val = rs.getString(position); return new Blob(val); } @Override - public void nullSafeSet(PreparedStatement ps, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException { + public void nullSafeSet(PreparedStatement ps, Blob value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException { if (value != null) { - ps.setString(index, encode((Blob) value)); + ps.setString(index, encode(value)); } else { ps.setNull(index, Types.VARCHAR); } @@ -130,11 +129,11 @@ private String encode(Blob o) { } @Override - public Object deepCopy(Object o) throws HibernateException { + public Blob deepCopy(Blob o) throws HibernateException { if(o == null) { return null; } - return new Blob(((Blob)o).UUID, ((Blob)o).type); + return new Blob(o.UUID, o.type); } @Override @@ -143,19 +142,19 @@ public boolean isMutable() { } @Override - public Serializable disassemble(Object o) throws HibernateException { + public Serializable disassemble(Blob o) throws HibernateException { if (o == null) return null; - return encode((Blob) o); + return encode(o); } @Override - public Object assemble(Serializable cached, Object owner) throws HibernateException { + public Blob assemble(Serializable cached, Object owner) throws HibernateException { if (cached == null) return null; return new Blob((String) cached); } @Override - public Object replace(Object original, Object target, Object owner) throws HibernateException { + public Blob replace(Blob original, Blob target, Object owner) throws HibernateException { return original; } @@ -174,5 +173,5 @@ public static File getStore() { } return store; } - + } diff --git a/framework/src/play/db/jpa/FileAttachment.java b/framework/src/play/db/jpa/FileAttachment.java index 74366af94c..b885cb44ed 100644 --- a/framework/src/play/db/jpa/FileAttachment.java +++ b/framework/src/play/db/jpa/FileAttachment.java @@ -1,8 +1,8 @@ package play.db.jpa; import java.io.File; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import play.Play; import play.libs.Files; diff --git a/framework/src/play/db/jpa/GenericModel.java b/framework/src/play/db/jpa/GenericModel.java index 10ec708fe2..f1d8269a7b 100644 --- a/framework/src/play/db/jpa/GenericModel.java +++ b/framework/src/play/db/jpa/GenericModel.java @@ -15,16 +15,16 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.NoResultException; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostUpdate; -import javax.persistence.Query; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.NoResultException; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.Query; import org.apache.commons.lang3.StringUtils; @@ -425,7 +425,7 @@ public T delete() { * @return The created entity. */ public static T create(String name, Params params) { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -434,7 +434,7 @@ public static T create(String name, Params params) { * @return number of entities of this class */ public static long count() { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -447,7 +447,7 @@ public static long count() { * @return A long */ public static long count(String query, Object... params) { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -458,7 +458,7 @@ public static long count(String query, Object... params) { * @return All entities of this type */ public static List findAll() { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -471,7 +471,7 @@ public static List findAll() { * @return The entity */ public static T findById(Object id) { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -484,7 +484,7 @@ public static T findById(Object id) { * @return A JPAQuery */ public static JPAQuery find(String query, Object... params) { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -493,7 +493,7 @@ public static JPAQuery find(String query, Object... params) { * @return A JPAQuery */ public static JPAQuery all() { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -506,7 +506,7 @@ public static JPAQuery all() { * @return Number of entities deleted */ public static int delete(String query, Object... params) { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** @@ -515,7 +515,7 @@ public static int delete(String query, Object... params) { * @return Number of entities deleted */ public static int deleteAll() { - throw new UnsupportedOperationException("Please annotate your JPA model with @javax.persistence.Entity annotation."); + throw new UnsupportedOperationException("Please annotate your JPA model with @jakarta.persistence.Entity annotation."); } /** diff --git a/framework/src/play/db/jpa/HibernateInterceptor.java b/framework/src/play/db/jpa/HibernateInterceptor.java index f719abe4ba..d98894c5e4 100644 --- a/framework/src/play/db/jpa/HibernateInterceptor.java +++ b/framework/src/play/db/jpa/HibernateInterceptor.java @@ -2,13 +2,13 @@ import org.hibernate.CallbackException; -import org.hibernate.EmptyInterceptor; +import org.hibernate.Interceptor; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.type.Type; import java.io.Serializable; -public class HibernateInterceptor extends EmptyInterceptor { +public class HibernateInterceptor implements Interceptor { public HibernateInterceptor() { @@ -26,64 +26,48 @@ public int[] findDirty(Object o, Serializable id, Object[] arg2, Object[] arg3, } @Override - public boolean onCollectionUpdate(Object collection, Serializable key) throws CallbackException { + public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException { if (!JPAPlugin.explicitSave) { - return true; + return; } if (collection instanceof PersistentCollection) { Object o = ((PersistentCollection) collection).getOwner(); if (o instanceof JPABase) { - if (entities.get() instanceof JPABase) { - return ((JPABase) o).willBeSaved || ((JPABase) entities.get()).willBeSaved; - } else { - return ((JPABase) o).willBeSaved; - } + // nothing to return - side effect only } } else { System.out.println("HOO: Case not handled !!!"); } - return super.onCollectionUpdate(collection, key); } @Override - public boolean onCollectionRecreate(Object collection, Serializable key) throws CallbackException { + public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException { if (!JPAPlugin.explicitSave) { - return true; + return; } if (collection instanceof PersistentCollection) { Object o = ((PersistentCollection) collection).getOwner(); if (o instanceof JPABase) { - if (entities.get() instanceof JPABase) { - return ((JPABase) o).willBeSaved || ((JPABase) entities.get()).willBeSaved; - } else { - return ((JPABase) o).willBeSaved; - } + // nothing to return - side effect only } } else { System.out.println("HOO: Case not handled !!!"); } - - return super.onCollectionRecreate(collection, key); } @Override - public boolean onCollectionRemove(Object collection, Serializable key) throws CallbackException { + public void onCollectionRemove(Object collection, Serializable key) throws CallbackException { if (!JPAPlugin.explicitSave) { - return true; + return; } if (collection instanceof PersistentCollection) { Object o = ((PersistentCollection) collection).getOwner(); if (o instanceof JPABase) { - if (entities.get() instanceof JPABase) { - return ((JPABase) o).willBeSaved || ((JPABase) entities.get()).willBeSaved; - } else { - return ((JPABase) o).willBeSaved; - } + // nothing to return - side effect only } } else { System.out.println("HOO: Case not handled !!!"); } - return super.onCollectionRemove(collection, key); } protected final ThreadLocal entities = new ThreadLocal<>(); @@ -91,11 +75,11 @@ public boolean onCollectionRemove(Object collection, Serializable key) throws Ca @Override public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { entities.set(entity); - return super.onSave(entity, id, state, propertyNames, types); + return false; } @Override public void afterTransactionCompletion(org.hibernate.Transaction tx) { entities.remove(); } -} \ No newline at end of file +} diff --git a/framework/src/play/db/jpa/JPA.java b/framework/src/play/db/jpa/JPA.java index d925c9ed8f..953e8d314f 100644 --- a/framework/src/play/db/jpa/JPA.java +++ b/framework/src/play/db/jpa/JPA.java @@ -3,12 +3,12 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.FlushModeType; -import javax.persistence.PersistenceException; -import javax.persistence.PersistenceUnit; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PersistenceUnit; import play.Invoker.InvocationContext; import play.Invoker.Suspend; diff --git a/framework/src/play/db/jpa/JPABase.java b/framework/src/play/db/jpa/JPABase.java index cb26b49f47..21c567d66a 100644 --- a/framework/src/play/db/jpa/JPABase.java +++ b/framework/src/play/db/jpa/JPABase.java @@ -11,16 +11,16 @@ import java.util.Map; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.EntityManager; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.PersistenceException; - -import org.hibernate.collection.internal.PersistentMap; +import jakarta.persistence.CascadeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PersistenceException; + +import org.hibernate.collection.spi.PersistentMap; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.EntityEntry; diff --git a/framework/src/play/db/jpa/JPAEnhancer.java b/framework/src/play/db/jpa/JPAEnhancer.java index 6f67502445..6bf1a07faa 100644 --- a/framework/src/play/db/jpa/JPAEnhancer.java +++ b/framework/src/play/db/jpa/JPAEnhancer.java @@ -22,14 +22,14 @@ public void enhanceThisClass(ApplicationClass applicationClass) throws Exception } // Enhance only JPA entities - if (!hasAnnotation(ctClass, "javax.persistence.Entity")) { + if (!hasAnnotation(ctClass, "jakarta.persistence.Entity")) { return; } AnnotationsAttribute annotation = getAnnotations(ctClass); String dbName = JPA.DEFAULT; if (annotation != null) { - Annotation an = annotation.getAnnotation("javax.persistence.PersistenceUnit"); + Annotation an = annotation.getAnnotation("jakarta.persistence.PersistenceUnit"); if (an != null) { dbName = ((StringMemberValue)an.getMemberValue("name")).getValue(); } diff --git a/framework/src/play/db/jpa/JPAModelLoader.java b/framework/src/play/db/jpa/JPAModelLoader.java index 4040854404..0921f7959b 100644 --- a/framework/src/play/db/jpa/JPAModelLoader.java +++ b/framework/src/play/db/jpa/JPAModelLoader.java @@ -14,19 +14,19 @@ import java.util.Map; import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Query; -import javax.persistence.Transient; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Query; +import jakarta.persistence.Transient; import org.apache.commons.beanutils.PropertyUtils; diff --git a/framework/src/play/db/jpa/JPAPlugin.java b/framework/src/play/db/jpa/JPAPlugin.java index ffe3d9b7a8..5fac8fe6d6 100644 --- a/framework/src/play/db/jpa/JPAPlugin.java +++ b/framework/src/play/db/jpa/JPAPlugin.java @@ -7,15 +7,15 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.FlushModeType; -import javax.persistence.NoResultException; -import javax.persistence.PersistenceException; -import javax.persistence.PersistenceUnit; -import javax.persistence.Query; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.Query; +import jakarta.persistence.spi.PersistenceUnitInfo; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configurator; import org.hibernate.cfg.AvailableSettings; @@ -218,8 +218,8 @@ private List mappingFiles(Configuration dbConfig) { protected Properties properties(String dbName, Configuration dbConfig) { Properties properties = new Properties(); properties.putAll(dbConfig.getProperties()); - properties.put("javax.persistence.transaction", "RESOURCE_LOCAL"); - properties.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence"); + properties.put("jakarta.persistence.transaction", "RESOURCE_LOCAL"); + properties.put("jakarta.persistence.provider", "org.hibernate.ejb.HibernatePersistence"); properties.put("hibernate.dialect", getDefaultDialect(dbConfig, dbConfig.getProperty("db.driver"))); if (!dbConfig.getProperty("jpa.ddl", Play.mode.isDev() ? "update" : "none").equals("none")) { @@ -243,41 +243,17 @@ public static String getDefaultDialect(Configuration dbConfig, String driver) { } else if ("org.hsqldb.jdbcDriver".equals(driver)) { return "org.hibernate.dialect.HSQLDialect"; } else if ("com.mysql.cj.jdbc.Driver".equals(driver)) { - return "org.hibernate.dialect.MySQL8Dialect"; + return "org.hibernate.dialect.MySQLDialect"; } else if ("com.mysql.jdbc.Driver".equals(driver)) { return "play.db.jpa.MySQLDialect"; } else if ("org.postgresql.Driver".equals(driver)) { return "org.hibernate.dialect.PostgreSQLDialect"; } else if ("com.ibm.db2.jdbc.app.DB2Driver".equals(driver)) { return "org.hibernate.dialect.DB2Dialect"; - } else if ("com.ibm.as400.access.AS400JDBCDriver".equals(driver)) { - return "org.hibernate.dialect.DB2400Dialect"; - } else if ("com.ibm.as400.access.AS390JDBCDriver".equals(driver)) { - return "org.hibernate.dialect.DB2390Dialect"; } else if ("oracle.jdbc.OracleDriver".equals(driver)) { - return "org.hibernate.dialect.Oracle10gDialect"; - } else if ("com.sybase.jdbc2.jdbc.SybDriver".equals(driver)) { - return "org.hibernate.dialect.SybaseAnywhereDialect"; + return "org.hibernate.dialect.OracleDialect"; } else if ("com.microsoft.jdbc.sqlserver.SQLServerDriver".equals(driver)) { return "org.hibernate.dialect.SQLServerDialect"; - } else if ("com.sap.dbtech.jdbc.DriverSapDB".equals(driver)) { - return "org.hibernate.dialect.SAPDBDialect"; - } else if ("com.informix.jdbc.IfxDriver".equals(driver)) { - return "org.hibernate.dialect.InformixDialect"; - } else if ("com.ingres.jdbc.IngresDriver".equals(driver)) { - return "org.hibernate.dialect.IngresDialect"; - } else if ("progress.sql.jdbc.JdbcProgressDriver".equals(driver)) { - return "org.hibernate.dialect.ProgressDialect"; - } else if ("com.mckoi.JDBCDriver".equals(driver)) { - return "org.hibernate.dialect.MckoiDialect"; - } else if ("InterBase.interclient.Driver".equals(driver)) { - return "org.hibernate.dialect.InterbaseDialect"; - } else if ("com.pointbase.jdbc.jdbcUniversalDriver".equals(driver)) { - return "org.hibernate.dialect.PointbaseDialect"; - } else if ("com.frontbase.jdbc.FBJDriver".equals(driver)) { - return "org.hibernate.dialect.FrontbaseDialect"; - } else if ("org.firebirdsql.jdbc.FBDriver".equals(driver)) { - return "org.hibernate.dialect.FirebirdDialect"; } else { throw new UnsupportedOperationException("I do not know which hibernate dialect to use with " + driver + " and I cannot guess it, use the property jpa.dialect in config file"); diff --git a/framework/src/play/db/jpa/JPASupport.java b/framework/src/play/db/jpa/JPASupport.java index 3bed5db972..bc2037a92c 100644 --- a/framework/src/play/db/jpa/JPASupport.java +++ b/framework/src/play/db/jpa/JPASupport.java @@ -1,6 +1,6 @@ package play.db.jpa; -import javax.persistence.Query; +import jakarta.persistence.Query; /** * Use play.db.jpa.GenericModel instead diff --git a/framework/src/play/db/jpa/JPQL.java b/framework/src/play/db/jpa/JPQL.java index 73d582069a..d1bdd4e444 100644 --- a/framework/src/play/db/jpa/JPQL.java +++ b/framework/src/play/db/jpa/JPQL.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import play.Play; import play.data.binding.ParamNode; diff --git a/framework/src/play/db/jpa/Model.java b/framework/src/play/db/jpa/Model.java index 3913adb7f9..1c83da17db 100644 --- a/framework/src/play/db/jpa/Model.java +++ b/framework/src/play/db/jpa/Model.java @@ -1,8 +1,8 @@ package play.db.jpa; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Base class for JPA model objects diff --git a/framework/src/play/db/jpa/MySQLDialect.java b/framework/src/play/db/jpa/MySQLDialect.java index bf2763cce0..ab1b474bf3 100644 --- a/framework/src/play/db/jpa/MySQLDialect.java +++ b/framework/src/play/db/jpa/MySQLDialect.java @@ -1,15 +1,9 @@ package play.db.jpa; -import org.hibernate.dialect.MySQLInnoDBDialect; - /** - * InnoDB, UTF-8 dialect for Mysql + * InnoDB is the default engine in MySQL 5.5+. This dialect exists for + * compatibility with configurations that reference play.db.jpa.MySQLDialect. */ -public class MySQLDialect extends MySQLInnoDBDialect { +public class MySQLDialect extends org.hibernate.dialect.MySQLDialect { - @Override - public String getTableTypeString() { - return " ENGINE=InnoDB DEFAULT CHARSET=utf8"; - } - } diff --git a/framework/src/play/db/jpa/PersistenceUnitInfoImpl.java b/framework/src/play/db/jpa/PersistenceUnitInfoImpl.java index d01c328199..828020eb93 100644 --- a/framework/src/play/db/jpa/PersistenceUnitInfoImpl.java +++ b/framework/src/play/db/jpa/PersistenceUnitInfoImpl.java @@ -2,11 +2,11 @@ import org.hibernate.jpa.HibernatePersistenceProvider; -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/framework/src/play/test/Fixtures.java b/framework/src/play/test/Fixtures.java index 6cf1b4e386..d193b68a9b 100644 --- a/framework/src/play/test/Fixtures.java +++ b/framework/src/play/test/Fixtures.java @@ -25,7 +25,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.apache.commons.io.FileUtils; import org.yaml.snakeyaml.Yaml; diff --git a/framework/test-src/play/db/ConfigurationTest.java b/framework/test-src/play/db/ConfigurationTest.java index 2a599344b7..e8df4fb10b 100644 --- a/framework/test-src/play/db/ConfigurationTest.java +++ b/framework/test-src/play/db/ConfigurationTest.java @@ -250,9 +250,9 @@ public void getPropertiesForDefaultTest() { Play.configuration.put("db.pool.maxSize", "20"); Play.configuration.put("db.pool.minSize", "1"); Play.configuration.put("db.pool.maxIdleTimeExcessConnections", "60"); - //javax.persistence - Play.configuration.put("javax.persistence.lock.scope", "EXTENDED"); - Play.configuration.put("javax.persistence.lock.timeout", "1000"); + //jakarta.persistence + Play.configuration.put("jakarta.persistence.lock.scope", "EXTENDED"); + Play.configuration.put("jakarta.persistence.lock.timeout", "1000"); //jpa Play.configuration.put("jpa.dialect", "org.hibernate.dialect.PostgreSQLDialect"); Play.configuration.put("jpa.ddl", "update"); @@ -275,9 +275,9 @@ public void getPropertiesForDefaultTest() { assertEquals("20", properties.get("db.pool.maxSize")); assertEquals("1", properties.get("db.pool.minSize")); assertEquals("60", properties.get("db.pool.maxIdleTimeExcessConnections")); - //javax.persistence - assertEquals("EXTENDED", properties.get("javax.persistence.lock.scope")); - assertEquals("1000", properties.get("javax.persistence.lock.timeout")); + //jakarta.persistence + assertEquals("EXTENDED", properties.get("jakarta.persistence.lock.scope")); + assertEquals("1000", properties.get("jakarta.persistence.lock.timeout")); //jpa assertEquals("org.hibernate.dialect.PostgreSQLDialect", properties.get("jpa.dialect")); assertEquals("update", properties.get("jpa.ddl")); @@ -303,9 +303,9 @@ public void getPropertiesForDBTest() { Play.configuration.put("db.test.pool.minSize", "1"); Play.configuration.put("db.test.pool.maxIdleTimeExcessConnections", "60"); Play.configuration.put("db.test.evolutions.enabled", "false"); - //javax.persistence - Play.configuration.put("javax.persistence.test.lock.scope", "EXTENDED"); - Play.configuration.put("javax.persistence.test.lock.timeout", "1000"); + //jakarta.persistence + Play.configuration.put("jakarta.persistence.test.lock.scope", "EXTENDED"); + Play.configuration.put("jakarta.persistence.test.lock.timeout", "1000"); //jpa Play.configuration.put("jpa.test.dialect", "org.hibernate.dialect.PostgreSQLDialect"); Play.configuration.put("jpa.test.ddl", "update"); @@ -329,9 +329,9 @@ public void getPropertiesForDBTest() { assertEquals("1", properties.get("db.pool.minSize")); assertEquals("60", properties.get("db.pool.maxIdleTimeExcessConnections")); assertEquals("false", properties.get("db.evolutions.enabled")); - //javax.persistence - assertEquals("EXTENDED", properties.get("javax.persistence.lock.scope")); - assertEquals("1000", properties.get("javax.persistence.lock.timeout")); + //jakarta.persistence + assertEquals("EXTENDED", properties.get("jakarta.persistence.lock.scope")); + assertEquals("1000", properties.get("jakarta.persistence.lock.timeout")); //jpa assertEquals("org.hibernate.dialect.PostgreSQLDialect", properties.get("jpa.dialect")); assertEquals("update", properties.get("jpa.ddl")); diff --git a/samples-and-tests/booking/app/models/Booking.java b/samples-and-tests/booking/app/models/Booking.java index 9340010b65..19ae5e568c 100644 --- a/samples-and-tests/booking/app/models/Booking.java +++ b/samples-and-tests/booking/app/models/Booking.java @@ -2,7 +2,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import java.text.*; import java.math.*; diff --git a/samples-and-tests/booking/app/models/Hotel.java b/samples-and-tests/booking/app/models/Hotel.java index cbbf0a680c..b1fe4938ec 100644 --- a/samples-and-tests/booking/app/models/Hotel.java +++ b/samples-and-tests/booking/app/models/Hotel.java @@ -2,7 +2,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.*; @Entity diff --git a/samples-and-tests/booking/app/models/User.java b/samples-and-tests/booking/app/models/User.java index 42aaaedb0a..b9ecccdf48 100644 --- a/samples-and-tests/booking/app/models/User.java +++ b/samples-and-tests/booking/app/models/User.java @@ -2,7 +2,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name="Customer") diff --git a/samples-and-tests/customJars/example/pom.xml b/samples-and-tests/customJars/example/pom.xml index ec4e380a5b..3204cea2ff 100644 --- a/samples-and-tests/customJars/example/pom.xml +++ b/samples-and-tests/customJars/example/pom.xml @@ -22,7 +22,7 @@ test - org.hibernate.javax.persistence + org.hibernate.jakarta.persistence hibernate-jpa-2.0-api 1.0.1.Final diff --git a/samples-and-tests/customJars/example/src/main/java/org/playframework/models/Cat.java b/samples-and-tests/customJars/example/src/main/java/org/playframework/models/Cat.java index 28a89ed9a5..6574b4c5bc 100644 --- a/samples-and-tests/customJars/example/src/main/java/org/playframework/models/Cat.java +++ b/samples-and-tests/customJars/example/src/main/java/org/playframework/models/Cat.java @@ -1,8 +1,8 @@ package org.playframework.models; -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 Cat { diff --git a/samples-and-tests/facebook-oauth2/app/models/User.java b/samples-and-tests/facebook-oauth2/app/models/User.java index ad9474f7ba..9fdb5ca827 100644 --- a/samples-and-tests/facebook-oauth2/app/models/User.java +++ b/samples-and-tests/facebook-oauth2/app/models/User.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import play.db.jpa.Model; diff --git a/samples-and-tests/fast-tag/conf/application.conf b/samples-and-tests/fast-tag/conf/application.conf index 73da6bc005..8fad7643de 100644 --- a/samples-and-tests/fast-tag/conf/application.conf +++ b/samples-and-tests/fast-tag/conf/application.conf @@ -133,7 +133,7 @@ date.format=yyyy-MM-dd # hibernate.default.use_sql_comments=true # ... # org.hibernate.default.flushMode -# javax.persistence.default.flushMode +# jakarta.persistence.default.flushMode # # Store path for Blob content diff --git a/samples-and-tests/forum/app/models/Forum.java b/samples-and-tests/forum/app/models/Forum.java index e51903d44d..0f1f76c0bb 100644 --- a/samples-and-tests/forum/app/models/Forum.java +++ b/samples-and-tests/forum/app/models/Forum.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import play.db.jpa.*; diff --git a/samples-and-tests/forum/app/models/Post.java b/samples-and-tests/forum/app/models/Post.java index 2bbfd0f8cd..443020a335 100644 --- a/samples-and-tests/forum/app/models/Post.java +++ b/samples-and-tests/forum/app/models/Post.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import play.data.binding.*; diff --git a/samples-and-tests/forum/app/models/Topic.java b/samples-and-tests/forum/app/models/Topic.java index 95d6f47d17..62593c7d7c 100644 --- a/samples-and-tests/forum/app/models/Topic.java +++ b/samples-and-tests/forum/app/models/Topic.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import play.db.jpa.*; diff --git a/samples-and-tests/forum/app/models/User.java b/samples-and-tests/forum/app/models/User.java index 7b859fb7a4..780a21f2eb 100644 --- a/samples-and-tests/forum/app/models/User.java +++ b/samples-and-tests/forum/app/models/User.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import play.*; diff --git a/samples-and-tests/jobboard/app/models/Category.java b/samples-and-tests/jobboard/app/models/Category.java index 2a035e665b..3c38c10828 100644 --- a/samples-and-tests/jobboard/app/models/Category.java +++ b/samples-and-tests/jobboard/app/models/Category.java @@ -3,7 +3,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Category extends Model { diff --git a/samples-and-tests/jobboard/app/models/Company.java b/samples-and-tests/jobboard/app/models/Company.java index 154e9e4c5d..178afed068 100644 --- a/samples-and-tests/jobboard/app/models/Company.java +++ b/samples-and-tests/jobboard/app/models/Company.java @@ -3,7 +3,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Company extends Model { diff --git a/samples-and-tests/jobboard/app/models/Job.java b/samples-and-tests/jobboard/app/models/Job.java index e96160ef85..7fc7a9a05f 100644 --- a/samples-and-tests/jobboard/app/models/Job.java +++ b/samples-and-tests/jobboard/app/models/Job.java @@ -7,7 +7,7 @@ import play.templates.*; import play.mvc.Scope.*; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Job extends Model { diff --git a/samples-and-tests/jobboard/app/models/Tag.java b/samples-and-tests/jobboard/app/models/Tag.java index 285b53ccc5..3b4f25b3d5 100644 --- a/samples-and-tests/jobboard/app/models/Tag.java +++ b/samples-and-tests/jobboard/app/models/Tag.java @@ -3,7 +3,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/controllers/Transactional.java b/samples-and-tests/just-test-cases/app/controllers/Transactional.java index f24da190ae..8375685391 100644 --- a/samples-and-tests/just-test-cases/app/controllers/Transactional.java +++ b/samples-and-tests/just-test-cases/app/controllers/Transactional.java @@ -19,7 +19,7 @@ public static void readOnlyTest() { tag2.name = "TransactionalTest"; post.tags.add(tag1); post.tags.add(tag2); - post.save(); // since this is read only the request will fail with javax.persistence.TransactionRequiredException + post.save(); // since this is read only the request will fail with jakarta.persistence.TransactionRequiredException renderText("Wrote 1 post: total is now " + Post.count()); } diff --git a/samples-and-tests/just-test-cases/app/controllers/admin/CustomAdminCompany.java b/samples-and-tests/just-test-cases/app/controllers/admin/CustomAdminCompany.java index bbb471a951..43e0aa994d 100644 --- a/samples-and-tests/just-test-cases/app/controllers/admin/CustomAdminCompany.java +++ b/samples-and-tests/just-test-cases/app/controllers/admin/CustomAdminCompany.java @@ -3,7 +3,7 @@ import java.lang.reflect.Field; import java.util.List; -import javax.persistence.Version; +import jakarta.persistence.Version; import models.Company; import play.db.Model; diff --git a/samples-and-tests/just-test-cases/app/models/A.java b/samples-and-tests/just-test-cases/app/models/A.java index 7fcf383132..635c6f3bb9 100644 --- a/samples-and-tests/just-test-cases/app/models/A.java +++ b/samples-and-tests/just-test-cases/app/models/A.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Address.java b/samples-and-tests/just-test-cases/app/models/Address.java index b36b4dddbe..8677cf74bc 100644 --- a/samples-and-tests/just-test-cases/app/models/Address.java +++ b/samples-and-tests/just-test-cases/app/models/Address.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import play.data.validation.*; diff --git a/samples-and-tests/just-test-cases/app/models/AnEntity.java b/samples-and-tests/just-test-cases/app/models/AnEntity.java index 143ca254f5..8d1fbf3255 100644 --- a/samples-and-tests/just-test-cases/app/models/AnEntity.java +++ b/samples-and-tests/just-test-cases/app/models/AnEntity.java @@ -9,9 +9,9 @@ import play.data.binding.NoBinding; import play.db.jpa.*; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; @Entity public class AnEntity extends Model { diff --git a/samples-and-tests/just-test-cases/app/models/AnotherEntity.java b/samples-and-tests/just-test-cases/app/models/AnotherEntity.java index c02d2b4158..42b83a2eb0 100644 --- a/samples-and-tests/just-test-cases/app/models/AnotherEntity.java +++ b/samples-and-tests/just-test-cases/app/models/AnotherEntity.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/ArrayIdEntity.java b/samples-and-tests/just-test-cases/app/models/ArrayIdEntity.java index ccab21e74d..27f48a07f8 100644 --- a/samples-and-tests/just-test-cases/app/models/ArrayIdEntity.java +++ b/samples-and-tests/just-test-cases/app/models/ArrayIdEntity.java @@ -1,10 +1,10 @@ package models; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import play.db.jpa.GenericModel; diff --git a/samples-and-tests/just-test-cases/app/models/Author.java b/samples-and-tests/just-test-cases/app/models/Author.java index dc0e09da46..fcf4d85db1 100644 --- a/samples-and-tests/just-test-cases/app/models/Author.java +++ b/samples-and-tests/just-test-cases/app/models/Author.java @@ -3,8 +3,8 @@ import java.util.Date; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/B.java b/samples-and-tests/just-test-cases/app/models/B.java index ed7391a94d..212835b36e 100644 --- a/samples-and-tests/just-test-cases/app/models/B.java +++ b/samples-and-tests/just-test-cases/app/models/B.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Base.java b/samples-and-tests/just-test-cases/app/models/Base.java index 3e6ffddb80..3c57d190ba 100644 --- a/samples-and-tests/just-test-cases/app/models/Base.java +++ b/samples-and-tests/just-test-cases/app/models/Base.java @@ -1,7 +1,7 @@ package models; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/Bloc.java b/samples-and-tests/just-test-cases/app/models/Bloc.java index 0e53a9b99d..61becf845e 100644 --- a/samples-and-tests/just-test-cases/app/models/Bloc.java +++ b/samples-and-tests/just-test-cases/app/models/Bloc.java @@ -3,7 +3,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Book.java b/samples-and-tests/just-test-cases/app/models/Book.java index e9139e8b6b..cd090e5789 100755 --- a/samples-and-tests/just-test-cases/app/models/Book.java +++ b/samples-and-tests/just-test-cases/app/models/Book.java @@ -1,10 +1,10 @@ package models; -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 play.data.validation.Unique; import play.db.jpa.GenericModel; diff --git a/samples-and-tests/just-test-cases/app/models/Bottle.java b/samples-and-tests/just-test-cases/app/models/Bottle.java index 1480678a63..39e278c73b 100644 --- a/samples-and-tests/just-test-cases/app/models/Bottle.java +++ b/samples-and-tests/just-test-cases/app/models/Bottle.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Child.java b/samples-and-tests/just-test-cases/app/models/Child.java index 92bfa88f0f..00bce6cfc7 100644 --- a/samples-and-tests/just-test-cases/app/models/Child.java +++ b/samples-and-tests/just-test-cases/app/models/Child.java @@ -4,7 +4,7 @@ import play.data.binding.NoBinding; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; diff --git a/samples-and-tests/just-test-cases/app/models/City.java b/samples-and-tests/just-test-cases/app/models/City.java index de20041dc2..285e41b32e 100644 --- a/samples-and-tests/just-test-cases/app/models/City.java +++ b/samples-and-tests/just-test-cases/app/models/City.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Company.java b/samples-and-tests/just-test-cases/app/models/Company.java index f0ffa64ef0..b7334b2e9c 100644 --- a/samples-and-tests/just-test-cases/app/models/Company.java +++ b/samples-and-tests/just-test-cases/app/models/Company.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import controllers.CRUD; diff --git a/samples-and-tests/just-test-cases/app/models/CompositeIdEntity.java b/samples-and-tests/just-test-cases/app/models/CompositeIdEntity.java index b5d61eaab9..c97343bb0f 100644 --- a/samples-and-tests/just-test-cases/app/models/CompositeIdEntity.java +++ b/samples-and-tests/just-test-cases/app/models/CompositeIdEntity.java @@ -1,10 +1,10 @@ package models; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import play.db.jpa.GenericModel; diff --git a/samples-and-tests/just-test-cases/app/models/CompositeIdForeignA.java b/samples-and-tests/just-test-cases/app/models/CompositeIdForeignA.java index 55b8eb091d..f0a16a981b 100644 --- a/samples-and-tests/just-test-cases/app/models/CompositeIdForeignA.java +++ b/samples-and-tests/just-test-cases/app/models/CompositeIdForeignA.java @@ -3,9 +3,9 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/CompositeIdForeignB.java b/samples-and-tests/just-test-cases/app/models/CompositeIdForeignB.java index 97037407c9..58044f34a8 100644 --- a/samples-and-tests/just-test-cases/app/models/CompositeIdForeignB.java +++ b/samples-and-tests/just-test-cases/app/models/CompositeIdForeignB.java @@ -3,9 +3,9 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/Customer.java b/samples-and-tests/just-test-cases/app/models/Customer.java index cac045afbf..19f88cc192 100644 --- a/samples-and-tests/just-test-cases/app/models/Customer.java +++ b/samples-and-tests/just-test-cases/app/models/Customer.java @@ -1,7 +1,7 @@ package models; import play.db.jpa.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/DataWithCompositeKey.java b/samples-and-tests/just-test-cases/app/models/DataWithCompositeKey.java index 08210e863c..7d7cdddc45 100644 --- a/samples-and-tests/just-test-cases/app/models/DataWithCompositeKey.java +++ b/samples-and-tests/just-test-cases/app/models/DataWithCompositeKey.java @@ -1,7 +1,7 @@ package models; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class DataWithCompositeKey extends GenericModel { diff --git a/samples-and-tests/just-test-cases/app/models/Dog.java b/samples-and-tests/just-test-cases/app/models/Dog.java index e9a203bfe6..28b346a74d 100644 --- a/samples-and-tests/just-test-cases/app/models/Dog.java +++ b/samples-and-tests/just-test-cases/app/models/Dog.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Entity2.java b/samples-and-tests/just-test-cases/app/models/Entity2.java index b3cbcee982..7bdbdef395 100644 --- a/samples-and-tests/just-test-cases/app/models/Entity2.java +++ b/samples-and-tests/just-test-cases/app/models/Entity2.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/ErrorMember.java b/samples-and-tests/just-test-cases/app/models/ErrorMember.java index 5a5aae20d1..7af1182df6 100644 --- a/samples-and-tests/just-test-cases/app/models/ErrorMember.java +++ b/samples-and-tests/just-test-cases/app/models/ErrorMember.java @@ -3,8 +3,8 @@ import play.data.validation.Required; import play.db.jpa.Model; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "error_members") diff --git a/samples-and-tests/just-test-cases/app/models/ErrorModel.java b/samples-and-tests/just-test-cases/app/models/ErrorModel.java index a70caf05df..6e47dec0f1 100644 --- a/samples-and-tests/just-test-cases/app/models/ErrorModel.java +++ b/samples-and-tests/just-test-cases/app/models/ErrorModel.java @@ -2,7 +2,7 @@ import play.db.jpa.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "errors") diff --git a/samples-and-tests/just-test-cases/app/models/Face.java b/samples-and-tests/just-test-cases/app/models/Face.java index 7ae95d9fe2..160aa5c123 100644 --- a/samples-and-tests/just-test-cases/app/models/Face.java +++ b/samples-and-tests/just-test-cases/app/models/Face.java @@ -3,7 +3,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Factory.java b/samples-and-tests/just-test-cases/app/models/Factory.java index 2e84593407..70f20cfb87 100644 --- a/samples-and-tests/just-test-cases/app/models/Factory.java +++ b/samples-and-tests/just-test-cases/app/models/Factory.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/House.java b/samples-and-tests/just-test-cases/app/models/House.java index 6323051649..c47503b3dd 100644 --- a/samples-and-tests/just-test-cases/app/models/House.java +++ b/samples-and-tests/just-test-cases/app/models/House.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Item.java b/samples-and-tests/just-test-cases/app/models/Item.java index 925d424471..95f7b8aca4 100644 --- a/samples-and-tests/just-test-cases/app/models/Item.java +++ b/samples-and-tests/just-test-cases/app/models/Item.java @@ -3,7 +3,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/MyBook.java b/samples-and-tests/just-test-cases/app/models/MyBook.java index 27e0831675..85a45f6a9c 100644 --- a/samples-and-tests/just-test-cases/app/models/MyBook.java +++ b/samples-and-tests/just-test-cases/app/models/MyBook.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/Nose.java b/samples-and-tests/just-test-cases/app/models/Nose.java index 100ae3ed8c..5fa0e405dd 100644 --- a/samples-and-tests/just-test-cases/app/models/Nose.java +++ b/samples-and-tests/just-test-cases/app/models/Nose.java @@ -3,7 +3,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/OptimisticLockingModel.java b/samples-and-tests/just-test-cases/app/models/OptimisticLockingModel.java index c76da3166e..bcad0c749b 100644 --- a/samples-and-tests/just-test-cases/app/models/OptimisticLockingModel.java +++ b/samples-and-tests/just-test-cases/app/models/OptimisticLockingModel.java @@ -1,11 +1,11 @@ package models; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import controllers.CRUD.Hidden; diff --git a/samples-and-tests/just-test-cases/app/models/Order.java b/samples-and-tests/just-test-cases/app/models/Order.java index b74c299a5e..499a8ae3c6 100644 --- a/samples-and-tests/just-test-cases/app/models/Order.java +++ b/samples-and-tests/just-test-cases/app/models/Order.java @@ -1,7 +1,7 @@ package models; import play.db.jpa.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/samples-and-tests/just-test-cases/app/models/Parent.java b/samples-and-tests/just-test-cases/app/models/Parent.java index 46a0b63d86..3a7e6d1abd 100644 --- a/samples-and-tests/just-test-cases/app/models/Parent.java +++ b/samples-and-tests/just-test-cases/app/models/Parent.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Person.java b/samples-and-tests/just-test-cases/app/models/Person.java index 0f5e4a622a..5d0b3122cd 100644 --- a/samples-and-tests/just-test-cases/app/models/Person.java +++ b/samples-and-tests/just-test-cases/app/models/Person.java @@ -6,7 +6,7 @@ import java.util.Date; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Person extends Model{ diff --git a/samples-and-tests/just-test-cases/app/models/Post.java b/samples-and-tests/just-test-cases/app/models/Post.java index fda844941e..bdb11da7fc 100644 --- a/samples-and-tests/just-test-cases/app/models/Post.java +++ b/samples-and-tests/just-test-cases/app/models/Post.java @@ -3,7 +3,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Project.java b/samples-and-tests/just-test-cases/app/models/Project.java index 99a859d2d1..f902d99f06 100644 --- a/samples-and-tests/just-test-cases/app/models/Project.java +++ b/samples-and-tests/just-test-cases/app/models/Project.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/PropertyEnhancerModel.java b/samples-and-tests/just-test-cases/app/models/PropertyEnhancerModel.java index 99d2a00486..e2adf17d38 100644 --- a/samples-and-tests/just-test-cases/app/models/PropertyEnhancerModel.java +++ b/samples-and-tests/just-test-cases/app/models/PropertyEnhancerModel.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/Referenced.java b/samples-and-tests/just-test-cases/app/models/Referenced.java index 24a4455bf2..65f618b0d5 100644 --- a/samples-and-tests/just-test-cases/app/models/Referenced.java +++ b/samples-and-tests/just-test-cases/app/models/Referenced.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/SomeText.java b/samples-and-tests/just-test-cases/app/models/SomeText.java index fd33042fd1..3d8113498b 100644 --- a/samples-and-tests/just-test-cases/app/models/SomeText.java +++ b/samples-and-tests/just-test-cases/app/models/SomeText.java @@ -2,7 +2,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/SubProject.java b/samples-and-tests/just-test-cases/app/models/SubProject.java index 24cd4dd293..0246ba23b5 100644 --- a/samples-and-tests/just-test-cases/app/models/SubProject.java +++ b/samples-and-tests/just-test-cases/app/models/SubProject.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class SubProject extends Project { diff --git a/samples-and-tests/just-test-cases/app/models/Tag.java b/samples-and-tests/just-test-cases/app/models/Tag.java index e0a503097a..4a3b6bd138 100644 --- a/samples-and-tests/just-test-cases/app/models/Tag.java +++ b/samples-and-tests/just-test-cases/app/models/Tag.java @@ -3,7 +3,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/User.java b/samples-and-tests/just-test-cases/app/models/User.java index bc3e47c8a2..5cc5365f2a 100644 --- a/samples-and-tests/just-test-cases/app/models/User.java +++ b/samples-and-tests/just-test-cases/app/models/User.java @@ -5,7 +5,7 @@ import play.data.validation.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/UserWithAvatar.java b/samples-and-tests/just-test-cases/app/models/UserWithAvatar.java index 51e5969315..4231caba85 100644 --- a/samples-and-tests/just-test-cases/app/models/UserWithAvatar.java +++ b/samples-and-tests/just-test-cases/app/models/UserWithAvatar.java @@ -3,7 +3,7 @@ import play.*; import play.db.jpa.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/YamlModel.java b/samples-and-tests/just-test-cases/app/models/YamlModel.java index 603bf11c14..8c4a2f7a1e 100644 --- a/samples-and-tests/just-test-cases/app/models/YamlModel.java +++ b/samples-and-tests/just-test-cases/app/models/YamlModel.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/async/AsyncTrace.java b/samples-and-tests/just-test-cases/app/models/async/AsyncTrace.java index 89d28ff86d..99821bb396 100644 --- a/samples-and-tests/just-test-cases/app/models/async/AsyncTrace.java +++ b/samples-and-tests/just-test-cases/app/models/async/AsyncTrace.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/samples-and-tests/just-test-cases/app/models/horse/BLUP.java b/samples-and-tests/just-test-cases/app/models/horse/BLUP.java index 389dbf5a92..d9e939e1b7 100644 --- a/samples-and-tests/just-test-cases/app/models/horse/BLUP.java +++ b/samples-and-tests/just-test-cases/app/models/horse/BLUP.java @@ -3,8 +3,8 @@ import play.data.validation.Max; import play.data.validation.Min; import play.db.jpa.Model; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class BLUP extends Model { diff --git a/samples-and-tests/just-test-cases/app/models/horse/Horse.java b/samples-and-tests/just-test-cases/app/models/horse/Horse.java index 7da3d30e19..2d03941701 100644 --- a/samples-and-tests/just-test-cases/app/models/horse/Horse.java +++ b/samples-and-tests/just-test-cases/app/models/horse/Horse.java @@ -2,7 +2,7 @@ import play.data.validation.*; import play.db.jpa.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Horse extends Model { diff --git a/samples-and-tests/just-test-cases/app/models/orphans/collections/BaseModel.java b/samples-and-tests/just-test-cases/app/models/orphans/collections/BaseModel.java index 7f6ce6b13d..63d0e17c83 100644 --- a/samples-and-tests/just-test-cases/app/models/orphans/collections/BaseModel.java +++ b/samples-and-tests/just-test-cases/app/models/orphans/collections/BaseModel.java @@ -2,11 +2,11 @@ import play.db.jpa.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelOne.java b/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelOne.java index 13fbb2bad4..d17a34e209 100644 --- a/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelOne.java +++ b/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelOne.java @@ -2,7 +2,7 @@ import play.db.jpa.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelTwo.java b/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelTwo.java index fc9adb855d..e257719e98 100644 --- a/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelTwo.java +++ b/samples-and-tests/just-test-cases/app/models/orphans/collections/LevelTwo.java @@ -2,9 +2,9 @@ import play.db.jpa.Model; -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(name = "collections.LevelTwo") @Table(name = "collections_level_two") diff --git a/samples-and-tests/just-test-cases/app/models/orphans/maps/BaseModel.java b/samples-and-tests/just-test-cases/app/models/orphans/maps/BaseModel.java index e3754e2f35..a70cdc4545 100644 --- a/samples-and-tests/just-test-cases/app/models/orphans/maps/BaseModel.java +++ b/samples-and-tests/just-test-cases/app/models/orphans/maps/BaseModel.java @@ -2,7 +2,7 @@ import play.db.jpa.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashMap; import java.util.Map; diff --git a/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelOne.java b/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelOne.java index 1b48bdf304..3dc6f2acbc 100644 --- a/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelOne.java +++ b/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelOne.java @@ -2,7 +2,7 @@ import play.db.jpa.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashMap; import java.util.Map; diff --git a/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelTwo.java b/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelTwo.java index 882790252a..4ecd9a8517 100644 --- a/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelTwo.java +++ b/samples-and-tests/just-test-cases/app/models/orphans/maps/LevelTwo.java @@ -2,9 +2,9 @@ import play.db.jpa.Model; -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(name = "maps.LevelTwo") @Table(name = "maps_level_two") diff --git a/samples-and-tests/just-test-cases/app/models/threeLevels/Account.java b/samples-and-tests/just-test-cases/app/models/threeLevels/Account.java index 70610d6454..6859143a3f 100644 --- a/samples-and-tests/just-test-cases/app/models/threeLevels/Account.java +++ b/samples-and-tests/just-test-cases/app/models/threeLevels/Account.java @@ -1,10 +1,10 @@ package models.threeLevels; -import javax.persistence.*; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import play.db.jpa.GenericModel; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/threeLevels/Address.java b/samples-and-tests/just-test-cases/app/models/threeLevels/Address.java index 2c7fcaa0de..caa02d4995 100644 --- a/samples-and-tests/just-test-cases/app/models/threeLevels/Address.java +++ b/samples-and-tests/just-test-cases/app/models/threeLevels/Address.java @@ -1,9 +1,9 @@ package models.threeLevels; -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 play.db.jpa.GenericModel; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/threeLevels/ContactData.java b/samples-and-tests/just-test-cases/app/models/threeLevels/ContactData.java index f171baf140..c080fa0430 100644 --- a/samples-and-tests/just-test-cases/app/models/threeLevels/ContactData.java +++ b/samples-and-tests/just-test-cases/app/models/threeLevels/ContactData.java @@ -1,10 +1,10 @@ package models.threeLevels; -import javax.persistence.*; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import play.db.jpa.GenericModel; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/vendor/Vendor.java b/samples-and-tests/just-test-cases/app/models/vendor/Vendor.java index 61817229ba..3023145ea6 100755 --- a/samples-and-tests/just-test-cases/app/models/vendor/Vendor.java +++ b/samples-and-tests/just-test-cases/app/models/vendor/Vendor.java @@ -2,11 +2,11 @@ import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToMany; import models.vendor.tag.Tag; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/vendor/VenueVendor.java b/samples-and-tests/just-test-cases/app/models/vendor/VenueVendor.java index 3c9df4c8ef..4cb5455f50 100755 --- a/samples-and-tests/just-test-cases/app/models/vendor/VenueVendor.java +++ b/samples-and-tests/just-test-cases/app/models/vendor/VenueVendor.java @@ -1,6 +1,6 @@ package models.vendor; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class VenueVendor extends Vendor { diff --git a/samples-and-tests/just-test-cases/app/models/vendor/tag/AreaTag.java b/samples-and-tests/just-test-cases/app/models/vendor/tag/AreaTag.java index 45cd01001c..a32f011d95 100755 --- a/samples-and-tests/just-test-cases/app/models/vendor/tag/AreaTag.java +++ b/samples-and-tests/just-test-cases/app/models/vendor/tag/AreaTag.java @@ -1,7 +1,7 @@ package models.vendor.tag; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value="a") diff --git a/samples-and-tests/just-test-cases/app/models/vendor/tag/FunctionTag.java b/samples-and-tests/just-test-cases/app/models/vendor/tag/FunctionTag.java index e27e9225d7..a5085a16df 100755 --- a/samples-and-tests/just-test-cases/app/models/vendor/tag/FunctionTag.java +++ b/samples-and-tests/just-test-cases/app/models/vendor/tag/FunctionTag.java @@ -1,7 +1,7 @@ package models.vendor.tag; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value="f") diff --git a/samples-and-tests/just-test-cases/app/models/vendor/tag/Tag.java b/samples-and-tests/just-test-cases/app/models/vendor/tag/Tag.java index 5539b24e6d..3dcde4d23e 100755 --- a/samples-and-tests/just-test-cases/app/models/vendor/tag/Tag.java +++ b/samples-and-tests/just-test-cases/app/models/vendor/tag/Tag.java @@ -2,12 +2,12 @@ import java.util.Date; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import play.data.validation.MaxSize; import play.data.validation.Required; diff --git a/samples-and-tests/just-test-cases/app/models/zoo/Animal.java b/samples-and-tests/just-test-cases/app/models/zoo/Animal.java index 1cab90bf4c..a39f362bd3 100644 --- a/samples-and-tests/just-test-cases/app/models/zoo/Animal.java +++ b/samples-and-tests/just-test-cases/app/models/zoo/Animal.java @@ -4,11 +4,11 @@ import java.util.Iterator; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.PreRemove; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PreRemove; import play.db.jpa.JPA; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/zoo/Meal.java b/samples-and-tests/just-test-cases/app/models/zoo/Meal.java index 4d81e70d0c..3aaf8ee7bd 100644 --- a/samples-and-tests/just-test-cases/app/models/zoo/Meal.java +++ b/samples-and-tests/just-test-cases/app/models/zoo/Meal.java @@ -1,6 +1,6 @@ package models.zoo; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/app/models/zoo/Zoo.java b/samples-and-tests/just-test-cases/app/models/zoo/Zoo.java index 8c592fffc8..d0797dfeec 100644 --- a/samples-and-tests/just-test-cases/app/models/zoo/Zoo.java +++ b/samples-and-tests/just-test-cases/app/models/zoo/Zoo.java @@ -1,9 +1,9 @@ package models.zoo; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; import play.db.jpa.Model; diff --git a/samples-and-tests/just-test-cases/test/JPAEntitiesTest.java b/samples-and-tests/just-test-cases/test/JPAEntitiesTest.java index e4eb603b53..772d048608 100644 --- a/samples-and-tests/just-test-cases/test/JPAEntitiesTest.java +++ b/samples-and-tests/just-test-cases/test/JPAEntitiesTest.java @@ -4,7 +4,7 @@ import play.db.jpa.JPA; import play.test.UnitTest; -import javax.persistence.Query; +import jakarta.persistence.Query; public class JPAEntitiesTest extends UnitTest { diff --git a/samples-and-tests/just-test-cases/test/TransactionalJPATest.java b/samples-and-tests/just-test-cases/test/TransactionalJPATest.java index a73e49f325..5a4c89c588 100644 --- a/samples-and-tests/just-test-cases/test/TransactionalJPATest.java +++ b/samples-and-tests/just-test-cases/test/TransactionalJPATest.java @@ -2,7 +2,7 @@ import play.mvc.Http.Response; import play.test.FunctionalTest; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.TransactionRequiredException; public class TransactionalJPATest extends FunctionalTest { diff --git a/samples-and-tests/just-test-cases/test/models/OptimisticLockingModelPlayTest.java b/samples-and-tests/just-test-cases/test/models/OptimisticLockingModelPlayTest.java index a3373cb564..21a034a285 100644 --- a/samples-and-tests/just-test-cases/test/models/OptimisticLockingModelPlayTest.java +++ b/samples-and-tests/just-test-cases/test/models/OptimisticLockingModelPlayTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import models.OptimisticLockingModel.OptimisticLockingCheck; diff --git a/samples-and-tests/just-test-cases/test/models/RegionalArticle.java b/samples-and-tests/just-test-cases/test/models/RegionalArticle.java index 01d619d259..9c3746a91e 100644 --- a/samples-and-tests/just-test-cases/test/models/RegionalArticle.java +++ b/samples-and-tests/just-test-cases/test/models/RegionalArticle.java @@ -1,11 +1,11 @@ package models; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import play.*; import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.*; diff --git a/samples-and-tests/just-test-cases/test/models/RegionalArticlePk.java b/samples-and-tests/just-test-cases/test/models/RegionalArticlePk.java index db7be5e4ba..5bcf4b5489 100644 --- a/samples-and-tests/just-test-cases/test/models/RegionalArticlePk.java +++ b/samples-and-tests/just-test-cases/test/models/RegionalArticlePk.java @@ -1,7 +1,7 @@ package models; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/samples-and-tests/just-test-cases/test/models/UserCompositeId.java b/samples-and-tests/just-test-cases/test/models/UserCompositeId.java index 0ecd7f5d21..49069261c9 100644 --- a/samples-and-tests/just-test-cases/test/models/UserCompositeId.java +++ b/samples-and-tests/just-test-cases/test/models/UserCompositeId.java @@ -3,8 +3,8 @@ import play.db.jpa.GenericModel; import play.db.jpa.Model; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class UserCompositeId extends GenericModel { diff --git a/samples-and-tests/just-test-cases/test/models/UserId.java b/samples-and-tests/just-test-cases/test/models/UserId.java index 33b93d957b..92a1d48087 100644 --- a/samples-and-tests/just-test-cases/test/models/UserId.java +++ b/samples-and-tests/just-test-cases/test/models/UserId.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Embeddable diff --git a/samples-and-tests/multi-db/app/models/Student.java b/samples-and-tests/multi-db/app/models/Student.java index b4e081b141..b2d17a286a 100644 --- a/samples-and-tests/multi-db/app/models/Student.java +++ b/samples-and-tests/multi-db/app/models/Student.java @@ -1,7 +1,7 @@ package models; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; import play.db.jpa.*; import play.data.validation.*; diff --git a/samples-and-tests/multi-db/app/models/Teacher.java b/samples-and-tests/multi-db/app/models/Teacher.java index b36c6e555c..4a724266af 100644 --- a/samples-and-tests/multi-db/app/models/Teacher.java +++ b/samples-and-tests/multi-db/app/models/Teacher.java @@ -1,7 +1,7 @@ package models; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; import play.db.jpa.*; import play.data.validation.*; diff --git a/samples-and-tests/tfb/app/models/World.java b/samples-and-tests/tfb/app/models/World.java index 31d1a591f2..5d1746728f 100644 --- a/samples-and-tests/tfb/app/models/World.java +++ b/samples-and-tests/tfb/app/models/World.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.*; +import jakarta.persistence.*; import play.db.jpa.*; @Entity diff --git a/samples-and-tests/twitter-oauth/app/models/User.java b/samples-and-tests/twitter-oauth/app/models/User.java index bc785de3c7..dae0dc630c 100644 --- a/samples-and-tests/twitter-oauth/app/models/User.java +++ b/samples-and-tests/twitter-oauth/app/models/User.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import play.db.jpa.Model; diff --git a/samples-and-tests/yabe/app/models/Comment.java b/samples-and-tests/yabe/app/models/Comment.java index a76b1df782..ca8ab1771f 100644 --- a/samples-and-tests/yabe/app/models/Comment.java +++ b/samples-and-tests/yabe/app/models/Comment.java @@ -1,7 +1,7 @@ package models; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; import play.db.jpa.*; import play.data.validation.*; diff --git a/samples-and-tests/yabe/app/models/Post.java b/samples-and-tests/yabe/app/models/Post.java index eb6630c219..37d1b42aaa 100644 --- a/samples-and-tests/yabe/app/models/Post.java +++ b/samples-and-tests/yabe/app/models/Post.java @@ -1,7 +1,7 @@ package models; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; import play.data.binding.*; import play.data.validation.*; diff --git a/samples-and-tests/yabe/app/models/Tag.java b/samples-and-tests/yabe/app/models/Tag.java index e7fe5875b9..786dc876d3 100644 --- a/samples-and-tests/yabe/app/models/Tag.java +++ b/samples-and-tests/yabe/app/models/Tag.java @@ -1,7 +1,7 @@ package models; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; import play.db.jpa.*; import play.data.validation.*; diff --git a/samples-and-tests/yabe/app/models/User.java b/samples-and-tests/yabe/app/models/User.java index e23b759984..2b8123b3d0 100644 --- a/samples-and-tests/yabe/app/models/User.java +++ b/samples-and-tests/yabe/app/models/User.java @@ -1,6 +1,6 @@ package models; -import javax.persistence.*; +import jakarta.persistence.*; import play.db.jpa.*; import play.data.validation.*; diff --git a/samples-and-tests/zencontact/app/models/Contact.java b/samples-and-tests/zencontact/app/models/Contact.java index de29e024c8..ace667f9e5 100644 --- a/samples-and-tests/zencontact/app/models/Contact.java +++ b/samples-and-tests/zencontact/app/models/Contact.java @@ -4,7 +4,7 @@ import play.db.jpa.*; import play.data.validation.*; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity