From 1807fc201e294b661dc5abe722a1f9d7e200e660 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 30 Mar 2023 22:56:55 +1300 Subject: [PATCH 001/240] Initial DB2Luw9Platform using row_number() for row limiting sql --- .../ebean/platform/db2/DB2Luw9Platform.java | 15 ++++++++ .../db2/DB2RowNumberBasicLimiter.java | 31 +++++++++++++++ .../platform/db2/DB2RowNumberSqlLimiter.java | 38 +++++++++++++++++++ .../platform/db2/Db2PlatformProvider.java | 3 ++ 4 files changed, 87 insertions(+) create mode 100644 platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java create mode 100644 platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java create mode 100644 platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java new file mode 100644 index 0000000000..a7d06d15a9 --- /dev/null +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java @@ -0,0 +1,15 @@ +package io.ebean.platform.db2; + +import io.ebean.annotation.Platform; + +/** + * DB2 platform for Linux/Unix/Windows version 9.x. + */ +public class DB2Luw9Platform extends BaseDB2Platform { + public DB2Luw9Platform() { + super(); + this.platform = Platform.DB2LUW; // TODO: Add a DB2LUW9 + this.basicSqlLimiter = new DB2RowNumberBasicLimiter(); + this.sqlLimiter = new DB2RowNumberSqlLimiter(); + } +} diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java new file mode 100644 index 0000000000..5834b0a541 --- /dev/null +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java @@ -0,0 +1,31 @@ +package io.ebean.platform.db2; + +import io.ebean.config.dbplatform.BasicSqlLimiter; + +/** + * Row limiter for Oracle 9,10,11 using rownum. + */ +final class DB2RowNumberBasicLimiter implements BasicSqlLimiter { + + @Override + public String limit(String dbSql, int firstRow, int maxRows) { + if (firstRow < 1 && maxRows < 1) { + return dbSql; + } + StringBuilder sb = new StringBuilder(60 + dbSql.length()); + int lastRow = maxRows; + if (lastRow > 0) { + lastRow += firstRow; + } + sb.append("select * from (select row_number() over() rn, a.* from ("); + sb.append(dbSql).append(") a "); + if (lastRow > 0) { + sb.append(" where rn <= ").append(lastRow); + } + sb.append(") "); + if (firstRow > 0) { + sb.append(" where rn_ > ").append(firstRow); + } + return sb.toString(); + } +} diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java new file mode 100644 index 0000000000..e5d249df97 --- /dev/null +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java @@ -0,0 +1,38 @@ +package io.ebean.platform.db2; + +import io.ebean.config.dbplatform.SqlLimitRequest; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebean.config.dbplatform.SqlLimiter; + + +final class DB2RowNumberSqlLimiter implements SqlLimiter { + + @Override + public SqlLimitResponse limit(SqlLimitRequest request) { + String dbSql = request.getDbSql(); + + StringBuilder sb = new StringBuilder(60 + dbSql.length()); + int firstRow = request.getFirstRow(); + int lastRow = request.getMaxRows(); + if (lastRow > 0) { + lastRow += firstRow; + } + + sb.append("select * from (select row_number() over() rn, a.* from (select "); + if (request.isDistinct()) { + sb.append("distinct "); + } + sb.append(dbSql).append(") a "); + if (lastRow > 0) { + sb.append(" where rn <= ").append(lastRow); + } + sb.append(") "); + if (firstRow > 0) { + sb.append(" where rn > ").append(firstRow); + } + + String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery()); + return new SqlLimitResponse(sql); + } + +} diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/Db2PlatformProvider.java b/platforms/db2/src/main/java/io/ebean/platform/db2/Db2PlatformProvider.java index aade711c5d..988104dfa6 100644 --- a/platforms/db2/src/main/java/io/ebean/platform/db2/Db2PlatformProvider.java +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/Db2PlatformProvider.java @@ -39,6 +39,9 @@ public DatabasePlatform create(String name) { if (name.equals("db2luw")) { return new DB2LuwPlatform(); } + if (name.equals("db2luw9")) { + return new DB2Luw9Platform(); + } throw new IllegalArgumentException("Unknown DB2 platform, expecting db2luw/db2zos/db2fori but got "+ name); } From 63a23904ac265e7b34a43997459c84d5b36171bc Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 13 Apr 2023 21:52:09 +1200 Subject: [PATCH 002/240] Update for DB2Luw9 with rn column as last column --- .../src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java | 2 +- .../java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java | 2 +- .../main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java index a7d06d15a9..ef2b9563b2 100644 --- a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2Luw9Platform.java @@ -8,7 +8,7 @@ public class DB2Luw9Platform extends BaseDB2Platform { public DB2Luw9Platform() { super(); - this.platform = Platform.DB2LUW; // TODO: Add a DB2LUW9 + this.platform = Platform.DB2LUW9; this.basicSqlLimiter = new DB2RowNumberBasicLimiter(); this.sqlLimiter = new DB2RowNumberSqlLimiter(); } diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java index 5834b0a541..272ca26ae6 100644 --- a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java @@ -17,7 +17,7 @@ public String limit(String dbSql, int firstRow, int maxRows) { if (lastRow > 0) { lastRow += firstRow; } - sb.append("select * from (select row_number() over() rn, a.* from ("); + sb.append("select * from (select row_number() over() a.*, rn from ("); sb.append(dbSql).append(") a "); if (lastRow > 0) { sb.append(" where rn <= ").append(lastRow); diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java index e5d249df97..5c8630d77e 100644 --- a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java @@ -18,7 +18,7 @@ public SqlLimitResponse limit(SqlLimitRequest request) { lastRow += firstRow; } - sb.append("select * from (select row_number() over() rn, a.* from (select "); + sb.append("select * from (select row_number() over() a.*, rn from (select "); if (request.isDistinct()) { sb.append("distinct "); } diff --git a/pom.xml b/pom.xml index ccdaacdd5d..4583801d33 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 2.1.214 3.0 3.0 - 8.3 + 8.4 2.2 1.2 13.7.0 From d4bec166f798f5e3fc03957705f5a5cee3d3b798 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 26 Jun 2023 21:30:01 +1200 Subject: [PATCH 003/240] #3109 Fix for JtaTransactionManager when no active transaction The call to registry() can throw an exception so pulling that inside the try catch block and handle that as no active transaction returning null. --- .../server/transaction/JtaTransactionManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java index 3f5ac01598..37b8827c2b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java @@ -78,8 +78,9 @@ private UserTransaction userTransaction() { */ @Override public Object getCurrentTransaction() { - TransactionSynchronizationRegistry syncRegistry = registry(); + TransactionSynchronizationRegistry syncRegistry; try { + syncRegistry = registry(); SpiTransaction t = (SpiTransaction) syncRegistry.getResource(EBEAN_TXN_RESOURCE); if (t != null) { // we have already seen this transaction From e952b555e028c601aa2a7fd2dfe59344153857e5 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 11:49:53 +1200 Subject: [PATCH 004/240] Add InTuples expression for multi-column IN expression --- .../src/main/java/io/ebean/DInTuples.java | 62 ++++++++++ .../main/java/io/ebean/ExpressionFactory.java | 5 + .../main/java/io/ebean/ExpressionList.java | 5 + .../src/main/java/io/ebean/InTuples.java | 56 +++++++++ .../expression/DefaultExpressionFactory.java | 5 + .../expression/DefaultExpressionList.java | 4 + .../server/expression/InTuplesExpression.java | 112 ++++++++++++++++++ .../server/expression/JunctionExpression.java | 5 + .../java/io/ebean/typequery/TQRootBean.java | 8 ++ .../test/java/org/querytest/QContactTest.java | 23 ++++ .../cache/TestCacheViaComplexNaturalKey3.java | 26 ++++ 11 files changed, 311 insertions(+) create mode 100644 ebean-api/src/main/java/io/ebean/DInTuples.java create mode 100644 ebean-api/src/main/java/io/ebean/InTuples.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java diff --git a/ebean-api/src/main/java/io/ebean/DInTuples.java b/ebean-api/src/main/java/io/ebean/DInTuples.java new file mode 100644 index 0000000000..b244d8459c --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/DInTuples.java @@ -0,0 +1,62 @@ +package io.ebean; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * + */ +final class DInTuples implements InTuples { + + private final String[] properties; + private final List entries = new ArrayList<>(); + + + DInTuples(String[] properties) { + this.properties = properties; + } + + /** + */ + @Override + public InTuples add(Object... values) { + entries.add(new DEntry(values)); + return this; + } + + /** + * Return the first property name. + */ + @Override + public String[] properties() { + return properties; + } + + /** + * Return all the value pairs. + */ + @Override + public List entries() { + return Collections.unmodifiableList(entries); + } + + /** + * A pair of 2 value objects. + *

+ * Used to support inPairs() expression. + */ + static final class DEntry implements InTuples.Entry { + + private final Object[] vals; + + DEntry(Object[] vals) { + this.vals = vals; + } + + @Override + public Object[] values() { + return vals; + } + } +} diff --git a/ebean-api/src/main/java/io/ebean/ExpressionFactory.java b/ebean-api/src/main/java/io/ebean/ExpressionFactory.java index e81f816369..1b67c6cc2b 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionFactory.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionFactory.java @@ -369,6 +369,11 @@ public interface ExpressionFactory { */ Expression inPairs(Pairs pairs); + /** + * In expression using multiple columns. + */ + Expression inTuples(InTuples pairs); + /** * In - property has a value in the array of values. */ diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java index 05b9084e78..c3b272da77 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionList.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java @@ -1131,6 +1131,11 @@ default Query setUseQueryCache(boolean enabled) { */ ExpressionList inPairs(Pairs pairs); + /** + * In expression using multiple columns. + */ + ExpressionList inTuples(InTuples pairs); + /** * EXISTS a raw SQL SubQuery. * diff --git a/ebean-api/src/main/java/io/ebean/InTuples.java b/ebean-api/src/main/java/io/ebean/InTuples.java new file mode 100644 index 0000000000..2ee158fcb4 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/InTuples.java @@ -0,0 +1,56 @@ +package io.ebean; + +import java.util.List; + +/** + * IN expression using multiple columns. + *

+ * Produces SQL expression in the form of (A,B,C) IN ((a0,b0,c0), (a1,b1,c1), ... ) + * where A,B,C are the properties in the tuples. + */ +public interface InTuples { + + /** + * Create given the properties in the tuples. + */ + static InTuples of(String... properties) { + return new DInTuples(properties); + } + + /** + * Create given the properties in the tuples. + */ + static InTuples of(Query.Property... properties) { + String[] props = new String[properties.length]; + for (int i = 0; i < properties.length; i++) { + props[i] = properties[i].toString(); + } + return new DInTuples(props); + } + + /** + * Add a tuple entry. + */ + InTuples add(Object... values); + + /** + * Return the properties of the tuples. + */ + String[] properties(); + + /** + * Return all the tuple entries. + */ + List entries(); + + /** + * A tuple entry. + */ + interface Entry { + + /** + * Return all the values for this entry. + */ + Object[] values(); + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java index 1ad8a9014c..6b9900ba33 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java @@ -471,6 +471,11 @@ public Expression inPairs(Pairs pairs) { return new InPairsExpression(pairs, false); } + @Override + public Expression inTuples(InTuples pairs) { + return new InTuplesExpression(pairs, false); + } + /** * In - property has a value in the array of values. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java index 83419a22f8..5a7c473518 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java @@ -902,6 +902,10 @@ public ExpressionList inPairs(Pairs pairs) { return add(expr.inPairs(pairs)); } + @Override + public ExpressionList inTuples(InTuples pairs) { + return add(expr.inTuples(pairs)); + } @Override public ExpressionList exists(String sqlSubQuery, Object... bindValues) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java new file mode 100644 index 0000000000..e8f10fe223 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java @@ -0,0 +1,112 @@ +package io.ebeaninternal.server.expression; + +import io.ebean.InTuples; +import io.ebeaninternal.api.BindValuesKey; +import io.ebeaninternal.api.NaturalKeyQueryData; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; + +import java.util.List; + + +final class InTuplesExpression extends AbstractExpression { + + private final boolean not; + private final String[] properties; + private final List entries; + + InTuplesExpression(InTuples pairs, boolean not) { + super(pairs.properties()[0]); + this.properties = pairs.properties(); + // the entries might be modified on cache hit. + this.entries = pairs.entries(); + this.not = not; + } + + @Override + public boolean naturalKey(NaturalKeyQueryData data) { + return false; + } + + @Override + public void writeDocQuery(DocQueryContext context) { + throw new RuntimeException("Not supported with document query"); + } + + @Override + public void addBindValues(SpiExpressionRequest request) { + for (InTuples.Entry entry : entries) { + for (Object val : entry.values()) { + request.addBindValue(val); + } + } + } + + @Override + public void addSql(SpiExpressionRequest request) { + if (entries.isEmpty()) { + request.append(not ? SQL_TRUE : SQL_FALSE); + return; + } + + request.append("("); + for (int i = 0; i < properties.length; i++) { + if (i > 0) { + request.append(","); + } + request.property(properties[i]); + } + request.append(") in ("); + final String eb = entryBinding(); + for (int i = 0; i < entries.size(); i++) { + if (i > 0) { + request.append(","); + } + request.append(eb); + } + request.append(")"); + } + + private String entryBinding() { + StringBuilder sb = new StringBuilder(); + sb.append('('); + for (int i = 0; i < properties.length; i++) { + if (i > 0) { + sb.append(','); + } + sb.append('?'); + } + return sb.append(')').toString(); + } + + /** + * Based on the number of values in the in clause. + */ + @Override + public void queryPlanHash(StringBuilder builder) { + if (not) { + builder.append("Not"); + } + builder.append("InTuple["); + for (String property : properties) { + builder.append(property).append("-"); + } + builder.append(entries.size()).append("]"); + } + + @Override + public void queryBindKey(BindValuesKey key) { + key.add(entries.size()); + for (InTuples.Entry entry : entries) { + for (Object val : entry.values()) { + key.add(val); + } + } + } + + @Override + public boolean isSameByBind(SpiExpression other) { + InTuplesExpression that = (InTuplesExpression) other; + return this.entries.size() == that.entries.size() && entries.equals(that.entries); + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java index 9bed902313..7c93917da4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java @@ -710,6 +710,11 @@ public ExpressionList inPairs(Pairs pairs) { return exprList.inPairs(pairs); } + @Override + public ExpressionList inTuples(InTuples pairs) { + return exprList.inTuples(pairs); + } + @Override public ExpressionList in(String propertyName, Collection values) { return exprList.in(propertyName, values); diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java index 4e13d82385..84be587c84 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -1219,6 +1219,14 @@ public R raw(String rawExpression, Object bindValue) { return root; } + /** + * In expression using multiple columns. + */ + public R inTuples(InTuples inTuples) { + peekExprList().inTuples(inTuples); + return root; + } + /** * Marker that can be used to indicate that the order by clause is defined after this. *

diff --git a/ebean-querybean/src/test/java/org/querytest/QContactTest.java b/ebean-querybean/src/test/java/org/querytest/QContactTest.java index e2cec545e3..78dd89b57a 100644 --- a/ebean-querybean/src/test/java/org/querytest/QContactTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QContactTest.java @@ -1,12 +1,35 @@ package org.querytest; +import io.ebean.InTuples; import org.example.domain.query.QContact; import org.junit.jupiter.api.Test; import java.time.ZonedDateTime; +import static org.assertj.core.api.Assertions.assertThat; + public class QContactTest { + @Test + void findInTuples() { + + var c = QContact.alias(); + + InTuples inTuples = InTuples.of(c.firstName, c.lastName) + .add("Rob", "B") + .add("Bob", "C") + .add("Mob", "D"); + + var query = new QContact() + .firstName.isNotNull() + .email.isNotNull() + .inTuples(inTuples) + .query(); + + query.findList(); + assertThat(query.getGeneratedSql()).contains("(t0.first_name,t0.last_name) in ((?,?),(?,?),(?,?))"); + } + @Test public void test_oneToManyMap() { findThem(); diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 6a97a95ea3..bdf0ff7410 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -1,5 +1,6 @@ package org.tests.model.basic.cache; +import io.ebean.InTuples; import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; @@ -419,6 +420,31 @@ public void findList_inPairs_userConcat() { } else { assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and concat(t0.sku,':',t0.code,'-foo')"); } + } + + @Test + public void findList_inTuples_noCache() { + setup(); + + InTuples tuples = InTuples.of("sku", "code") + .add("2", 1000) + .add("2", 1001) + .add("3", 1000); + + LoggedSql.start(); + List list = DB.find(OCachedNatKeyBean3.class) + .where() + .eq("store", "def") + .inTuples(tuples) + .setUseCache(false) + .orderBy("sku desc") + .findList(); + + List sql = LoggedSql.stop(); + + assertThat(tuples.entries()).hasSize(3); + assertThat(list).hasSize(3); + assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (sku,code) in ((?,?),(?,?),(?,?)) order by t0.sku desc;"); } } From 664120f3695ef54be05b683ac9d53609bd31c3df Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 11:54:38 +1200 Subject: [PATCH 005/240] Add InTuples expression for multi-column IN expression --- .../tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index bdf0ff7410..389e0a1144 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -445,6 +445,6 @@ public void findList_inTuples_noCache() { assertThat(tuples.entries()).hasSize(3); assertThat(list).hasSize(3); - assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (sku,code) in ((?,?),(?,?),(?,?)) order by t0.sku desc;"); + assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku,t0.code) in ((?,?),(?,?),(?,?)) order by t0.sku desc;"); } } From 8209d9e229f0c197637b8cf5a7973cb905cadc3d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 12:41:31 +1200 Subject: [PATCH 006/240] Add SpiInTuples to hide more details from InTuples --- .../src/main/java/io/ebean/DInTuples.java | 37 ++++++------------- .../src/main/java/io/ebean/InTuples.java | 22 +---------- .../java/io/ebean/service/SpiInTuples.java | 22 +++++++++++ .../server/expression/InTuplesExpression.java | 26 +++++++------ .../cache/TestCacheViaComplexNaturalKey3.java | 8 +++- 5 files changed, 57 insertions(+), 58 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/service/SpiInTuples.java diff --git a/ebean-api/src/main/java/io/ebean/DInTuples.java b/ebean-api/src/main/java/io/ebean/DInTuples.java index b244d8459c..6f6e67672e 100644 --- a/ebean-api/src/main/java/io/ebean/DInTuples.java +++ b/ebean-api/src/main/java/io/ebean/DInTuples.java @@ -1,27 +1,32 @@ package io.ebean; +import io.ebean.service.SpiInTuples; + import java.util.ArrayList; import java.util.Collections; import java.util.List; /** - * + * Default implementation of SpiInTuples. */ -final class DInTuples implements InTuples { +final class DInTuples implements SpiInTuples { private final String[] properties; - private final List entries = new ArrayList<>(); + private final int propertyCount; + private final List entries = new ArrayList<>(); DInTuples(String[] properties) { this.properties = properties; + this.propertyCount = properties.length; } - /** - */ @Override public InTuples add(Object... values) { - entries.add(new DEntry(values)); + if (values.length != propertyCount) { + throw new IllegalArgumentException("Require " + propertyCount + " values but got " + values.length); + } + entries.add(values); return this; } @@ -37,26 +42,8 @@ public String[] properties() { * Return all the value pairs. */ @Override - public List entries() { + public List entries() { return Collections.unmodifiableList(entries); } - /** - * A pair of 2 value objects. - *

- * Used to support inPairs() expression. - */ - static final class DEntry implements InTuples.Entry { - - private final Object[] vals; - - DEntry(Object[] vals) { - this.vals = vals; - } - - @Override - public Object[] values() { - return vals; - } - } } diff --git a/ebean-api/src/main/java/io/ebean/InTuples.java b/ebean-api/src/main/java/io/ebean/InTuples.java index 2ee158fcb4..1747029569 100644 --- a/ebean-api/src/main/java/io/ebean/InTuples.java +++ b/ebean-api/src/main/java/io/ebean/InTuples.java @@ -29,28 +29,8 @@ static InTuples of(Query.Property... properties) { } /** - * Add a tuple entry. + * Add a tuple entry. All values must be non-null. */ InTuples add(Object... values); - /** - * Return the properties of the tuples. - */ - String[] properties(); - - /** - * Return all the tuple entries. - */ - List entries(); - - /** - * A tuple entry. - */ - interface Entry { - - /** - * Return all the values for this entry. - */ - Object[] values(); - } } diff --git a/ebean-api/src/main/java/io/ebean/service/SpiInTuples.java b/ebean-api/src/main/java/io/ebean/service/SpiInTuples.java new file mode 100644 index 0000000000..abdda4f9b8 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/service/SpiInTuples.java @@ -0,0 +1,22 @@ +package io.ebean.service; + +import io.ebean.InTuples; + +import java.util.List; + +/** + * Internal extension to InTuples. + */ +public interface SpiInTuples extends InTuples { + + /** + * Return the properties of the tuples. + */ + String[] properties(); + + /** + * Return all the tuple entries. + */ + List entries(); + +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java index e8f10fe223..09d7eb0112 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java @@ -1,6 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebean.InTuples; +import io.ebean.service.SpiInTuples; import io.ebeaninternal.api.BindValuesKey; import io.ebeaninternal.api.NaturalKeyQueryData; import io.ebeaninternal.api.SpiExpression; @@ -8,18 +9,21 @@ import java.util.List; +import static java.util.Objects.requireNonNull; + final class InTuplesExpression extends AbstractExpression { private final boolean not; private final String[] properties; - private final List entries; + private final List entries; InTuplesExpression(InTuples pairs, boolean not) { - super(pairs.properties()[0]); - this.properties = pairs.properties(); + super(""); + SpiInTuples inTuples = (SpiInTuples)pairs; + this.properties = inTuples.properties(); // the entries might be modified on cache hit. - this.entries = pairs.entries(); + this.entries = inTuples.entries(); this.not = not; } @@ -35,9 +39,10 @@ public void writeDocQuery(DocQueryContext context) { @Override public void addBindValues(SpiExpressionRequest request) { - for (InTuples.Entry entry : entries) { - for (Object val : entry.values()) { - request.addBindValue(val); + for (Object[] entry : entries) { + for (Object value : entry) { + requireNonNull(value); + request.addBindValue(value); } } } @@ -48,7 +53,6 @@ public void addSql(SpiExpressionRequest request) { request.append(not ? SQL_TRUE : SQL_FALSE); return; } - request.append("("); for (int i = 0; i < properties.length; i++) { if (i > 0) { @@ -97,9 +101,9 @@ public void queryPlanHash(StringBuilder builder) { @Override public void queryBindKey(BindValuesKey key) { key.add(entries.size()); - for (InTuples.Entry entry : entries) { - for (Object val : entry.values()) { - key.add(val); + for (Object[] entry : entries) { + for (Object value : entry) { + key.add(value); } } } diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 389e0a1144..53aeec226d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -1,6 +1,8 @@ package org.tests.model.basic.cache; import io.ebean.InTuples; +import io.ebean.annotation.Platform; +import io.ebean.service.SpiInTuples; import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; @@ -9,6 +11,7 @@ import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; import io.ebean.test.LoggedSql; +import io.ebean.xtest.IgnorePlatform; import org.junit.jupiter.api.Test; import java.util.List; @@ -422,6 +425,7 @@ public void findList_inPairs_userConcat() { } } + @IgnorePlatform({Platform.SQLSERVER, Platform.DB2}) @Test public void findList_inTuples_noCache() { setup(); @@ -443,7 +447,9 @@ public void findList_inTuples_noCache() { List sql = LoggedSql.stop(); - assertThat(tuples.entries()).hasSize(3); + SpiInTuples spiTuples = (SpiInTuples)tuples; + assertThat(spiTuples.properties()).containsOnly("sku", "code"); + assertThat(spiTuples.entries()).hasSize(3); assertThat(list).hasSize(3); assertSql(sql.get(0)).contains("from o_cached_natkey3 t0 where t0.store = ? and (t0.sku,t0.code) in ((?,?),(?,?),(?,?)) order by t0.sku desc;"); } From c4af1d9b23642aeb831026031bfdad84f75bdbe1 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 16:41:22 +1200 Subject: [PATCH 007/240] Add query.usingMaster() to explicitly choose master data source When we have a read replica with potential for replication lag, and config a read only DataSource to use that read replica, by default a query executed without a current transaction will use the read replica. We specify usingMaster() when we explicitly want to execute a query and use the master data source. --- .../src/main/java/io/ebean/DtoQuery.java | 12 ++++++ ebean-api/src/main/java/io/ebean/Query.java | 13 +++++++ .../src/main/java/io/ebean/SqlQuery.java | 12 ++++++ .../io/ebeaninternal/api/SpiEbeanServer.java | 3 +- .../java/io/ebeaninternal/api/SpiQuery.java | 5 +++ .../io/ebeaninternal/api/SpiSqlBinding.java | 5 +++ .../server/core/AbstractSqlQueryRequest.java | 2 +- .../server/core/DefaultBeanLoader.java | 2 +- .../server/core/DefaultServer.java | 4 +- .../core/MultiTenantDbCatalogSupplier.java | 6 ++- .../core/MultiTenantDbSchemaSupplier.java | 9 +++-- .../server/core/MultiTenantDbSupplier.java | 4 +- .../server/core/OrmQueryRequest.java | 2 +- .../server/core/SimpleDataSourceProvider.java | 8 +++- .../server/query/DefaultFetchGroupQuery.java | 5 +++ .../server/querydefn/AbstractQuery.java | 1 + .../server/querydefn/DefaultDtoQuery.java | 12 ++++++ .../server/querydefn/DefaultOrmQuery.java | 12 ++++++ .../querydefn/DefaultRelationalQuery.java | 11 ++++++ .../transaction/DataSourceSupplier.java | 5 ++- .../DocStoreTransactionManager.java | 2 +- .../transaction/TransactionFactory.java | 5 ++- .../transaction/TransactionFactoryBasic.java | 7 ++-- .../TransactionFactoryBasicWithRead.java | 4 +- .../transaction/TransactionFactoryTenant.java | 2 +- .../TransactionFactoryTenantWithRead.java | 4 +- .../transaction/TransactionManager.java | 6 +-- .../ebean/xtest/base/DtoQueryFromOrmTest.java | 38 +++++++++++++++++++ .../xtest/internal/api/TDSpiEbeanServer.java | 2 +- .../tests/basic/TestQueryUsingConnection.java | 2 + .../tests/query/sqlquery/SqlQueryTests.java | 13 +++++++ 31 files changed, 185 insertions(+), 33 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DtoQuery.java b/ebean-api/src/main/java/io/ebean/DtoQuery.java index c5e2ee4219..5e5ab0870a 100644 --- a/ebean-api/src/main/java/io/ebean/DtoQuery.java +++ b/ebean-api/src/main/java/io/ebean/DtoQuery.java @@ -205,4 +205,16 @@ public interface DtoQuery extends CancelableQuery { * Use the explicit transaction to execute the query. */ DtoQuery usingTransaction(Transaction transaction); + + /** + * Ensure that the master DataSource is used if there is a read only data source + * being used (that is using a read replica database potentially with replication lag). + *

+ * When the database is configured with a read-only DataSource via + * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then + * by default when a query is run without an active transaction, it uses the read-only data + * source. We we use {@code usingMaster()} to instead ensure that the query is executed + * against the master data source. + */ + DtoQuery usingMaster(); } diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index f7cd568241..f3e39056c9 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -4,6 +4,7 @@ import io.avaje.lang.Nullable; import javax.persistence.NonUniqueResultException; +import javax.sql.DataSource; import java.sql.Connection; import java.sql.Timestamp; import java.util.List; @@ -685,6 +686,18 @@ enum LockWait { */ Query usingDatabase(Database database); + /** + * Ensure that the master DataSource is used if there is a read only data source + * being used (that is using a read replica database potentially with replication lag). + *

+ * When the database is configured with a read-only DataSource via + * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then + * by default when a query is run without an active transaction, it uses the read-only data + * source. We we use {@code usingMaster()} to instead ensure that the query is executed + * against the master data source. + */ + Query usingMaster(); + /** * Execute the query returning the list of Id's. *

diff --git a/ebean-api/src/main/java/io/ebean/SqlQuery.java b/ebean-api/src/main/java/io/ebean/SqlQuery.java index 7811382edc..2dd8c3d3ca 100644 --- a/ebean-api/src/main/java/io/ebean/SqlQuery.java +++ b/ebean-api/src/main/java/io/ebean/SqlQuery.java @@ -45,6 +45,18 @@ public interface SqlQuery extends Serializable, CancelableQuery { */ SqlQuery usingTransaction(Transaction transaction); + /** + * Ensure that the master DataSource is used if there is a read only data source + * being used (that is using a read replica database potentially with replication lag). + *

+ * When the database is configured with a read-only DataSource via + * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then + * by default when a query is run without an active transaction, it uses the read-only data + * source. We we use {@code usingMaster()} to instead ensure that the query is executed + * against the master data source. + */ + SqlQuery usingMaster(); + /** * Execute the query returning a list. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index cac3c874f4..df33048c34 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -135,8 +135,9 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio * Create a ServerTransaction for query purposes. * * @param tenantId For multi-tenant lazy loading provide the tenantId to use. + * @param useMaster Set to true when the query should use the master data source. */ - SpiTransaction createReadOnlyTransaction(Object tenantId); + SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster); /** * An event from another server in the cluster used to notify local diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java index f7293d6114..315658492f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java @@ -235,6 +235,11 @@ public static TemporalMode of(SpiQuery query) { */ String planLabel(); + /** + * Return true if this query should not use the read only data source. + */ + boolean isUseMaster(); + /** * Return true if this is a "find by id" query. This includes a check for a single "equal to" expression for the Id. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java index 62b93d34c8..3f6cfd8fc7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlBinding.java @@ -5,6 +5,11 @@ */ public interface SpiSqlBinding extends SpiCancelableQuery { + /** + * Return true if this query should not use the read only data source. + */ + boolean isUseMaster(); + /** * Return the named or positioned parameters. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java index 685232dec7..591fc39f26 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java @@ -48,7 +48,7 @@ public void initTransIfRequired() { transaction = server.currentServerTransaction(); if (transaction == null || !transaction.isActive()) { // create a local readOnly transaction - transaction = server.createReadOnlyTransaction(null); + transaction = server.createReadOnlyTransaction(null, query.isUseMaster()); createdTransaction = true; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index a421044b06..c197909096 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -137,7 +137,7 @@ void loadBean(LoadBeanRequest loadRequest) { private List executeQuery(LoadRequest loadRequest, SpiQuery query) { if (onIterateUseExtraTxn && loadRequest.isParentFindIterate()) { // MySql - we need a different transaction to execute the secondary query - SpiTransaction extraTxn = server.createReadOnlyTransaction(query.tenantId()); + SpiTransaction extraTxn = server.createReadOnlyTransaction(query.tenantId(), query.isUseMaster()); try { return server.findList(query, extraTxn); } finally { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index d7b54ff69e..42699be59e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -2123,8 +2123,8 @@ public SpiTransaction beginServerTransaction() { } @Override - public SpiTransaction createReadOnlyTransaction(Object tenantId) { - return transactionManager.createReadOnlyTransaction(tenantId); + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { + return transactionManager.createReadOnlyTransaction(tenantId, useMaster); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java index 9ab4b86a52..9f619817ad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java @@ -56,7 +56,10 @@ public Connection connection(Object tenantId) throws SQLException { } @Override - public Connection readOnlyConnection(Object tenantId) throws SQLException { + public Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException { + if (readOnly == null || useMaster) { + return catalogDataSource.getConnectionForTenant(tenantId); + } return readOnly.getConnectionForTenant(tenantId); } @@ -103,7 +106,6 @@ Connection getConnectionForTenant(Object tenantId) throws SQLException { */ @Override public Connection getConnection() throws SQLException { - Connection connection = dataSource.getConnection(); connection.setCatalog(tenantCatalog()); return connection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java index 806a90d050..d6f53f0673 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java @@ -56,8 +56,12 @@ public Connection connection(Object tenantId) throws SQLException { } @Override - public Connection readOnlyConnection(Object tenantId) throws SQLException { - return readOnly.getConnectionForTenant(tenantId); + public Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException { + if (readOnly == null || useMaster) { + return schemaDataSource.getConnectionForTenant(tenantId); + } else { + return readOnly.getConnectionForTenant(tenantId); + } } @Override @@ -106,7 +110,6 @@ private String tenantSchema() { */ @Override public Connection getConnection() throws SQLException { - Connection connection = dataSource.getConnection(); connection.setSchema(tenantSchema()); return connection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java index 5eeefded3f..b636be64da 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java @@ -43,8 +43,8 @@ public Connection connection(Object tenantId) throws SQLException { } @Override - public Connection readOnlyConnection(Object tenantId) throws SQLException { - throw new SQLException("Not currently supported"); + public Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException { + return dataSourceProvider.dataSource(tenantId).getConnection(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 3f0d2ea373..e312771fd1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -220,7 +220,7 @@ public void initTransIfRequired() { } else { // create an implicit transaction to execute this query // potentially using read-only DataSource with autoCommit - transaction = server.createReadOnlyTransaction(query.tenantId()); + transaction = server.createReadOnlyTransaction(query.tenantId(), query.isUseMaster()); } createdTransaction = true; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java index 0d544045e4..6d1452c88b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java @@ -41,8 +41,12 @@ public Connection connection(Object tenantId) throws SQLException { } @Override - public Connection readOnlyConnection(Object tenantId) throws SQLException { - return readOnlyDataSource.getConnection(); + public Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException { + if (readOnlyDataSource == null || useMaster) { + return dataSource.getConnection(); + } else { + return readOnlyDataSource.getConnection(); + } } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java index 5775fb6930..a68a30d928 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java @@ -234,6 +234,11 @@ public Query usingDatabase(Database database) { throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); } + @Override + public Query usingMaster() { + throw new RuntimeException("EB102: Not allowed on FetchGroup"); + } + @Override public List findIds() { throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java index 4ad8351882..26baf4f17a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java @@ -18,6 +18,7 @@ public class AbstractQuery implements SpiCancelableQuery { private final ReentrantLock lock = new ReentrantLock(); private boolean cancelled; private CancelableQuery cancelableQuery; + protected boolean useMaster; @Override public final void cancel() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java index e9aa83bab4..33178afa17 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java @@ -48,6 +48,7 @@ public DefaultDtoQuery(SpiEbeanServer server, DtoBeanDescriptor descriptor, S this.server = server; this.descriptor = descriptor; this.ormQuery = ormQuery; + this.useMaster = ormQuery.isUseMaster(); this.label = ormQuery.label(); this.profileLocation = ormQuery.profileLocation(); } @@ -88,6 +89,17 @@ public DtoQuery usingTransaction(Transaction transaction) { return this; } + @Override + public DtoQuery usingMaster() { + this.useMaster = true; + return this; + } + + @Override + public boolean isUseMaster() { + return useMaster; + } + @Override public void findEach(Consumer consumer) { server.findDtoEach(this, consumer); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index dce828bcff..9e8a412254 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -715,6 +715,7 @@ public SpiQuery copy(SpiEbeanServer server) { // forUpdate is NOT copied - see #2762 DefaultOrmQuery copy = new DefaultOrmQuery<>(beanDescriptor, server, expressionFactory); copy.transaction = transaction; + copy.useMaster = useMaster; copy.m2mIncludeJoin = m2mIncludeJoin; copy.profilingListener = profilingListener; copy.profileLocation = profileLocation; @@ -1396,6 +1397,17 @@ public final Query usingDatabase(Database database) { return this; } + @Override + public Query usingMaster() { + this.useMaster = true; + return this; + } + + @Override + public boolean isUseMaster() { + return useMaster; + } + @Override public final int delete() { return server.delete(this, transaction); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java index 4b7c596257..89f08b7261 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java @@ -49,6 +49,17 @@ public SqlQuery usingTransaction(Transaction transaction) { return this; } + @Override + public SqlQuery usingMaster() { + this.useMaster = true; + return this; + } + + @Override + public boolean isUseMaster() { + return useMaster; + } + private void transaction(Transaction transaction) { this.transaction = transaction; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java index cc9c88f53f..075774716a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java @@ -43,10 +43,11 @@ public interface DataSourceSupplier { /** * Return a connection from the read only DataSource taking into account a tenantId for multi-tenant lazy loading. * - * @param tenantId Most often null but well supplied indicates a multi-tenant lazy loading query + * @param tenantId Most often null but well supplied indicates a multi-tenant lazy loading query + * @param useMaster When true use the master data source * @return the connection to use */ - Connection readOnlyConnection(Object tenantId) throws SQLException; + Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException; /** * Shutdown the datasource de-registering the JDBC driver if requested. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java index a6f58c2287..1e32c46ea7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java @@ -24,7 +24,7 @@ public SpiTransaction createTransaction(boolean explicit, int isolationLevel) { } @Override - public SpiTransaction createReadOnlyTransaction(Object tenantId) { + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { return new DocStoreOnlyTransaction(false, this); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java index f8eeba38a0..7225a2c008 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java @@ -21,9 +21,10 @@ abstract class TransactionFactory { /** * Return a new query only transaction. * - * @param tenantId The tenantId for lazy loading queries. + * @param tenantId The tenantId for lazy loading queries. + * @param useMaster Explicitly use the master data source rather than read only data source */ - abstract SpiTransaction createReadOnlyTransaction(Object tenantId); + abstract SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster); /** * Return a new transaction. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java index 181646cf84..a0683e37c8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java @@ -13,7 +13,7 @@ */ class TransactionFactoryBasic extends TransactionFactory { - private final DataSource dataSource; + protected final DataSource dataSource; TransactionFactoryBasic(TransactionManager manager, DataSourceSupplier dataSourceSupplier) { super(manager); @@ -21,12 +21,11 @@ class TransactionFactoryBasic extends TransactionFactory { } @Override - public SpiTransaction createReadOnlyTransaction(Object tenantId) { + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { Connection connection = null; try { connection = dataSource.getConnection(); - return create(false, connection); - + return new ImplicitReadOnlyTransaction(manager, connection); } catch (PersistenceException ex) { JdbcClose.close(connection); throw ex; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java index c0ca58dd01..16a2683825 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java @@ -26,10 +26,10 @@ final class TransactionFactoryBasicWithRead extends TransactionFactoryBasic { } @Override - public SpiTransaction createReadOnlyTransaction(Object tenantId) { + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { Connection connection = null; try { - connection = readOnlyDataSource.getConnection(); + connection = useMaster ? dataSource.getConnection() : readOnlyDataSource.getConnection(); return new ImplicitReadOnlyTransaction(manager, connection); } catch (PersistenceException ex) { JdbcClose.close(connection); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java index c29a12b427..cfc51370ac 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java @@ -24,7 +24,7 @@ class TransactionFactoryTenant extends TransactionFactory { } @Override - public SpiTransaction createReadOnlyTransaction(Object tenantId) { + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { return create(false, tenantId); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java index 7c63f685a1..cf3992c9ec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java @@ -23,14 +23,14 @@ final class TransactionFactoryTenantWithRead extends TransactionFactoryTenant { } @Override - public SpiTransaction createReadOnlyTransaction(Object tenantId) { + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { Connection connection = null; try { if (tenantId == null) { // obtain the tenantId if the DataSource requires it tenantId = dataSourceSupplier.currentTenantId(); } - connection = dataSourceSupplier.readOnlyConnection(tenantId); + connection = dataSourceSupplier.readOnlyConnection(tenantId, useMaster); return new ImplicitReadOnlyTransaction(manager, connection, tenantId); } catch (PersistenceException ex) { JdbcClose.close(connection); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index 7d4293af52..c0b0610fa2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -274,7 +274,7 @@ public SpiTransaction wrapExternalConnection(Connection c) { private SpiTransaction createTransaction(TxScope txScope) { if (txScope.isReadonly()) { - return createReadOnlyTransaction(null); + return createReadOnlyTransaction(null, false); } else { return createTransaction(true, txScope.getIsolationLevel()); } @@ -290,8 +290,8 @@ public SpiTransaction createTransaction(boolean explicit, int isolationLevel) { /** * Create a new Transaction for query only purposes (can use read only datasource). */ - public SpiTransaction createReadOnlyTransaction(Object tenantId) { - return transactionFactory.createReadOnlyTransaction(tenantId); + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { + return transactionFactory.createReadOnlyTransaction(tenantId, useMaster); } /** diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java index 101e8a370a..6505e120d7 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java @@ -117,6 +117,44 @@ public void selectFormulaWith_bindPositionedParameters() { // assertSql(sql.get(0)).contains("select t0.id, t0.email, concat(t0.last_name, ISO_WEEK(?)) lastName from contact"); // } + @Test + public void asDto_usingMaster() { + ResetBasicData.reset(); + LoggedSql.start(); + + DtoQuery query = DB.find(Contact.class) + .select("id, email") + .where().isNotNull("email") + .asDto(ContactDto.class) + .usingMaster(); + + List dtos = query.findList(); + + assertThat(dtos).isNotEmpty(); + for (ContactDto dto : dtos) { + assertThat(dto.getEmail()).isNotNull(); + } + } + + @Test + public void asDto_usingMaster2() { + ResetBasicData.reset(); + LoggedSql.start(); + + DtoQuery query = DB.find(Contact.class) + .select("id, email") + .usingMaster() + .where().isNotNull("email") + .asDto(ContactDto.class); + + List dtos = query.findList(); + + assertThat(dtos).isNotEmpty(); + for (ContactDto dto : dtos) { + assertThat(dto.getEmail()).isNotNull(); + } + } + @Test public void asDto_withExplicitId() { diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java index 124b04a9d5..6d9a752143 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java @@ -215,7 +215,7 @@ public SpiTransaction currentServerTransaction() { } @Override - public SpiTransaction createReadOnlyTransaction(Object tenantId) { + public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) { return null; } diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java index 67191e6bb4..f1b30b586c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java @@ -66,10 +66,12 @@ public void usingTransaction() { .findCount(); final int otherCount = DB.find(Country.class).findCount(); + final int masterCount = DB.find(Country.class).usingMaster().findCount(); transaction.rollback(); assertThat(count).isEqualTo(otherCount + 1); + assertThat(otherCount).isEqualTo(masterCount); } } diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 550c2c44de..54ea4f31d1 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -252,6 +252,19 @@ private String h2SessionId(Transaction transaction) throws SQLException { return null; } + @Test + void queryUsingMaster() { + ResetBasicData.reset(); + + String sql = "select id, name, status from o_customer where name is not null"; + List custDtos = DB.sqlQuery(sql) + .usingMaster() + .mapTo(CUST_MAPPER) + .findList(); + + assertThat(custDtos).isNotEmpty(); + } + @Test void queryUsingTransaction() throws SQLException { ResetBasicData.reset(); From 3e241907e6788d5c6cb0395e2f918f8f5e6342ee Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 21:27:58 +1200 Subject: [PATCH 008/240] Modify internal ImplicitReadOnlyTransaction to also support calling commit() Originally, ImplicitReadOnlyTransaction was built to support read-only DataSource where the connections are using autoCommit true. This change modified ImplicitReadOnlyTransaction to also support use with the main DataSource where the connection are not using autoCommit true. This is also now needed for the query.usingMaster() case where we have an implicit read only transaction but use the main DataSource with underlying connection requiring explicit commit() at the end of the transaction. --- .../server/query/DefaultFetchGroupQuery.java | 2 +- .../ImplicitReadOnlyTransaction.java | 28 +++++++-- .../transaction/TransactionFactoryBasic.java | 2 +- .../TransactionFactoryBasicWithRead.java | 2 +- .../TransactionFactoryBuilder.java | 1 - .../TransactionFactoryBasicWithReadTest.java | 62 +++++++++++++++++++ 6 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithReadTest.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java index a68a30d928..a168d03d70 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java @@ -236,7 +236,7 @@ public Query usingDatabase(Database database) { @Override public Query usingMaster() { - throw new RuntimeException("EB102: Not allowed on FetchGroup"); + throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index d2121b316c..a632477aa7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -32,6 +32,10 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve private static final String illegalStateMessage = "Transaction is Inactive"; private static final String notExpectedMessage = "Not expected on read only transaction"; + /** + * Set false when using autoCommit (as a performance optimisation for the read-only case). + */ + private final boolean useCommit; private final TransactionManager manager; private final SpiTxnLogger logger; private final boolean logSql; @@ -60,7 +64,8 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve /** * Create without a tenantId. */ - ImplicitReadOnlyTransaction(TransactionManager manager, Connection connection) { + ImplicitReadOnlyTransaction(boolean useCommit, TransactionManager manager, Connection connection) { + this.useCommit = useCommit; this.manager = manager; this.logger = manager.loggerReadOnly(); this.logSql = logger.isLogSql(); @@ -75,7 +80,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve * Create with a tenantId. */ ImplicitReadOnlyTransaction(TransactionManager manager, Connection connection, Object tenantId) { - this(manager, connection); + this(true, manager, connection); this.tenantId = tenantId; } @@ -505,14 +510,18 @@ public void commitAndContinue() { // do nothing, expect AutoCommit } - /** - * Commit the transaction. - */ @Override public void commit() { if (!active) { throw new IllegalStateException(illegalStateMessage); } + if (useCommit) { + try { + connection.commit(); + } catch (SQLException e) { + throw new PersistenceException(e); + } + } // expect AutoCommit so just deactivate / put back into pool deactivate(); } @@ -556,6 +565,13 @@ public void rollback(Throwable cause) throws PersistenceException { if (!active) { throw new IllegalStateException(illegalStateMessage); } + if (useCommit) { + try { + connection.rollback(); + } catch (SQLException e) { + throw new PersistenceException(e); + } + } // expect AutoCommit so it really has already committed deactivate(); } @@ -565,7 +581,7 @@ public void rollback(Throwable cause) throws PersistenceException { */ @Override public void end() throws PersistenceException { - if (isActive()) { + if (active) { rollback(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java index a0683e37c8..d97d85d0cc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java @@ -25,7 +25,7 @@ public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMast Connection connection = null; try { connection = dataSource.getConnection(); - return new ImplicitReadOnlyTransaction(manager, connection); + return new ImplicitReadOnlyTransaction(true, manager, connection); } catch (PersistenceException ex) { JdbcClose.close(connection); throw ex; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java index 16a2683825..9835f7204e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java @@ -30,7 +30,7 @@ public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMast Connection connection = null; try { connection = useMaster ? dataSource.getConnection() : readOnlyDataSource.getConnection(); - return new ImplicitReadOnlyTransaction(manager, connection); + return new ImplicitReadOnlyTransaction(useMaster, manager, connection); } catch (PersistenceException ex) { JdbcClose.close(connection); throw ex; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java index 24c76c29cd..42df6c114d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBuilder.java @@ -11,7 +11,6 @@ final class TransactionFactoryBuilder { * Build and return based on multi-tenancy and read only DataSource. */ static TransactionFactory build(TransactionManager manager, DataSourceSupplier dataSourceSupplier, CurrentTenantProvider tenantProvider) { - boolean hasReadOnlyDataSource = dataSourceSupplier.readOnlyDataSource() != null; if (tenantProvider == null) { if (hasReadOnlyDataSource) { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithReadTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithReadTest.java new file mode 100644 index 0000000000..f5012f12e3 --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithReadTest.java @@ -0,0 +1,62 @@ +package io.ebeaninternal.server.transaction; + +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTxnLogger; +import org.junit.jupiter.api.Test; + +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.SQLException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.*; + +class TransactionFactoryBasicWithReadTest { + + @Test + void createReadOnlyTransaction_expect_usesMasterDataSource() throws SQLException { + var connection = mock(Connection.class); + var tm = mockTransactionManager(); + var dataSource = mockDataSource(connection); + var dss = mock(DataSourceSupplier.class); + when(dss.dataSource()).thenReturn(dataSource); + + var txnFactory = new TransactionFactoryBasicWithRead(tm, dss); + + // act + SpiTransaction txn = txnFactory.createReadOnlyTransaction(null, true); + + assertThat(txn).isNotNull(); + verify(dataSource).getConnection(); // used the 'master' dataSource + } + + @Test + void createReadOnlyTransaction_expect_usesReadOnlyDataSource() throws SQLException { + var tm = mockTransactionManager(); + var connection = mock(Connection.class); + var readOnlyDataSource = mockDataSource(connection); + + var dss = mock(DataSourceSupplier.class); + when(dss.readOnlyDataSource()).thenReturn(readOnlyDataSource); + var txnFactory = new TransactionFactoryBasicWithRead(tm, dss); + + // act + SpiTransaction txn = txnFactory.createReadOnlyTransaction(null, false); + + assertThat(txn).isNotNull(); + verify(readOnlyDataSource).getConnection(); // used the 'read only' dataSource + } + + private static DataSource mockDataSource(Connection dsConnection) throws SQLException { + var readOnlyDataSource = mock(DataSource.class); + when(readOnlyDataSource.getConnection()).thenReturn(dsConnection); + return readOnlyDataSource; + } + + private static TransactionManager mockTransactionManager() { + var tm = mock(TransactionManager.class); + when(tm.loggerReadOnly()).thenReturn(mock(SpiTxnLogger.class)); + return tm; + } +} From 94b3a020d5c0456c85ab4f17a2057ebb908b1ba7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 21:40:21 +1200 Subject: [PATCH 009/240] Modify ImplicitReadOnlyTransaction useCommit to check connection.getAutoCommit() --- .../server/transaction/ImplicitReadOnlyTransaction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index a632477aa7..b39cb49d3a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -65,7 +65,6 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve * Create without a tenantId. */ ImplicitReadOnlyTransaction(boolean useCommit, TransactionManager manager, Connection connection) { - this.useCommit = useCommit; this.manager = manager; this.logger = manager.loggerReadOnly(); this.logSql = logger.isLogSql(); @@ -74,6 +73,11 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve this.connection = connection; this.persistenceContext = new DefaultPersistenceContext(); this.startNanos = System.nanoTime(); + try { + this.useCommit = useCommit && !connection.getAutoCommit(); + } catch (SQLException e) { + throw new PersistenceException(e); + } } /** From 79ed0a5f8e68eb8c5e4392b2a1527bbed54bdcf7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 22:19:38 +1200 Subject: [PATCH 010/240] #3126 - Incorrect complex indexes generation --- .../src/main/java/io/ebean/config/DbConstraintNaming.java | 2 +- .../java/io/ebean/xtest/config/DbConstraintNamingTest.java | 1 + .../test/java/org/tests/model/basic/FeatureDescription.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/config/DbConstraintNaming.java b/ebean-api/src/main/java/io/ebean/config/DbConstraintNaming.java index 310ec1d7c2..78344f647e 100644 --- a/ebean-api/src/main/java/io/ebean/config/DbConstraintNaming.java +++ b/ebean-api/src/main/java/io/ebean/config/DbConstraintNaming.java @@ -135,7 +135,7 @@ public String indexName(String tableName, String[] columns) { */ protected String joinColumnNames(String[] columns) { if (columns.length == 1) { - return normaliseColumn(columns[0]); + return normaliseColumn(columns[0]).replace(" ", "_"); } StringBuilder sb = new StringBuilder(); for (int i = 0; i < columns.length; i++) { diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java index 21f77be2fc..62d71db713 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java @@ -34,6 +34,7 @@ public void testNormalise() { @Test public void testIndexNameWithSpaces() { assertThat(naming.indexName("foo", new String[]{"name", "other desc"})).isEqualTo("ix_foo_name_other_desc"); + assertThat(naming.indexName("foo", new String[]{"name desc"})).isEqualTo("ix_foo_name_desc"); } @Test diff --git a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java index a939f472b8..9f7dee4b6f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java +++ b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java @@ -9,7 +9,9 @@ @Cache(readOnly = true) @Entity -@Table(name = "feature_desc", indexes = @Index(columnList = "name, description desc")) +@Table(name = "feature_desc", indexes = { + @Index(columnList = "name, description desc"), + @Index(columnList = "name desc")}) public class FeatureDescription { @Id From 3d5937f6da4635f57608909d582fa1a46ebb1941 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 22:31:01 +1200 Subject: [PATCH 011/240] Update platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java Bump StringBuilder to use 120 Co-authored-by: Roland Praml --- .../java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java index 272ca26ae6..88cb306d20 100644 --- a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberBasicLimiter.java @@ -12,7 +12,7 @@ public String limit(String dbSql, int firstRow, int maxRows) { if (firstRow < 1 && maxRows < 1) { return dbSql; } - StringBuilder sb = new StringBuilder(60 + dbSql.length()); + StringBuilder sb = new StringBuilder(120 + dbSql.length()); int lastRow = maxRows; if (lastRow > 0) { lastRow += firstRow; From d1775dfcc47a2cdc2b511efa9522948a9c038147 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 22:35:46 +1200 Subject: [PATCH 012/240] #3017 Change DB2LegacyPlatform to also use the row_number limiters --- .../src/main/java/io/ebean/platform/db2/DB2LegacyPlatform.java | 2 ++ .../main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2LegacyPlatform.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2LegacyPlatform.java index 7fa8f2186a..48967f8783 100644 --- a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2LegacyPlatform.java +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2LegacyPlatform.java @@ -18,5 +18,7 @@ public DB2LegacyPlatform() { this.maxTableNameLength = 18; this.maxConstraintNameLength = 18; this.persistBatchOnCascade = PersistBatch.NONE; + this.basicSqlLimiter = new DB2RowNumberBasicLimiter(); + this.sqlLimiter = new DB2RowNumberSqlLimiter(); } } diff --git a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java index 5c8630d77e..b8ee6fb30e 100644 --- a/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java +++ b/platforms/db2/src/main/java/io/ebean/platform/db2/DB2RowNumberSqlLimiter.java @@ -11,7 +11,7 @@ final class DB2RowNumberSqlLimiter implements SqlLimiter { public SqlLimitResponse limit(SqlLimitRequest request) { String dbSql = request.getDbSql(); - StringBuilder sb = new StringBuilder(60 + dbSql.length()); + StringBuilder sb = new StringBuilder(120 + dbSql.length()); int firstRow = request.getFirstRow(); int lastRow = request.getMaxRows(); if (lastRow > 0) { From fc16bde227b796b0905a4b2e84c4efd94ee9e3ab Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 22:43:13 +1200 Subject: [PATCH 013/240] Modify ImplicitReadOnlyTransaction, call deactivate in finally --- .../ImplicitReadOnlyTransaction.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index b39cb49d3a..fd721e6c27 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -519,15 +519,17 @@ public void commit() { if (!active) { throw new IllegalStateException(illegalStateMessage); } - if (useCommit) { - try { - connection.commit(); - } catch (SQLException e) { - throw new PersistenceException(e); + try { + if (useCommit) { + try { + connection.commit(); + } catch (SQLException e) { + throw new PersistenceException(e); + } } + } finally { + deactivate(); } - // expect AutoCommit so just deactivate / put back into pool - deactivate(); } /** @@ -569,15 +571,17 @@ public void rollback(Throwable cause) throws PersistenceException { if (!active) { throw new IllegalStateException(illegalStateMessage); } - if (useCommit) { - try { - connection.rollback(); - } catch (SQLException e) { - throw new PersistenceException(e); + try { + if (useCommit) { + try { + connection.rollback(); + } catch (SQLException e) { + throw new PersistenceException(e); + } } + } finally { + deactivate(); } - // expect AutoCommit so it really has already committed - deactivate(); } /** From 262a7f9babda04a7ebeb0cff72cd75757bcaa78d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 22:57:55 +1200 Subject: [PATCH 014/240] Bump ebean-agent version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c3a81aa7da..95c12dd22b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ 13.9.0 7.1 8.5 - 13.20.0 - 13.20.0 + 13.20.1 + 13.20.1 false From ac466ecd79f695b2646b2cd7a126d511f680499e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 3 Jul 2023 23:30:02 +1200 Subject: [PATCH 015/240] #3125 Add query.usingMaster() for query beans --- .../main/java/io/ebean/typequery/TQRootBean.java | 16 ++++++++++++++++ .../test/java/org/querytest/QCustomerTest.java | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java index 84be587c84..2a43aa441c 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -12,6 +12,7 @@ import io.ebeaninternal.api.SpiQueryFetch; import io.ebeaninternal.server.util.ArrayStack; +import javax.sql.DataSource; import java.sql.Connection; import java.sql.Timestamp; import java.util.*; @@ -1560,6 +1561,21 @@ public R usingConnection(Connection connection) { return root; } + /** + * Ensure that the master DataSource is used if there is a read only data source + * being used (that is using a read replica database potentially with replication lag). + *

+ * When the database is configured with a read-only DataSource via + * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then + * by default when a query is run without an active transaction, it uses the read-only data + * source. We we use {@code usingMaster()} to instead ensure that the query is executed + * against the master data source. + */ + public R usingMaster() { + query.usingMaster(); + return root; + } + /** * Execute the query returning true if a row is found. *

diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index 586bcbb736..658ccd8aa1 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -276,8 +276,15 @@ public void testIn() { } @Test - public void usingTransaction() { + public void usingMaster() { + new QCustomer() + .registered.isNull() + .usingMaster() + .findList(); + } + @Test + public void usingTransaction() { try (Transaction transaction = DB.getDefault().createTransaction()) { new QCustomer() From f414f04033e411ba75e10b9d0ea13e4e5d92f4eb Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 4 Jul 2023 12:05:10 +1200 Subject: [PATCH 016/240] Add note on lack of support for InTuples with SQLServer and DB2 --- ebean-api/src/main/java/io/ebean/InTuples.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/InTuples.java b/ebean-api/src/main/java/io/ebean/InTuples.java index 1747029569..ea1dd46b4a 100644 --- a/ebean-api/src/main/java/io/ebean/InTuples.java +++ b/ebean-api/src/main/java/io/ebean/InTuples.java @@ -1,10 +1,10 @@ package io.ebean; -import java.util.List; - /** * IN expression using multiple columns. *

+ * Currently this is not supported with SQLServer or DB2. + *

* Produces SQL expression in the form of (A,B,C) IN ((a0,b0,c0), (a1,b1,c1), ... ) * where A,B,C are the properties in the tuples. */ From d051bba71fa7cce9ec71b4ba9ef10f4d3b1c1915 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 4 Jul 2023 12:05:30 +1200 Subject: [PATCH 017/240] Version 13.20.1 --- composites/ebean-clickhouse/pom.xml | 10 +++--- composites/ebean-cockroach/pom.xml | 10 +++--- composites/ebean-db2/pom.xml | 10 +++--- composites/ebean-h2/pom.xml | 10 +++--- composites/ebean-hana/pom.xml | 10 +++--- composites/ebean-mariadb/pom.xml | 10 +++--- composites/ebean-mysql/pom.xml | 10 +++--- composites/ebean-nuodb/pom.xml | 10 +++--- composites/ebean-oracle/pom.xml | 10 +++--- composites/ebean-postgres/pom.xml | 10 +++--- composites/ebean-sqlite/pom.xml | 10 +++--- composites/ebean-sqlserver/pom.xml | 10 +++--- composites/ebean-yugabyte/pom.xml | 10 +++--- composites/ebean/pom.xml | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 50 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++--- ebean-redis/pom.xml | 12 +++---- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- platforms/all/pom.xml | 28 ++++++++-------- platforms/clickhouse/pom.xml | 4 +-- platforms/db2/pom.xml | 4 +-- platforms/h2/pom.xml | 4 +-- platforms/hana/pom.xml | 4 +-- platforms/hsqldb/pom.xml | 4 +-- platforms/mariadb/pom.xml | 6 ++-- platforms/mysql/pom.xml | 4 +-- platforms/nuodb/pom.xml | 4 +-- platforms/oracle/pom.xml | 4 +-- platforms/pom.xml | 2 +- platforms/postgres/pom.xml | 4 +-- platforms/sqlanywhere/pom.xml | 4 +-- platforms/sqlite/pom.xml | 4 +-- platforms/sqlserver/pom.xml | 4 +-- pom.xml | 2 +- querybean-generator/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 6 ++-- 47 files changed, 192 insertions(+), 192 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index 45685598aa..af3eb95be1 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-clickhouse @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-clickhouse - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index bcc8ae9e51..4e6b1be2b6 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-cockroach @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-postgres - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 99e4237e00..42f7309019 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-db2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-db2 - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 24efa1d0fe..3aae8aae6c 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-h2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-h2 - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index 2f8021e8fa..1a8295dd1d 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-hana @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-hana - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 04a9c3f731..c526101f53 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-mariadb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-mariadb - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index 441d10e46a..e113238550 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-mysql @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-mysql - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index 632537604a..19e105dfcf 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-nuodb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-nuodb - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index d23e819f85..1999e75642 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-oracle @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-oracle - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index 770954ec85..1568b32211 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-postgres @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-postgres - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index bd6057ad10..c32889b38f 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-sqlite @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-sqlite - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 5a8e3edb52..686b60ee45 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-sqlserver @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-sqlserver - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index 6601712768..3add2e57e4 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-yugabyte @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-postgres - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 78a9a765dd..3ac0b6dd92 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean (all platforms) @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 @@ -40,7 +40,7 @@ io.ebean ebean-jackson-mapper - 13.20.1-SNAPSHOT + 13.20.1 @@ -59,13 +59,13 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-all - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/composites/pom.xml b/composites/pom.xml index 7ed27d08de..00bcea55f3 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 0255e2c9dc..cc47350574 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index e171b8b728..a4bc272890 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core-type - 13.20.1-SNAPSHOT + 13.20.1 @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-ddl-generator - 13.20.1-SNAPSHOT + 13.20.1 @@ -155,46 +155,46 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 io.ebean querybean-generator - 13.20.1-SNAPSHOT + 13.20.1 provided io.ebean kotlin-querybean-generator - 13.20.1-SNAPSHOT + 13.20.1 provided io.ebean ebean-test - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean ebean-postgis - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-redis - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-spring-txn - 13.20.1-SNAPSHOT + 13.20.1 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-db2 - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-h2 - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-hana - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-mariadb - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-mysql - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-nuodb - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-oracle - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-postgres - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-sqlite - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-sqlserver - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index a2841ea884..2d7f438795 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index bebfcfc81a..890c3ae133 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.1-SNAPSHOT + 13.20.1 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean ebean-platform-postgres - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean ebean-platform-sqlserver - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 74df0cb426..5fab1d09c5 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.1-SNAPSHOT + 13.20.1 provided io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 4cf1de4c6c..fb239abfe5 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.1-SNAPSHOT + 13.20.1 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 49ea99ec8a..e2ceec0c46 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 1418e317a8..9388d4a2a8 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean querybean-generator - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean ebean-test - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index db24a8a6d9..21acdb7de6 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 provided io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 provided io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean querybean-generator - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean ebean-test - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 0872b4609f..28a7f407b2 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 54a42da76c..60015c7ab8 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 provided io.ebean ebean-ddl-generator - 13.20.1-SNAPSHOT + 13.20.1 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean ebean-platform-all - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index e99e24e0d7..a19fafb859 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1-SNAPSHOT + 13.20.1 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.1-SNAPSHOT + 13.20.1 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.1-SNAPSHOT + 13.20.1 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.1-SNAPSHOT + 13.20.1 test io.ebean ebean-ddl-generator - 13.20.1-SNAPSHOT + 13.20.1 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index dfcc20fe72..3be85c8cad 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-clickhouse - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-db2 - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-hana - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-hsqldb - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-mysql - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-mariadb - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-nuodb - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-oracle - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-postgres - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-sqlanywhere - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-sqlite - 13.20.1-SNAPSHOT + 13.20.1 io.ebean ebean-platform-sqlserver - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index a19da7a83e..f11fdae91e 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index b3207a18c2..9776f6ce7c 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index d00e9831c8..68ca90ce82 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1-SNAPSHOT + 13.20.1 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.1-SNAPSHOT + 13.20.1 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-db2 - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-h2 - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-hana - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-mariadb - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-mysql - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-nuodb - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-oracle - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-postgres - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-sqlite - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-sqlserver - 13.20.1 + 13.20.2-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 2d7f438795..6cd51fa429 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.1 + 13.20.2-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 890c3ae133..e82a86651d 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.20.1 + 13.20.2-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.1 + 13.20.2-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean ebean-platform-postgres - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 5fab1d09c5..870fa3bca4 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.1 + 13.20.2-SNAPSHOT provided io.ebean ebean-core - 13.20.1 + 13.20.2-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index fb239abfe5..e9a95e6e8b 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.1 + 13.20.2-SNAPSHOT provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index e2ceec0c46..ecda45e7dd 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-core - 13.20.1 + 13.20.2-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 9388d4a2a8..e874d5b8a8 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.1 + 13.20.2-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean querybean-generator - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean ebean-test - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 21acdb7de6..ae7c521124 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.1 + 13.20.2-SNAPSHOT provided io.ebean ebean-core - 13.20.1 + 13.20.2-SNAPSHOT provided io.ebean ebean-querybean - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean querybean-generator - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean ebean-test - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 28a7f407b2..4f770e556d 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.1 + 13.20.2-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 60015c7ab8..691ba718c9 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-core - 13.20.1 + 13.20.2-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.20.1 + 13.20.2-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean ebean-platform-all - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index a19fafb859..fabeffce6c 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.1 + 13.20.2-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.1 + 13.20.2-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.1 + 13.20.2-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.1 + 13.20.2-SNAPSHOT test io.ebean ebean-ddl-generator - 13.20.1 + 13.20.2-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 3be85c8cad..ba4cb040e2 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-db2 - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-hana - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-mysql - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-mariadb - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-nuodb - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-oracle - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-sqlite - 13.20.1 + 13.20.2-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.20.1 + 13.20.2-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index f11fdae91e..21fc23cebc 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.1 + 13.20.2-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 9776f6ce7c..17a4d9909b 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.1 + 13.20.2-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 68ca90ce82..02c37a46c6 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.1 + 13.20.2-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.1 + 13.20.2-SNAPSHOT @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-db2 - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-h2 - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-hana - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-mariadb - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-mysql - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-nuodb - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-oracle - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-postgres - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-sqlite - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-sqlserver - 13.20.2-SNAPSHOT + 13.21.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 6cd51fa429..a7953d093c 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.21.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e82a86651d..51611712f0 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.21.0 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-SNAPSHOT + 13.21.0 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean ebean-platform-sqlserver - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 870fa3bca4..2269867053 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-SNAPSHOT + 13.21.0 provided io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.21.0 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index e9a95e6e8b..8ef5184ead 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-SNAPSHOT + 13.21.0 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index ecda45e7dd..f74ca0e140 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.21.0 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index e874d5b8a8..cab0b09379 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.21.0 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean querybean-generator - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index ae7c521124..474a6e531a 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.21.0 provided io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.21.0 provided io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean querybean-generator - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 4f770e556d..11a74b6e90 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.21.0 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 691ba718c9..bd154c1c1b 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.21.0 provided io.ebean ebean-ddl-generator - 13.20.2-SNAPSHOT + 13.21.0 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean ebean-platform-all - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index fabeffce6c..13f4bc3a86 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.21.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.21.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.21.0 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.21.0 test io.ebean ebean-ddl-generator - 13.20.2-SNAPSHOT + 13.21.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index ba4cb040e2..37858bf927 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-clickhouse - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-db2 - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-hana - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-hsqldb - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-mysql - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-mariadb - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-nuodb - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-oracle - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-sqlanywhere - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-sqlite - 13.20.2-SNAPSHOT + 13.21.0 io.ebean ebean-platform-sqlserver - 13.20.2-SNAPSHOT + 13.21.0 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 21fc23cebc..693582639b 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.21.0 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 17a4d9909b..a90ed77227 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.21.0 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 02c37a46c6..1e03ee60ed 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.21.0 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.21.0 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-db2 - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-h2 - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-hana - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-mariadb - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-mysql - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-nuodb - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-oracle - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-postgres - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-sqlite - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-sqlserver - 13.21.0 + 13.21.1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index a7953d093c..e198763580 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.21.0 + 13.21.1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 51611712f0..7827cd4de6 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.21.0 + 13.21.1-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.21.0 + 13.21.1-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 2269867053..6349558822 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.21.0 + 13.21.1-SNAPSHOT provided io.ebean ebean-core - 13.21.0 + 13.21.1-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 8ef5184ead..395f69bce9 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.21.0 + 13.21.1-SNAPSHOT provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index f74ca0e140..64188c1389 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-core - 13.21.0 + 13.21.1-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index cab0b09379..8013ed74af 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.21.0 + 13.21.1-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean querybean-generator - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean ebean-test - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 474a6e531a..f3b2704a54 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.21.0 + 13.21.1-SNAPSHOT provided io.ebean ebean-core - 13.21.0 + 13.21.1-SNAPSHOT provided io.ebean ebean-querybean - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean querybean-generator - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean ebean-test - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 11a74b6e90..1b780275d2 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.21.0 + 13.21.1-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index bd154c1c1b..81381aa986 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-core - 13.21.0 + 13.21.1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.21.0 + 13.21.1-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean ebean-platform-all - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 13f4bc3a86..8e988fa5a8 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.0 + 13.21.1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.21.0 + 13.21.1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.21.0 + 13.21.1-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.21.0 + 13.21.1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.21.0 + 13.21.1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 37858bf927..afe0c87196 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-db2 - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-hana - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-mysql - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-oracle - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-postgres - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.21.0 + 13.21.1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.21.0 + 13.21.1-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 693582639b..cfd2f8ae4f 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.21.0 + 13.21.1-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index a90ed77227..e56f9536c8 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.21.0 + 13.21.1-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1e03ee60ed..3b261eaaa2 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.21.0 + 13.21.1-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.21.0 + 13.21.1-SNAPSHOT @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-db2 - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-h2 - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-hana - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-mariadb - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-mysql - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-nuodb - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-oracle - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-postgres - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-sqlite - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-sqlserver - 13.21.1-SNAPSHOT + 13.22.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index e198763580..cd0c86d685 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.21.1-SNAPSHOT + 13.22.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 7827cd4de6..f54422ae0e 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.21.1-SNAPSHOT + 13.22.0 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.21.1-SNAPSHOT + 13.22.0 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean ebean-platform-postgres - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean ebean-platform-sqlserver - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 6349558822..edac9dfdb1 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.21.1-SNAPSHOT + 13.22.0 provided io.ebean ebean-core - 13.21.1-SNAPSHOT + 13.22.0 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 395f69bce9..c18b8b038d 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.21.1-SNAPSHOT + 13.22.0 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index ca91273500..e015cb359e 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.21.1-SNAPSHOT + 13.22.0 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5429fbf4c9..58de13e2bf 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.21.1-SNAPSHOT + 13.22.0 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean querybean-generator - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean ebean-test - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 4cb4e5f3ad..7f4f3b2e10 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.21.1-SNAPSHOT + 13.22.0 provided io.ebean ebean-core - 13.21.1-SNAPSHOT + 13.22.0 provided io.ebean ebean-querybean - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean querybean-generator - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean ebean-test - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index ee38a6fee0..cce70abdaa 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.21.1-SNAPSHOT + 13.22.0 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index cd7f8285a6..2f41e3efb7 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.21.1-SNAPSHOT + 13.22.0 provided io.ebean ebean-ddl-generator - 13.21.1-SNAPSHOT + 13.22.0 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean ebean-platform-all - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 8e988fa5a8..f9bd803fbb 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.21.1-SNAPSHOT + 13.22.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.21.1-SNAPSHOT + 13.22.0 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.21.1-SNAPSHOT + 13.22.0 test io.ebean ebean-ddl-generator - 13.21.1-SNAPSHOT + 13.22.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index d4d41bbb22..ec2f015d3f 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-clickhouse - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-db2 - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-hana - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-hsqldb - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-mysql - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-mariadb - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-nuodb - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-oracle - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-postgres - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlanywhere - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlite - 13.21.1-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlserver - 13.21.1-SNAPSHOT + 13.22.0 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 59f7efc6c8..1429168c5a 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.21.1-SNAPSHOT + 13.22.0 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 6e56ca4983..66b776c6c1 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.21.1-SNAPSHOT + 13.22.0 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index b39f5304a6..f478dedb2c 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.21.1-SNAPSHOT + 13.22.0 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.21.1-SNAPSHOT + 13.22.0 + - + jakarta.servlet jakarta.servlet-api 6.0.0 true - ____ JAKARTA-DEPENDENCY-END --> + io.avaje diff --git a/ebean-api/src/main/java/io/ebean/AcquireLockException.java b/ebean-api/src/main/java/io/ebean/AcquireLockException.java index bc6e638ff0..807fb346cb 100644 --- a/ebean-api/src/main/java/io/ebean/AcquireLockException.java +++ b/ebean-api/src/main/java/io/ebean/AcquireLockException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PessimisticLockException; +import jakarta.persistence.PessimisticLockException; /** * Thrown when failing to acquire a pessimistic lock. diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index b2490232bd..0e421971b9 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -7,8 +7,8 @@ import io.ebean.plugin.Property; import io.ebean.text.json.JsonContext; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/ebean-api/src/main/java/io/ebean/DataIntegrityException.java b/ebean-api/src/main/java/io/ebean/DataIntegrityException.java index 0d622313c3..495bdd3493 100644 --- a/ebean-api/src/main/java/io/ebean/DataIntegrityException.java +++ b/ebean-api/src/main/java/io/ebean/DataIntegrityException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Thrown when a foreign key constraint is enforced. diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 7c394c3969..9d329cd312 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -11,8 +11,8 @@ import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.Collection; import java.util.List; diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java index 9696954f7a..d8d10f13ac 100644 --- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java +++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java @@ -5,7 +5,7 @@ import io.ebean.service.SpiContainer; import io.ebean.service.SpiContainerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Iterator; import java.util.Properties; import java.util.ServiceLoader; diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java index 31ff823c7e..a7694182ff 100644 --- a/ebean-api/src/main/java/io/ebean/DbContext.java +++ b/ebean-api/src/main/java/io/ebean/DbContext.java @@ -3,7 +3,7 @@ import io.ebean.config.BeanNotEnhancedException; import io.ebean.datasource.DataSourceConfigurationException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java index 9db4faecfd..794b0dd690 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionList.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java @@ -4,7 +4,7 @@ import io.avaje.lang.Nullable; import io.ebean.search.*; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.NonUniqueResultException; import java.sql.Connection; import java.sql.Timestamp; import java.util.*; diff --git a/ebean-api/src/main/java/io/ebean/FutureList.java b/ebean-api/src/main/java/io/ebean/FutureList.java index ad7c704851..e7c4b67b70 100644 --- a/ebean-api/src/main/java/io/ebean/FutureList.java +++ b/ebean-api/src/main/java/io/ebean/FutureList.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; diff --git a/ebean-api/src/main/java/io/ebean/PersistenceIOException.java b/ebean-api/src/main/java/io/ebean/PersistenceIOException.java index f70563252f..0b13630cde 100644 --- a/ebean-api/src/main/java/io/ebean/PersistenceIOException.java +++ b/ebean-api/src/main/java/io/ebean/PersistenceIOException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Captures and wraps IOException's occurring during ElasticSearch processing etc. diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index f6d7bda47a..fb4d0c1f1b 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -3,7 +3,7 @@ import io.avaje.lang.NonNullApi; import io.avaje.lang.Nullable; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.NonUniqueResultException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.Timestamp; diff --git a/ebean-api/src/main/java/io/ebean/SerializableConflictException.java b/ebean-api/src/main/java/io/ebean/SerializableConflictException.java index a1ee9fee4d..78a82acf5c 100644 --- a/ebean-api/src/main/java/io/ebean/SerializableConflictException.java +++ b/ebean-api/src/main/java/io/ebean/SerializableConflictException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; /** * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict. diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java index 065396a925..4f7c148189 100644 --- a/ebean-api/src/main/java/io/ebean/Transaction.java +++ b/ebean-api/src/main/java/io/ebean/Transaction.java @@ -5,7 +5,7 @@ import io.ebean.config.DatabaseConfig; import io.ebean.config.DocStoreConfig; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; /** diff --git a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java index c760ca10b4..3649e70298 100644 --- a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java +++ b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java @@ -4,8 +4,8 @@ import io.ebean.Database; import io.ebean.ValuePair; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java index 532cb1be5e..d3516a9c3f 100644 --- a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java +++ b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java @@ -3,9 +3,9 @@ import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.util.AnnotationUtil; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; import static io.ebean.util.StringHelper.isNull; diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index de7d20ba51..6b3840abfd 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -19,7 +19,7 @@ import io.ebean.meta.MetricNamingMatch; import io.ebean.util.StringHelper; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import javax.sql.DataSource; import java.time.Clock; import java.time.ZonedDateTime; diff --git a/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java b/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java index b0f50fb16f..8940177185 100644 --- a/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java +++ b/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java @@ -1,7 +1,7 @@ package io.ebean.config; /** - * Matches the functionality of javax.persistence.AttributeConverter + * Matches the functionality of jakarta.persistence.AttributeConverter *

* In general AttributeConverter should be used in preference to this * ScalarTypeConverter as it is JPA standard and offers the same functionality. diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java index 7408147018..5c4f33cc17 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java @@ -9,7 +9,7 @@ import io.ebean.config.PlatformConfig; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.*; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java index 246e8f1c05..8c2bc7f529 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java @@ -5,7 +5,7 @@ import io.ebean.Transaction; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java index 221bc669a5..0cf27edf65 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java @@ -3,7 +3,7 @@ import io.ebean.Transaction; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java index 49fb326821..6116122fd7 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java @@ -5,7 +5,7 @@ import io.ebean.DuplicateKeyException; import io.ebean.SerializableConflictException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collections; import java.util.Map; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java index 061bccfb82..d74182ddf1 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java index 7f89fccaad..ed18bd413e 100644 --- a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java +++ b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java @@ -1,6 +1,6 @@ package io.ebean.event; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextEvent; /** * Listens for webserver server starting and stopping events. @@ -15,7 +15,7 @@ * hook that Ebean registers. *

*/ -public class ServletContextListener implements javax.servlet.ServletContextListener { +public class ServletContextListener implements jakarta.servlet.ServletContextListener { /** * The servlet container is stopping. diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java index a8fb4ea387..be58361b4b 100644 --- a/ebean-api/src/main/java/module-info.java +++ b/ebean-api/src/main/java/module-info.java @@ -12,7 +12,7 @@ requires transitive java.sql; requires transitive io.avaje.config; requires transitive io.avaje.lang; - requires transitive persistence.api; + requires transitive jakarta.persistence.api; requires transitive io.ebean.annotation; requires transitive io.ebean.datasource.api; requires transitive io.avaje.applog; @@ -21,7 +21,7 @@ requires static io.ebean.types; requires static com.fasterxml.jackson.core; requires static com.fasterxml.jackson.databind; - requires static javax.servlet.api; + requires static jakarta.servlet; exports io.ebean; exports io.ebean.bean; diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 3928b490ee..cc39738cc0 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -20,7 +20,7 @@ io.ebean - persistence-api + jakarta-persistence-api ${ebean-persistence-api.version} diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index f54422ae0e..10ba232154 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -81,15 +81,15 @@ provided - + - + jakarta.transaction jakarta.transaction-api @@ -102,7 +102,7 @@ 4.0.1 provided - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index c078fa55c5..ca2cf7dde0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.transaction.TransactionScopeManager; import io.ebeaninternal.server.util.ArrayStack; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Manage scoped (typically thread local) transactions. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java index 10a53b9a7d..1bdadede13 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java @@ -1,6 +1,6 @@ package io.ebeaninternal.api; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.ebean.CancelableQuery; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java index e15b51298b..fef9853c8d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.transaction.ProfileStream; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index bb738cb5ad..28a29cb594 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.transaction.ProfileStream; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java index 06916912c0..77dfcc3f59 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java @@ -7,7 +7,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.util.UrlHelper; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.*; import java.net.URL; import java.nio.file.Path; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java index 8fa1093be9..a0e56dd128 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.DbOffline; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 563a68274f..320083f27e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static java.lang.System.Logger.Level.DEBUG; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index d90cb0f089..61ea94bf79 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.executor.DefaultBackgroundExecutor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.net.URL; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 50a1d5b5d5..cf34addef4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -45,10 +45,10 @@ import io.ebeaninternal.util.ParamTypeHelper.TypeInfo; import io.ebeanservice.docstore.api.DocStoreIntegration; -import javax.persistence.EntityNotFoundException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java index 7dddf0d124..9d788dfec2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java @@ -7,7 +7,7 @@ import io.ebean.datasource.DataSourceFactory; import io.ebean.datasource.DataSourcePoolListener; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java index d29beebe03..68a8aa1405 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java @@ -4,7 +4,7 @@ import io.ebean.Version; import io.ebean.bean.BeanCollection; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 125785a68c..3dfca446b3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -18,7 +18,7 @@ import io.ebeaninternal.server.query.CQueryPlan; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.*; import java.util.function.Consumer; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java index 315fb5484c..afba654a39 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeaninternal.server.persist.PersistExecute; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 32da95dab1..2d3a30bb5b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -20,9 +20,9 @@ import io.ebeanservice.docstore.api.DocStoreUpdateContext; import io.ebeanservice.docstore.api.DocStoreUpdates; -import javax.persistence.EntityNotFoundException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.Statement; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java index 9ab9ae4b5f..c5a2c41347 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java @@ -14,10 +14,10 @@ import io.ebean.util.AnnotationUtil; import io.ebeaninternal.api.CoreLog; -import javax.persistence.AttributeConverter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java index 4c0672a359..e12ba14c1f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; /** * Persist info for determining if save or delete should be performed. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index 6532df7f15..e21ab53f61 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -2,7 +2,7 @@ import io.ebean.bean.BeanCollection; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index f1a47a02f8..f6f927a645 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -55,7 +55,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.io.StringWriter; import java.lang.reflect.Modifier; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 14fb1af7db..c6f50d9dde 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -42,9 +42,9 @@ import io.ebeanservice.docstore.api.DocStoreBeanAdapter; import io.ebeanservice.docstore.api.DocStoreFactory; -import javax.persistence.MappedSuperclass; -import javax.persistence.PersistenceException; -import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Transient; import javax.sql.DataSource; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index d5c303dcb7..a7c50c85e4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -3,7 +3,7 @@ import io.ebean.config.BeanNotRegisteredException; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.Map; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java index e9d9c53726..7676814f55 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java @@ -10,14 +10,14 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import javax.annotation.PostConstruct; -import javax.persistence.PersistenceException; -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.PersistenceException; +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; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index a439e73794..4cac21ef22 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -41,7 +41,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; import io.ebeanservice.docstore.api.support.DocStructure; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index b7434b0c10..a2e15e5cd3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -28,7 +28,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.support.DocStructure; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index c9899888c5..1c2f3aa9bb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -23,7 +23,7 @@ import io.ebeaninternal.server.query.STreePropertyAssocMany; import io.ebeaninternal.server.query.SqlBeanLoad; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.io.StringWriter; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 780178fef6..9bed5d98ba 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -27,7 +27,7 @@ import io.ebeaninternal.server.query.SqlBeanLoad; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java index 6593186a62..fa91c78740 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java @@ -5,7 +5,7 @@ import io.ebean.text.TextException; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java index bb234664fc..26a0de2c83 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import io.ebeaninternal.server.util.Checksum; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Objects; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java index 3634123e2b..8931819a8d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java @@ -4,7 +4,7 @@ import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.query.SqlBeanLoad; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Dynamic property based on aggregation (max, min, avg, count). diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java index e72d7463dd..65e0a0675e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.parse.DeployInheritInfo; import io.ebeaninternal.server.query.SqlTreeProperties; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.lang.reflect.Modifier; import java.sql.SQLException; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java index 1a1c5651f8..fd92e1349a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Utility to find the root bean type. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java index e08582257d..c4da8e680a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java @@ -2,7 +2,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java index bb9dbc5f99..8ff0320bc9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java @@ -3,7 +3,7 @@ import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java index f8dc413b96..c99e5bb74c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java @@ -3,7 +3,7 @@ import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index ee64f86af8..637e7af92f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 2c844c4a25..1a05fe422a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Arrays; import java.util.Comparator; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 58a85be87f..6aa5186b7b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -22,8 +22,8 @@ import io.ebeaninternal.server.idgen.UuidV4IdGenerator; import io.ebeaninternal.server.rawsql.SpiRawSql; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import java.util.*; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java index ad70b8d301..fc0ef67fa6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy.meta; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.HashMap; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 4f927043c5..190e0b220b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -18,10 +18,10 @@ import io.ebeaninternal.server.type.ScalarTypeWrapper; import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; -import javax.persistence.EmbeddedId; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Type; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java index 7f41c028c4..495671115d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java @@ -2,7 +2,7 @@ import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; /** * Property mapped to a joined bean. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java index 4a8943a8e9..02684b79da 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy.meta; -import javax.persistence.OrderColumn; +import jakarta.persistence.OrderColumn; public final class DeployOrderColumn { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java index 0f3ed54c1a..0b23db56c1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.parse.DeployUtil; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.JoinColumn; +import jakarta.persistence.JoinColumn; import java.util.ArrayList; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index 5bcd077c10..e1a065a2ec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -22,20 +22,20 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.EnumType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.EnumType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; import java.util.Set; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 97e3c3c8fb..ad454afd05 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.*; +import jakarta.persistence.*; import static java.lang.System.Logger.Level.INFO; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java index 35179b8762..dc2be4f70a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java @@ -9,11 +9,11 @@ import io.ebean.util.AnnotationUtil; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.AttributeOverride; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java index fe45a72d8c..a1087c4028 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.deploy.TablespaceMeta; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.*; +import jakarta.persistence.*; import static io.ebean.util.AnnotationUtil.typeGet; import static java.lang.System.Logger.Level.ERROR; @@ -129,7 +129,7 @@ private void read(Class cls) { for (UniqueConstraint c : uniqueConstraints) { descriptor.addIndex(new IndexDefinition(c.name(), convertColumnNames(c.columnNames()))); } - for (javax.persistence.Index index : table.indexes()) { + for (jakarta.persistence.Index index : table.indexes()) { final String[] cols = index.columnList().split(","); descriptor.addIndex(new IndexDefinition(index.name(), convertColumnNames(cols), index.unique())); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index 60ef0ddf7b..c5c24bab7f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -20,7 +20,7 @@ import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted; import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Types; import java.util.Set; import java.util.UUID; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java index 386e08e642..80a0e87ceb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Index; import io.ebean.annotation.Indices; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; import java.lang.reflect.Field; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java index 3e11d738e6..c3589b36f5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java @@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import javax.persistence.AttributeOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index 5fc1381096..4e887bbbc8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.meta.*; import io.ebeaninternal.server.type.TypeManager; -import javax.persistence.*; +import jakarta.persistence.*; import java.lang.reflect.*; import static java.lang.System.Logger.Level.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java index 4eb2fa6402..8cebff6792 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java @@ -5,10 +5,10 @@ import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Inheritance; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java index 1e75c98f2a..3c3f0058b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.deploy.InheritInfo; import java.lang.reflect.Modifier; -import javax.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorType; import java.sql.Types; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index ba7937dc68..b05d1933f4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -18,9 +18,9 @@ import io.ebeaninternal.server.type.SimpleAesEncryptor; import io.ebeaninternal.server.type.TypeManager; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.PersistenceException; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.PersistenceException; import java.sql.Types; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java index 7e5a097828..6335cace80 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.HashSet; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java index f9956f1067..34bdb75443 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiExpressionList; import io.ebeaninternal.api.SpiQuery; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.*; @NonNullApi diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java index 00b12ea2cd..46b6673f75 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.persist; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java index d4cab2a179..ecde091f8a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java @@ -2,7 +2,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Defines bean insert update and delete implementation. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java index 7edcc3f22c..0021c9a122 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.persist.platform.MultiValueBind; import io.ebeaninternal.server.type.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.sql.*; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java index fb166d49d1..2eb6c102a6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.util.BindParamsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java index cd1aad8a2f..9275b6ff4a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType; import io.ebeaninternal.server.util.BindParamsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java index 9687f1d030..27fc5a6aa8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 00805a892f..e3ccabbff7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; import java.util.HashSet; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java index ae53b3fb19..37f4ef7214 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java @@ -3,7 +3,7 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index 27e7084a06..f7f2f669fd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.persist.dmlbind.BindableRequest; import io.ebeaninternal.server.bind.DataBind; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java index b805da26e0..e6a18233b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BeanPersister; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Document store based BeanPersister. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java index 121ee7f879..d734d1a51b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java @@ -6,8 +6,8 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java index 01d9eb5f5a..73018cb44f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java @@ -4,7 +4,7 @@ import io.ebeaninternal.api.SpiUpdatePlan; import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java index 4c72c73c18..6b0dcc8fb5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index 06e6ee1a89..856d035842 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index 58934a710e..62c5392cf4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index 5f5c7490e1..dc7f27d937 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.id.ImportedId; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index 36d35c6599..d3804e1412 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -17,7 +17,7 @@ import io.ebeaninternal.server.core.SpiOrmQueryRequest; import io.ebeaninternal.server.deploy.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 81fe86eb8e..2b66643678 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -25,7 +25,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 8e4a9a1f02..82eb664534 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -19,7 +19,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index 30641f85a8..56cce175e7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index a884a2d062..48eb512a86 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java index 3ffb1ae6ba..3d5dab14e1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.core.RowReader; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java index 39588b7337..d21239444c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.core.DtoQueryRequest; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java index 47676c5255..319a9453e0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java @@ -3,7 +3,7 @@ import io.ebean.QueryIterator; import io.ebeaninternal.server.core.DtoQueryRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; final class DtoQueryIterator implements QueryIterator { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java index ab441906a3..fd461427d5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java @@ -4,7 +4,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.locks.ReentrantLock; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java index bd232c91f1..e334cf7be2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java @@ -4,7 +4,7 @@ import io.ebean.Query; import io.ebean.Transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java index 26baf4f17a..5905adc3ba 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java @@ -2,7 +2,7 @@ import java.util.concurrent.locks.ReentrantLock; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.ebean.CancelableQuery; import io.ebeaninternal.api.SpiCancelableQuery; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 0b4b947235..cdd9de3f3c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -22,7 +22,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.transaction.ExternalJdbcTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.Timestamp; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java index f2585a7080..ed83f4b292 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java @@ -2,7 +2,7 @@ import io.ebeaninternal.api.SpiNamedParam; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Named parameter used as placeholder in expressions created by EQL language parsing. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index c570254a04..49d03cd33e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.el.ElPropertyDeploy; import io.ebeaninternal.server.el.ElPropertyValue; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.Serializable; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java index 744f70ebf5..c58fc5403a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Parses a Object relational query statement into a OrmQueryDetail and OrmQueryAttributes. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java index 9968c426ac..6912390d64 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.util.DSelectColumnsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java index 9cc68f1295..0208581ae1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java @@ -2,7 +2,7 @@ import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Manages the transaction scoping using a Ebean thread local. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java index c40a83a12c..f01009b9ff 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index fd721e6c27..1fd2cd22c5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index aa8a3b3572..9aac861c2a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -13,8 +13,8 @@ import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; -import javax.persistence.RollbackException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.RollbackException; import java.sql.Connection; import java.sql.SQLException; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java index 66f1a1c787..4629f08714 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java index 37b8827c2b..afa032abef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java @@ -7,12 +7,12 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; import static java.lang.System.Logger.Level.DEBUG; import static java.lang.System.Logger.Level.WARNING; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 76228f1f1a..886a091bbc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java index 85ef1e8a92..cb0ff45b47 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java @@ -5,7 +5,7 @@ import io.ebeaninternal.api.TransactionEvent; import io.ebeaninternal.server.util.Str; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; import java.sql.Savepoint; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java index 7225a2c008..23075fa9f6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java @@ -3,7 +3,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java index d97d85d0cc..26a13c353a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java @@ -3,7 +3,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java index 9835f7204e..063f139d76 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java @@ -3,7 +3,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java index cfc51370ac..2b842141d9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java @@ -4,7 +4,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java index cf3992c9ec..dd5ca90c2e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java @@ -4,7 +4,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index c0b0610fa2..c30bfcb225 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -29,7 +29,7 @@ import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; import io.ebeanservice.docstore.api.DocStoreUpdates; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java index 242b657f34..0dc55668be 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java @@ -2,7 +2,7 @@ import io.ebean.config.ScalarTypeConverter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * Adapter from ScalarTypeConverter to AttributeConverter. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index fd50c145b2..f79245e542 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -19,8 +19,8 @@ import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.AttributeConverter; -import javax.persistence.EnumType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EnumType; import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java index 93860f0470..6559458ce0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java @@ -3,7 +3,7 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index 84fdab9fe5..b2be8d63cb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -10,7 +10,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareList; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java index 2929391cb0..d1034be93b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java @@ -10,7 +10,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareSet; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.lang.reflect.Type; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java index 3fae086ec2..2e636fd4a3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java @@ -2,7 +2,7 @@ import io.ebean.core.type.ScalarTypeBaseVarchar; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * ScalarType for Class that persists it to VARCHAR column. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java index b0c8b3e7f9..b890df7a0b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java @@ -3,7 +3,7 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.time.DayOfWeek; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java index 3d8227efde..1430212f69 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java @@ -2,7 +2,7 @@ import io.ebean.core.type.ScalarType; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.util.Set; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java index 2596b68f07..227520fbf7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -7,7 +7,7 @@ import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarTypeBase; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java index 9054a45464..399912843c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java @@ -4,7 +4,7 @@ import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.util.Iterator; import java.util.LinkedHashSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java index e37ff8cb68..8d43c7d389 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java @@ -8,7 +8,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareList; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java index 0ae3248a4d..3997c374ad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -8,7 +8,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareSet; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java index 1b1403230c..73e6b056ee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java @@ -3,7 +3,7 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.time.Month; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java index e683b43e61..a8b8e0ff26 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java @@ -3,7 +3,7 @@ import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.lang.reflect.Type; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java index bda5577460..d97e982203 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.BindParams.Param; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; /** diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java index d09920dd5f..d12bd34828 100644 --- a/ebean-core/src/main/java/module-info.java +++ b/ebean-core/src/main/java/module-info.java @@ -35,7 +35,7 @@ requires static com.fasterxml.jackson.core; requires static com.fasterxml.jackson.databind; requires static jakarta.validation; - requires static java.transaction; + requires static jakarta.transaction; requires static java.naming; requires static java.validation; requires static org.postgresql.jdbc; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java index 3dc9d70188..56ebe4c679 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Animal; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; public class BaseTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java index 1905886051..95bd8e0f9f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java index 2fd51c0d3b..2a89f0f38f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -9,7 +9,7 @@ import org.tests.model.basic.IntEnum; import org.tests.model.basic.VarcharEnum; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.time.DayOfWeek; import java.time.Month; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java index bd085d73a2..f5cf34e91a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index ac94509cca..9a357fe01b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -13,7 +13,7 @@ import org.tests.model.ivo.Money; import org.tests.model.ivo.converter.MoneyTypeConverter; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.util.GregorianCalendar; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java index 20da9cf980..0f60d5b786 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java @@ -10,7 +10,7 @@ import org.tests.model.ivo.converter.OidTypeConverter; import org.tests.model.ivo.converter.SysTimeConverter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7d..c8843ccee2 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java index 6d315b65a3..2ac44823e1 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java index c58afe6c11..cea72d5459 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.*; +import jakarta.persistence.*; @ChangeLog @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a69..fa3f577ecf 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef42..9e40cab92c 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -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; @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bbc..d39f7bb091 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -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; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Address.java b/ebean-core/src/test/java/org/tests/model/basic/Address.java index 632cb4efc1..5e1ff9f7ff 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Address.java @@ -2,7 +2,7 @@ import io.ebean.annotation.InvalidateQueryCache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Animal.java b/ebean-core/src/test/java/org/tests/model/basic/Animal.java index 069b1e4cfa..ba68c99d57 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Animal.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java index 761a8d4c70..ae3c9a1601 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java +++ b/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java @@ -1,12 +1,12 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; @Entity public class AnimalShelter { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Article.java b/ebean-core/src/test/java/org/tests/model/basic/Article.java index 797366edd4..4cc6f020bb 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Article.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Article.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java index 4ba4c5def6..97dfc8998a 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java +++ b/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -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 javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java index 86c39f5b49..da618902ed 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java +++ b/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Car.java b/ebean-core/src/test/java/org/tests/model/basic/Car.java index 268920a34d..c55fe81bf8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Car.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java index 37ee5720e6..b134230a0b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java +++ b/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CarAccessory extends BasicDomain { diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java index df2aef5bf0..7c2dd390c8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java +++ b/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CarFuse { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Cat.java b/ebean-core/src/test/java/org/tests/model/basic/Cat.java index d3df201b61..a9d0581afe 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Cat.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Cat.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Formula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("CAT") diff --git a/ebean-core/src/test/java/org/tests/model/basic/Contact.java b/ebean-core/src/test/java/org/tests/model/basic/Contact.java index a4d6700714..97a48bf101 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Contact.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java index 1b2963624d..a0e4fcb7b4 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ContactGroup extends BasicDomain { diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java index ffe0b2e56e..f1fbc8075c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Country.java b/ebean-core/src/test/java/org/tests/model/basic/Country.java index bde38fc78d..73f9764214 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Country.java @@ -2,9 +2,9 @@ import io.ebean.annotation.*; -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 javax.validation.constraints.Size; /** diff --git a/ebean-core/src/test/java/org/tests/model/basic/Customer.java b/ebean-core/src/test/java/org/tests/model/basic/Customer.java index 8e209631e0..17fab4ba32 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Customer.java @@ -2,7 +2,7 @@ import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Dog.java b/ebean-core/src/test/java/org/tests/model/basic/Dog.java index 7b2fad5466..be7e4f4759 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Dog.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Dog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java b/ebean-core/src/test/java/org/tests/model/basic/EBasic.java index 603102032e..42cae8c935 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-core/src/test/java/org/tests/model/basic/EBasic.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -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 javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Order.java b/ebean-core/src/test/java/org/tests/model/basic/Order.java index dfb9f2aef5..1d97448687 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Order.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Order.java @@ -2,7 +2,7 @@ import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Date; diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java index 364d94f2fe..8da916a41c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java index 3938372963..b7318d9680 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java index a587538a1b..9448671000 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Product.java b/ebean-core/src/test/java/org/tests/model/basic/Product.java index b0fde6d073..df57dadd07 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Product.java @@ -2,10 +2,10 @@ import io.ebean.annotation.*; -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 javax.validation.constraints.Size; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Section.java b/ebean-core/src/test/java/org/tests/model/basic/Section.java index 0395411889..9856a09e55 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Section.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java b/ebean-core/src/test/java/org/tests/model/basic/SubSection.java index b5e8888f28..d45f49ed3b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java +++ b/ebean-core/src/test/java/org/tests/model/basic/SubSection.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java index 80c0f8d363..07f614d658 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-core/src/test/java/org/tests/model/basic/TOne.java b/ebean-core/src/test/java/org/tests/model/basic/TOne.java index 13ae7e7e29..09ac648454 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TOne.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TOne.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * A basic entity to test simple things. diff --git a/ebean-core/src/test/java/org/tests/model/basic/Truck.java b/ebean-core/src/test/java/org/tests/model/basic/Truck.java index c32d70777b..35785d85f8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Truck.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171bb..b766599c74 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java index cab8c4dde7..9ba8697048 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java index 00119e5ec0..c4b03be79b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d4..13b4ee34e3 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f0..2f635062e8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5c..2b1df858ee 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java b/ebean-core/src/test/java/org/tests/model/bridge/BSite.java index 2023a8c4bc..036af85e56 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/BSite.java @@ -1,8 +1,8 @@ package org.tests.model.bridge; -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.UUID; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java b/ebean-core/src/test/java/org/tests/model/bridge/BUser.java index 7a87fe864e..9573f85b7a 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/BUser.java @@ -1,7 +1,7 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java index d44cf80521..be6109e190 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java +++ b/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author rnentjes diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java index a871d49aae..ae879544ee 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java +++ b/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java index 6ba9d4c414..122261b609 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbJson; -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; import java.util.Map; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java b/ebean-core/src/test/java/org/tests/model/embedded/EMain.java index edb13ac1bc..cb0cfb0afa 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EMain.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java index ef5e82a80f..ee6ad5d63e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java index 574a557a6c..d7108f062f 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Eembeddable { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java index 341f0670eb..183643e706 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -3,8 +3,8 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java index 52b6583cd3..e9fd6d49e4 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index bd39796517..18a440b1b3 100644 --- a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -2,7 +2,7 @@ import org.tests.model.ivo.Money; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.math.BigDecimal; /** diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index edac9dfdb1..0bf3e19390 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -39,15 +39,15 @@ provided - + - + jakarta.xml.bind jakarta.xml.bind-api @@ -59,7 +59,7 @@ 4.0.0 runtime - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index 6e5fd23e57..87a811648a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -13,7 +13,7 @@ import io.ebeaninternal.dbmigration.model.CurrentModel; import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.*; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java index 8a002f513d..f7d326c13a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java @@ -11,6 +11,6 @@ public class Detect { * Return true if JAXB is present. */ public static boolean isJAXBPresent(DatabaseConfig config) { - return config.getClassLoadConfig().isPresent("javax.xml.bind.JAXBException"); + return config.getClassLoadConfig().isPresent("jakarta.xml.bind.JAXBException"); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java index 2586acf894..fdf57a999c 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java index e8e6b94209..b4d12ede53 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java index 630ccbce96..20326eb5be 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java index a53b6cb659..578fbf172e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java index 7082c03e20..256ed1d641 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java index 95996d71c1..9a394b5311 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java index 0f6d43dc06..7f38df0fa2 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java index fc37c8e638..895b51c29b 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.math.BigInteger; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java index 424c48a16d..7240b52239 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java index ae24ce4577..62b185d73e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java @@ -1,9 +1,9 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java index a469e331ab..2bcafcae58 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java index edc22f3807..2526468b17 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java index 8f15e8496c..cdad503a79 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java index 995c01fb95..aa9e7f8142 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java index 62c0deb463..d065a09abf 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java index f0ec659d73..0380942a63 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java index cc45c3b440..a1bb5a44b7 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java index 4c303d97d0..13187d594e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java index e85add7c2e..758a0f28c0 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java index 25b63ad80e..36bb0f2b3b 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java index 7c9906d837..4735605492 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java index 65b15e9793..1ccdcaf8a6 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java index 1104b31d19..e37065ad6a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java index 640c53ed16..48a2418193 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java index 7673fa881b..05bcbcd556 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java index 50eba9dad2..be5b2aa258 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java index 78bc2ef99b..9b455358ef 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java index 85e04f4a78..0266a5a507 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java index 4535c5eec5..052b72be11 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java index 6e45cbba8d..423e006183 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java index 893356679e..bb0cf28385 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java index 954ac5a02f..8702ec7fed 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java index 47b22f02ec..08bd1ed7dd 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java index f52bba8313..8f7b350c28 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.ebeaninternal.dbmigration.migration; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java index e93260ba90..bac25a5088 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java @@ -3,9 +3,9 @@ import io.ebeaninternal.dbmigration.migration.Migration; -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 java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java index c887fc2b09..12c50e9cf0 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java @@ -4,9 +4,9 @@ import io.ebean.util.IOUtils; import io.ebeaninternal.dbmigration.migration.Migration; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import java.io.File; import java.io.IOException; import java.io.Writer; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java index 53819461f4..7fbcbd2d68 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java @@ -1,11 +1,11 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java index 2255ee88d1..bdd2f45c23 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java @@ -1,10 +1,10 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java index a836534949..69a87cf1a0 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java @@ -3,9 +3,9 @@ import io.avaje.applog.AppLog; import io.ebean.annotation.Platform; -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 java.io.IOException; import java.io.InputStream; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java index 20cf3cd461..320fced06d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java @@ -1,6 +1,6 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java index c8e18d1dc0..b4f69f4623 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.ebeaninternal.extraddl.model; diff --git a/ebean-ddl-generator/src/main/java/module-info.java b/ebean-ddl-generator/src/main/java/module-info.java index 1a7ef332e4..d3a8affe56 100644 --- a/ebean-ddl-generator/src/main/java/module-info.java +++ b/ebean-ddl-generator/src/main/java/module-info.java @@ -7,7 +7,7 @@ requires transitive io.ebean.ddl.runner; requires transitive io.ebean.core; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires io.ebean.core.type; requires io.ebean.migration; diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 0f580744ad..ef6a0538f3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,17 +1,17 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -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 javax.persistence.Version; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +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; +import jakarta.persistence.Version; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java index b192290cf0..61285db0f3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java index 8bc2dbf1a4..75699b9758 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,10 +1,10 @@ package org.tests.inheritance.company.domain; -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; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7d..c8843ccee2 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java index 9cde2d7f3a..e11e143470 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,10 +1,10 @@ package org.tests.inheritance.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CalculationResult { diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java index b0363976df..741337dd6e 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,14 +3,14 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -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.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; @ChangeLog @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a69..fa3f577ecf 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef42..9e40cab92c 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -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; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bbc..d39f7bb091 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -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; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java b/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java index da67d03758..525f6f25a7 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java index c1119456a4..7feb4da8e0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java @@ -3,11 +3,11 @@ import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.metaannotation.SizeMedium; -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 javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java index 4a71909a89..ac0a629f76 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CKeyAssoc { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java index aed4a10b93..4a353ac3df 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -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 CKeyDetail { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java index 36ef22ab86..fcf7dd6390 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,12 +2,12 @@ import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java index a0d8c828c8..139b448f71 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java index 39496a703b..da5511ef14 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java @@ -1,14 +1,14 @@ package org.tests.model.basic; -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.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.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.List; @@ -19,7 +19,7 @@ public class Person implements Serializable { private static final long serialVersionUID = 495045977245770183L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40) @Column(name = "ID", unique = true, nullable = false) private Long id; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java index 3ba7b3ebe1..b33a46c7a0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java @@ -1,14 +1,14 @@ package org.tests.model.basic; -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.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.Table; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -19,7 +19,7 @@ public class Phone implements Serializable { private static final long serialVersionUID = -326610269092956952L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java index 1c77787344..a813f20a38 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java @@ -2,11 +2,11 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; @Entity @Inheritance diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171bb..b766599c74 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java index ae99a871a7..6b64476434 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java @@ -2,10 +2,10 @@ import org.tests.model.BaseModel; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java index cb28ad9591..940c299ddf 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -2,8 +2,8 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d4..13b4ee34e3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f0..2f635062e8 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5c..2b1df858ee 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java index 4d34035199..f7d8592869 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java index 40610428ec..25f467fbc7 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java index 50d7baf14a..750c50e84c 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java @@ -1,9 +1,9 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java index 30873ff547..f0e7c2c197 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java @@ -1,13 +1,13 @@ package org.tests.model.compositekeys; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Item { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java index 99b7c1018d..1771e0c3ad 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java @@ -1,7 +1,7 @@ package org.tests.model.compositekeys; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java index 070c353aa0..6aa82273bb 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java @@ -1,8 +1,8 @@ package org.tests.model.compositekeys; -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 Parcel { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java index 3ee5c1d48e..4c5645757b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java @@ -1,10 +1,10 @@ package org.tests.model.compositekeys; -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; @Entity public class ParcelLocation { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java index ad6e7270f6..a3e8b32478 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java @@ -1,11 +1,11 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java index dc92408aae..dec7c74eeb 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RegionKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java index 22d6b12534..78448b72c0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java index 6de6159ad8..e9a87dbd37 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class SubTypeKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java index a650c5c0e2..04b806f016 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java @@ -1,13 +1,13 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java index a5b8f07d0c..17a7c0bb3b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class TypeKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java index 7fe9bcfdf3..f27ce54989 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,11 +3,11 @@ import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java index eee84f8a7b..0bc0f845b9 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java index 51379a9403..45cda714e0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -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 = "c_message") diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java index dae00e2d50..a979ea9fac 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -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 = "c_participation") diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java index f921fd85e5..6c0a2a2404 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java @@ -4,9 +4,9 @@ import io.ebean.annotation.HistoryExclude; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @History @Entity diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java index a4dfbac9a3..dad6d8bca3 100644 --- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java @@ -12,7 +12,7 @@ import io.ebean.core.type.*; import io.ebean.text.TextException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java b/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java index 410fe38f98..6dc59d1e20 100644 --- a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java +++ b/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass abstract class BaseEntity { diff --git a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java b/ebean-postgis/src/test/java/org/example/domain/CachedBean.java index 02835c4b88..a67a744886 100644 --- a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java +++ b/ebean-postgis/src/test/java/org/example/domain/CachedBean.java @@ -4,8 +4,8 @@ import org.postgis.Point; import org.postgis.Polygon; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="mybean_cached") diff --git a/ebean-postgis/src/test/java/org/example/domain/MyBean.java b/ebean-postgis/src/test/java/org/example/domain/MyBean.java index 5ff0bd1b4e..6ad51f8a98 100644 --- a/ebean-postgis/src/test/java/org/example/domain/MyBean.java +++ b/ebean-postgis/src/test/java/org/example/domain/MyBean.java @@ -7,9 +7,9 @@ import org.postgis.Point; import org.postgis.Polygon; -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 @Table(name="mybean") diff --git a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java b/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java index 99c6cf44c7..9a3a8c4a6a 100644 --- a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java +++ b/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java @@ -9,9 +9,9 @@ import org.geolatte.geom.Point; import org.geolatte.geom.Polygon; -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 @Table(name="mybean") diff --git a/ebean-querybean/src/test/java/org/example/domain/ACat.java b/ebean-querybean/src/test/java/org/example/domain/ACat.java index 3537437b74..33333f8f68 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ACat.java +++ b/ebean-querybean/src/test/java/org/example/domain/ACat.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("CAT") @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/ADog.java b/ebean-querybean/src/test/java/org/example/domain/ADog.java index 81646476b5..8d5a5837e6 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ADog.java +++ b/ebean-querybean/src/test/java/org/example/domain/ADog.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Inheritance @DiscriminatorValue("DOG") diff --git a/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java b/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java index 30187d6fc2..38415ba3ac 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java +++ b/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("SCAT") @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/AWildCat.java b/ebean-querybean/src/test/java/org/example/domain/AWildCat.java index 85e2e32054..443c73c310 100644 --- a/ebean-querybean/src/test/java/org/example/domain/AWildCat.java +++ b/ebean-querybean/src/test/java/org/example/domain/AWildCat.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Inheritance @DiscriminatorValue("WC") diff --git a/ebean-querybean/src/test/java/org/example/domain/Address.java b/ebean-querybean/src/test/java/org/example/domain/Address.java index f3b161dc84..87909f39f9 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Address.java +++ b/ebean-querybean/src/test/java/org/example/domain/Address.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import org.example.domain.otherpackage.GenericType; diff --git a/ebean-querybean/src/test/java/org/example/domain/Animal.java b/ebean-querybean/src/test/java/org/example/domain/Animal.java index 2a4196c06b..e3c33492bd 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Animal.java +++ b/ebean-querybean/src/test/java/org/example/domain/Animal.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; @Entity @Inheritance diff --git a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java index 2ae8785d26..e1da4e42dd 100644 --- a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java @@ -2,10 +2,10 @@ import org.example.domain.api.ACity; -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 java.util.List; @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java index 211d3141c2..938baee970 100644 --- a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java +++ b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; /** diff --git a/ebean-querybean/src/test/java/org/example/domain/CaoBean.java b/ebean-querybean/src/test/java/org/example/domain/CaoBean.java index 23ca4eb732..9916e8b483 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CaoBean.java +++ b/ebean-querybean/src/test/java/org/example/domain/CaoBean.java @@ -1,6 +1,6 @@ package org.example.domain; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CaoBean { diff --git a/ebean-querybean/src/test/java/org/example/domain/CaoKey.java b/ebean-querybean/src/test/java/org/example/domain/CaoKey.java index 5b25b5337d..f4069cd3f6 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CaoKey.java +++ b/ebean-querybean/src/test/java/org/example/domain/CaoKey.java @@ -1,6 +1,6 @@ package org.example.domain; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class CaoKey { diff --git a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java index 643914429c..111c9b30b0 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java @@ -3,9 +3,9 @@ import org.example.domain.api.ACity; import org.example.domain.api.ACountry; -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 CityImpl implements ACity { diff --git a/ebean-querybean/src/test/java/org/example/domain/Contact.java b/ebean-querybean/src/test/java/org/example/domain/Contact.java index 44e7dbf311..7d2554f574 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Contact.java +++ b/ebean-querybean/src/test/java/org/example/domain/Contact.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbArray; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.time.ZonedDateTime; diff --git a/ebean-querybean/src/test/java/org/example/domain/ContactNote.java b/ebean-querybean/src/test/java/org/example/domain/ContactNote.java index 9f684b81c5..6ac6f40360 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ContactNote.java +++ b/ebean-querybean/src/test/java/org/example/domain/ContactNote.java @@ -2,9 +2,9 @@ import io.ebean.Finder; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; @Entity public class ContactNote extends BaseModel { diff --git a/ebean-querybean/src/test/java/org/example/domain/ContactOther.java b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java index 731def6d64..ec2e734a02 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ContactOther.java +++ b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * Contact entity bean. diff --git a/ebean-querybean/src/test/java/org/example/domain/Country.java b/ebean-querybean/src/test/java/org/example/domain/Country.java index 07b5dace51..322d1466c7 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Country.java +++ b/ebean-querybean/src/test/java/org/example/domain/Country.java @@ -1,8 +1,8 @@ package org.example.domain; -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.time.Instant; import java.time.OffsetDateTime; diff --git a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java index 6f8797df81..d85b4c4264 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java @@ -2,8 +2,8 @@ import org.example.domain.api.ACountry; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CountryImpl implements ACountry { diff --git a/ebean-querybean/src/test/java/org/example/domain/Customer.java b/ebean-querybean/src/test/java/org/example/domain/Customer.java index 4f843ffb7e..2b1264abaf 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Customer.java +++ b/ebean-querybean/src/test/java/org/example/domain/Customer.java @@ -7,13 +7,13 @@ import org.example.domain.otherpackage.PhoneNumber; import org.example.domain.otherpackage.ValidEmail; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Lob; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Lob; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/ebean-querybean/src/test/java/org/example/domain/MyInner.java b/ebean-querybean/src/test/java/org/example/domain/MyInner.java index e37dadabaf..ec9c8f9f59 100644 --- a/ebean-querybean/src/test/java/org/example/domain/MyInner.java +++ b/ebean-querybean/src/test/java/org/example/domain/MyInner.java @@ -1,9 +1,9 @@ package org.example.domain; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import java.util.Objects; @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/Order.java b/ebean-querybean/src/test/java/org/example/domain/Order.java index 7b63725fe3..39b392cfef 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Order.java +++ b/ebean-querybean/src/test/java/org/example/domain/Order.java @@ -3,12 +3,12 @@ import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import javax.validation.constraints.NotNull; import java.sql.Date; import java.util.ArrayList; diff --git a/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java b/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java index d16682b18c..e3456ec2c6 100644 --- a/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java +++ b/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Order Detail entity bean. diff --git a/ebean-querybean/src/test/java/org/example/domain/Product.java b/ebean-querybean/src/test/java/org/example/domain/Product.java index ed58daa054..75e59e86bb 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Product.java +++ b/ebean-querybean/src/test/java/org/example/domain/Product.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import javax.validation.constraints.Size; /** diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java index c5e574f624..776def4286 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class GenericTypeAttributeConverter implements AttributeConverter, String> { diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java index 9500b99241..0bb36aa015 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class PhoneAttributeConverter implements AttributeConverter { diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java index 6864366ffe..3688d03bb7 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class ValidEmailAttributeConverter implements AttributeConverter { diff --git a/ebean-redis/src/test/java/org/domain/EBase.java b/ebean-redis/src/test/java/org/domain/EBase.java index 84143f8e39..e9d409b426 100644 --- a/ebean-redis/src/test/java/org/domain/EBase.java +++ b/ebean-redis/src/test/java/org/domain/EBase.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.time.Instant; @MappedSuperclass diff --git a/ebean-redis/src/test/java/org/domain/Person.java b/ebean-redis/src/test/java/org/domain/Person.java index d5a8833918..edc212740f 100644 --- a/ebean-redis/src/test/java/org/domain/Person.java +++ b/ebean-redis/src/test/java/org/domain/Person.java @@ -5,7 +5,7 @@ import io.ebean.annotation.CacheBeanTuning; import io.ebean.annotation.Index; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Cache(enableQueryCache = true, nearCache = true, naturalKey = "name") diff --git a/ebean-redis/src/test/java/org/domain/RCust.java b/ebean-redis/src/test/java/org/domain/RCust.java index 8c1d015389..9f439d8d6c 100644 --- a/ebean-redis/src/test/java/org/domain/RCust.java +++ b/ebean-redis/src/test/java/org/domain/RCust.java @@ -5,7 +5,7 @@ import io.ebean.annotation.CacheBeanTuning; import io.ebean.annotation.Index; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Cache(naturalKey = "name") diff --git a/ebean-redis/src/test/java/org/domain/UChild.java b/ebean-redis/src/test/java/org/domain/UChild.java index 64a0641aa0..0f6fccf902 100644 --- a/ebean-redis/src/test/java/org/domain/UChild.java +++ b/ebean-redis/src/test/java/org/domain/UChild.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-redis/src/test/java/org/domain/UParent.java b/ebean-redis/src/test/java/org/domain/UParent.java index 25b42f12e3..dede6ba17c 100644 --- a/ebean-redis/src/test/java/org/domain/UParent.java +++ b/ebean-redis/src/test/java/org/domain/UParent.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -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 java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java index 482222ab59..e51566b7a0 100644 --- a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java +++ b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -9,7 +9,7 @@ import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.List; diff --git a/ebean-spring-txn/src/test/java/org/example/Account.java b/ebean-spring-txn/src/test/java/org/example/Account.java index dea4c103d9..9ee1855bb5 100644 --- a/ebean-spring-txn/src/test/java/org/example/Account.java +++ b/ebean-spring-txn/src/test/java/org/example/Account.java @@ -1,9 +1,9 @@ package org.example; -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; @Table(name="o_account") @Entity diff --git a/ebean-spring-txn/src/test/java/org/example/Role.java b/ebean-spring-txn/src/test/java/org/example/Role.java index 6fcee501eb..305635fb11 100644 --- a/ebean-spring-txn/src/test/java/org/example/Role.java +++ b/ebean-spring-txn/src/test/java/org/example/Role.java @@ -1,10 +1,10 @@ package org.example; 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; @Table(name="o_role") @Entity diff --git a/ebean-spring-txn/src/test/java/org/example/User.java b/ebean-spring-txn/src/test/java/org/example/User.java index 337796f062..4d985ed980 100644 --- a/ebean-spring-txn/src/test/java/org/example/User.java +++ b/ebean-spring-txn/src/test/java/org/example/User.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Table(name="o_user") diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 2f41e3efb7..6eb14a3990 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -71,7 +71,7 @@ - + - + jakarta.xml.bind jakarta.xml.bind-api @@ -96,7 +96,7 @@ 4.0.0 runtime - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java index 428c3b3f4a..ae6e0e00a0 100644 --- a/ebean-test/src/main/java/module-info.java +++ b/ebean-test/src/main/java/module-info.java @@ -19,7 +19,7 @@ requires transitive io.ebean.test.containers; requires transitive org.assertj.core; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires transitive com.h2database; // support testing diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java index e41d914b92..f6c3ff9367 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java @@ -8,7 +8,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java index b0819c5595..47e2fd94db 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java @@ -43,7 +43,7 @@ public void need_explicitPlatform() { assertThat(sqlServer).isNotNull(); sqlServer.shutdown(); -// javax.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for details +// jakarta.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for details // // at io.ebeaninternal.server.core.DatabasePlatformFactory.create(DatabasePlatformFactory.java:62) // at io.ebeaninternal.server.core.DefaultContainer.setDatabasePlatform(DefaultContainer.java:266) diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java index 0537d38fe6..1e06103357 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java @@ -24,8 +24,8 @@ import io.ebeaninternal.server.query.CQuery; import io.ebeaninternal.server.transaction.RemoteTransactionEvent; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.time.Clock; import java.util.*; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index 3fa7f84b8a..4229e5e424 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -16,8 +16,8 @@ import io.ebean.text.json.JsonContext; import javax.annotation.Nullable; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.Collection; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java index 0148551a62..81b62296d5 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * detects a bug where dropHistoryTable is not applied correctly diff --git a/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java index 7b658368cc..c7fea43ce6 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java @@ -1,9 +1,9 @@ package misc.migration.history.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * detects a bug where dropHistoryTable is not applied correctly diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java index 75f0c7013e..ba1725ac6b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -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 = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java index 2d8c7f956f..83c9d2a5c6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -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 = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java index dacf6febe6..9b82840387 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "migtest_ckey_parent") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java index d61d29e7da..6d85f0b735 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java index f7b14f3213..8599eacdeb 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java index b05ccab94a..7f8df14727 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java index 1c44c06d61..f35aa2fb2f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -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; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java index 96e5880178..4251108eb0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java index 28e2da2299..0762022f8a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -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 = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java index 6c46d75290..396ec48ab0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index 9bc8ee0329..d53398aa1c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.io.File; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java index 834099a10a..9125a42efa 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; -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 = "migtest_e_enum") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java index fc659f2706..05125e47df 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Tablespace; -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 = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java index d29a2c45b6..ca1c23032e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -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 = "migtest_e_history2") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java index 1224581a71..9e964c776f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -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/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java index ce1b464e13..592760ceb0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -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/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java index a6e5f5ee69..924b2fddb3 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -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/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java index 9a1fd23b7e..3033d1b477 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -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/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java index 964f766056..dec74391fe 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; // table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java index 46103c1731..7ed1990a1e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -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 javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java index 58d9a0af07..4758647115 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -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 = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java index 0a593993f2..34edeae82e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java index c0f9f59183..56fe39d6e1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -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 = "migtest_mtm_c") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java index 87b23387cb..603e09b3bc 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -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 = "migtest_mtm_m") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java index 23bc8f5699..2f9b3f7ed6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -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 static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java index 770c3e754d..520b99228a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -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 = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java index 847ddc32c3..9af912c4d5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -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 = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java index 2b8655c0b2..b9286eb4b0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -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; @Entity @Table(name = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java index 5c039bb067..891cd2c776 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java index 4d27231663..386926d0c2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java index 22f1c88f8a..963d407ef1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java index deed36868e..97705b0a4d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java index 16129121f9..177504b667 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -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; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java index 5cac1da059..6422f556ed 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java index eb04c6d64e..0c8254e63a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -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 = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java index be199b097d..521ffb1bd2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java b/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java index 67bffc1a7c..16bb807348 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; /** diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java index 76b8a2b428..268d386cdf 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -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 java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java index 3de28d1ac0..8fdf79d87d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -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; @Entity @Table(name = "drop_ref_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java index de8a012e7f..23ec35b711 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "drop_ref_one_to_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java index 3ed011c124..6be3b314a7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java index 577ede01d8..2adc703b08 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index d7f1829c55..e266f3c35c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -3,9 +3,9 @@ import io.ebean.annotation.*; -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 = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java index 89cf970a7e..a47e62445e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java @@ -6,9 +6,9 @@ import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.NotNull; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java index e8ab4ecc87..2dc55632e5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -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/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java index 1ac4d45087..67a877ee69 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -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/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java index f107314895..a8b0cde886 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java @@ -5,9 +5,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -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/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java index 171772b0dd..cfde2a19fd 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java @@ -5,9 +5,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -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/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java index 7c23cc5400..9b63ab148d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java @@ -3,9 +3,9 @@ import io.ebean.annotation.SoftDelete; -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 = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java index 20926d60f4..2411fa6bc6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java @@ -4,7 +4,7 @@ import io.ebean.annotation.History; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java index 215b0890f0..9675a1d8a5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java index 7405b2f011..dcee36fe8d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJson; -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.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java index c73428254d..91a6373899 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java index 2ec1cc61d8..6ef702dee2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EUser.java b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java index 42b901033a..505b7ae310 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EUser.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -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 = "migtest_e_user") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index 344ebb4df6..fb0801e034 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Tablespace; -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 java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index 4507821be6..1a21d67ffd 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Tablespace; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java index dd42d0771e..2f89d93674 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Index; -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 static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java index 80de9b9996..46c934ca72 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java index 351bb3ca79..bd42eb7742 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -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 = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java index c02288f0a6..906febe969 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -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 = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java index 7c44a42dc1..0c56f793e4 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "migtest_ckey_parent") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java index a2f42926b9..12b1dba4a9 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java index 31f91eb2a5..5ed826b29a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java index de1e430031..86db49985e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java index 4bc65eb4dd..c3e3868ff1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -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; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java index 38b64fee72..e3b12ddb7a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java index f1141d1862..3db7fe6958 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -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 = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java index 01b643c994..b4be7b601f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java index 191dc52151..34d985ff28 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.io.File; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java index b77161f218..857ab92f87 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; -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 = "migtest_e_enum") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java index e4d0e9506d..f2eaec57ac 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Tablespace; -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 = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java index 2647b7af4c..8d1d1d13b8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -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 = "migtest_e_history2") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java index 2e31ad85c9..e9cc601674 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -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/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java index c556f2c473..d4590ed7a5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -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/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java index 957ba43f4d..052143c943 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -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/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java index 284b706b85..af2f0ce2fe 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java @@ -5,9 +5,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -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/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java index 38ae02730a..513431b487 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; //table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java index 66ef3e373d..f233265d89 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -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 javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java index 5987135e3b..d7289d6b92 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -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 = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java index edfe5b3091..afa5171e0b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java @@ -4,7 +4,7 @@ import io.ebean.annotation.History; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java index de83d81941..d5cdd76a65 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -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 = "migtest_mtm_c") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java index a1e5e41cfb..b30b01f5b9 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -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 = "migtest_mtm_m") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java index 39b298d8bb..ad957efa01 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -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 static io.ebean.annotation.Platform.MYSQL; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java index ef7f78cbab..e6e69bea6d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -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 static io.ebean.annotation.Platform.MYSQL; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/org/etest/BSimpleFor.java b/ebean-test/src/test/java/org/etest/BSimpleFor.java index 2da2044129..25829b4306 100644 --- a/ebean-test/src/test/java/org/etest/BSimpleFor.java +++ b/ebean-test/src/test/java/org/etest/BSimpleFor.java @@ -2,10 +2,10 @@ import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import java.time.Instant; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java index 41a23d20f7..ea1c203be4 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.time.Instant; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtContent.java b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java index 9489c13424..8dbeb5a54f 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtContent.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java @@ -1,6 +1,6 @@ package org.multitenant.partition; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MtContent extends MtTenantAware { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtNone.java b/ebean-test/src/test/java/org/multitenant/partition/MtNone.java index 83968e1721..1ca74e6253 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtNone.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtNone.java @@ -1,8 +1,8 @@ package org.multitenant.partition; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MtNone { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java index 9c21a14e05..1a2d5a81e1 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Length; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MtTenant { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java index ea6337a893..2fdc98bd50 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java @@ -2,8 +2,8 @@ import io.ebean.annotation.TenantId; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class MtTenantAware extends MtBaseDomain { diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java index 32b65492ae..f3f120d530 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java @@ -1,6 +1,6 @@ package org.tests.aggregateformula; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java index c1e2d1d442..4593b3bd70 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java @@ -1,9 +1,9 @@ package org.tests.aggregateformula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java index f0c4ac9b5e..2ad3e1d3bd 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java @@ -1,8 +1,8 @@ package org.tests.aggregateformula; -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 = "iaf_segment_status") diff --git a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java index 0340880631..bf02301ab5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.ValidationGroupSomething; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.lang.annotation.ElementType; diff --git a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java index 43af424792..7613edef3b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java index eb1ce3daff..1867a694c0 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -6,7 +6,7 @@ import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTMaster; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java index e7c84da152..a3783adf87 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -8,7 +8,7 @@ import org.tests.model.basic.Address; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java index 2f338368b4..4a36fb268b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -15,9 +15,9 @@ import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -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 javax.validation.constraints.Size; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java index d1ef2bc7c1..6a2d78454f 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java @@ -8,13 +8,13 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java index fb53692331..6126630d2e 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java index 7687f56d89..3b86cde62f 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "drel_invoice") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java index a26f182573..459431e000 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "tire") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java index 01b617d0d2..84fffb43fb 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "wheel") diff --git a/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java index 5de7ef9f27..75326d3b3b 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java +++ b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java @@ -1,8 +1,8 @@ package org.tests.basic.type; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index 5750e30a18..bb38df92bf 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -14,7 +14,7 @@ import org.tests.model.basic.EOptOneB; import org.tests.model.basic.EOptOneC; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.sql.Savepoint; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java index 9357a2668d..cb287cc8a0 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java @@ -2,8 +2,8 @@ import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java index f4112c7463..03d896a11d 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java @@ -2,10 +2,10 @@ import io.ebean.annotation.NotNull; -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; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java index c2c6375c25..b4331bf225 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java @@ -1,9 +1,9 @@ package org.tests.batchinsert.o2o; -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; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java index e75f24aeba..137e01d01d 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java @@ -1,7 +1,7 @@ package org.tests.batchinsert.o2o; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java index 8339ca353c..0030ce7e06 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java @@ -2,10 +2,10 @@ import io.ebean.annotation.NotNull; -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; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index 5648911aa3..d323c7e709 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -6,7 +6,7 @@ import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 5783e0fb97..8f5f71c4d5 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 28001fb8a4..c84de0a755 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java index 80a543a11d..7ba23c22f2 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java index fd58c7d5c9..822f5588a8 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java index 3c18bbc1af..f20ccc7dd5 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java @@ -1,9 +1,9 @@ package org.tests.cache.embeddedid; -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; @IdClass(CEPProductCategoryId.class) @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java index 0cd33f4a41..1cd3e815d5 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java index a61aeadf55..06fa970edb 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java index 70a7c49096..927638fde4 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @IdClass(ConceptId.class) diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java index fec0498151..40c66184b3 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class ConceptId { diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java index 2716ec70f3..5c15ad0226 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @IdClass(ConceptId.class) diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java index 144253edf4..1d58df4584 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java index f7747b5bde..b5c154f127 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java index b4b5051255..6ec0569c8f 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -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 javax.validation.constraints.Size; import java.time.Instant; diff --git a/ebean-test/src/test/java/org/tests/cascade/COOne.java b/ebean-test/src/test/java/org/tests/cascade/COOne.java index 07c92ecac6..fced7fe5c6 100644 --- a/ebean-test/src/test/java/org/tests/cascade/COOne.java +++ b/ebean-test/src/test/java/org/tests/cascade/COOne.java @@ -1,11 +1,11 @@ package org.tests.cascade; -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 java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class COOne { diff --git a/ebean-test/src/test/java/org/tests/cascade/COOneMany.java b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java index 8894ca8ee6..d773df6940 100644 --- a/ebean-test/src/test/java/org/tests/cascade/COOneMany.java +++ b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java @@ -2,8 +2,8 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class COOneMany { diff --git a/ebean-test/src/test/java/org/tests/cascade/CORoot.java b/ebean-test/src/test/java/org/tests/cascade/CORoot.java index 68700b0d37..296c7d485d 100644 --- a/ebean-test/src/test/java/org/tests/cascade/CORoot.java +++ b/ebean-test/src/test/java/org/tests/cascade/CORoot.java @@ -1,10 +1,10 @@ package org.tests.cascade; -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 static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class CORoot { diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java index 2febada002..29f3c22a58 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity @Cache diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java index 093a2946fb..9f4d1300d4 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java index b15a4ff8e3..412bda3c2b 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java @@ -1,9 +1,9 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmOrderedDetail { diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java index 89141a3457..8db5bef7af 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java index 29e4945396..a0b278da42 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java index 06bf64f181..26bad8cdf3 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class RelMaster { diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index e1d5f19dfd..79c4610b15 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -6,7 +6,7 @@ import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index 7a1c8ae6c1..b38e91dd17 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java index c2f87d08d7..46fa475df5 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java index 8638fe6104..22cc4b23c5 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CaoBean { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java index 4d56e0cf6c..1235931ea0 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class CaoKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java index 9aca96574c..df62a8318b 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Item { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java index adc1767696..c77a9172c5 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java @@ -1,7 +1,7 @@ package org.tests.compositekeys.db; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java index bf1324de9e..b695e8ec65 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java @@ -1,8 +1,8 @@ package org.tests.compositekeys.db; -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 Parcel { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java index 79d5416738..0b79041e64 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ParcelLocation { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java index be0891ac8c..8dc04b5583 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java index ecf8b3f861..55084a798a 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RegionKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java index a6defdc4ec..a441fa1e42 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java index 0a98564e1b..e19cd42673 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class SubTypeKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java index bfd160d983..a45a7753b9 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java index 2725c0867f..e8d2e9af83 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class TypeKey { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java index 18f4f8201b..1c699fcbca 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java @@ -3,9 +3,9 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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 DfkCascade { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java index fa3c14c2c8..94de27cad5 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java @@ -1,9 +1,9 @@ package org.tests.ddl; -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 java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNone.java b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java index 995ba990d8..be0218be87 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNone.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbForeignKey; -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 DfkNone { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java index 5d95be203f..1a34ab0adc 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package org.tests.ddl; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class DfkNoneViaJoin { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java index 9b781e3c8d..c1c3e6afe5 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -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; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java index 84bb826d85..d4852716fb 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkOne.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java @@ -1,7 +1,7 @@ package org.tests.ddl; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class DfkOne { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java index 5f55e3f0be..aef54a4f7c 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java @@ -3,9 +3,9 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -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 DfkSetNull { diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java index 5140be70ce..cb1936c6f8 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -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 java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java index 77546973d4..04c9b0e395 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Draftable diff --git a/ebean-test/src/test/java/org/tests/delete/DcDetail.java b/ebean-test/src/test/java/org/tests/delete/DcDetail.java index e49cc58bc4..4a118009e1 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcDetail.java +++ b/ebean-test/src/test/java/org/tests/delete/DcDetail.java @@ -1,8 +1,8 @@ package org.tests.delete; -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 DcDetail { diff --git a/ebean-test/src/test/java/org/tests/delete/DcMaster.java b/ebean-test/src/test/java/org/tests/delete/DcMaster.java index 22a0e1b3ae..43a4136e9d 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcMaster.java +++ b/ebean-test/src/test/java/org/tests/delete/DcMaster.java @@ -1,6 +1,6 @@ package org.tests.delete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index def5d23742..ddebc9ec71 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -9,7 +9,7 @@ import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java index 19fe7661d1..37f40457f7 100644 --- a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java +++ b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BwBean extends Model { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java index c9997015a9..5749cbe920 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java b/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java index 4388e2ddbd..e337be332b 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "ea_object") diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java index 2be7954db7..ab276ee24d 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java @@ -1,9 +1,9 @@ package org.tests.idkeys.db; -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 GenKeyIdentity { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java index 85051a34c2..0d2a04d91d 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java @@ -1,9 +1,9 @@ package org.tests.idkeys.db; -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 GenKeySeqA { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java index 474e4902ac..e0f8f90b4c 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java @@ -1,6 +1,6 @@ package org.tests.idkeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class GenKeySeqB { diff --git a/ebean-test/src/test/java/org/tests/inherit/ChildA.java b/ebean-test/src/test/java/org/tests/inherit/ChildA.java index 9e68184159..55412518ee 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ChildA.java +++ b/ebean-test/src/test/java/org/tests/inherit/ChildA.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("A") diff --git a/ebean-test/src/test/java/org/tests/inherit/ChildB.java b/ebean-test/src/test/java/org/tests/inherit/ChildB.java index 34a42e5702..7a92f3f256 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ChildB.java +++ b/ebean-test/src/test/java/org/tests/inherit/ChildB.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("B") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java index a76c0f272a..b4a2f2ebc1 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("1") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java index 5f3737c900..087782ec18 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("2") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java index 747a995c96..e17172e4a5 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class DIntChildBase extends DIntParent { diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java index f67cd5041c..5bd4122a57 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "dint_parent") diff --git a/ebean-test/src/test/java/org/tests/inherit/Data.java b/ebean-test/src/test/java/org/tests/inherit/Data.java index 0f20e16c37..e145787952 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Data.java +++ b/ebean-test/src/test/java/org/tests/inherit/Data.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/EUncle.java b/ebean-test/src/test/java/org/tests/inherit/EUncle.java index 6dbe920892..7eb423f446 100644 --- a/ebean-test/src/test/java/org/tests/inherit/EUncle.java +++ b/ebean-test/src/test/java/org/tests/inherit/EUncle.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "rawinherit_uncle") diff --git a/ebean-test/src/test/java/org/tests/inherit/Parent.java b/ebean-test/src/test/java/org/tests/inherit/Parent.java index 4eac1553ae..1e440903d8 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Parent.java +++ b/ebean-test/src/test/java/org/tests/inherit/Parent.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java index d015616692..f082bc7cd0 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java +++ b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java index 8a3964f9eb..19d1f1089d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java +++ b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import javax.persistence.*; +import jakarta.persistence.*; /** */ diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java index 613637800f..16d6b27ddc 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; /** diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java index f03850f1c0..062a67420b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java @@ -1,12 +1,12 @@ package org.tests.inheritance; -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 javax.validation.constraints.NotNull; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.LAZY; /** * Model class to reference an organization tree node. diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java index 19814855f6..6bde8ee890 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java @@ -1,7 +1,7 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Unit") diff --git a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java index c5ac10b648..5215cbe53b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java +++ b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import javax.persistence.*; +import jakarta.persistence.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java index ecd0c2e39c..f7fbe69492 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java @@ -1,6 +1,6 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "blockt") diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java index ea0297de1e..73d8388240 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java @@ -1,7 +1,7 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value = "2") diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java index bf2432b2af..587a81900d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java @@ -1,8 +1,8 @@ package org.tests.inheritance.bothsides; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SourceA extends SourceBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java index 2cac1f07ca..44f570ffad 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java @@ -1,8 +1,8 @@ package org.tests.inheritance.bothsides; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SourceB extends SourceBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java index 53056bbb9a..d9ae07d90f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java index 0febee7cf5..fe5155a908 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Target1 extends TargetBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java index 76c4bb28b2..d581a08d97 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Target2 extends TargetBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java index e5359d6573..71b849277f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java index 848269e23d..80c958cee7 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.util.UUID; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java index fea779587e..27922451df 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CIAddress extends CIBaseModel { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java index 64e983fa85..19021e320d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java @@ -3,8 +3,8 @@ import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @Cache(enableQueryCache=true) @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java index 3ac832e3d0..2cd10cb820 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value="1") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java index 7e376add8a..73cdd8d6d3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java index f61dd11bf5..66ccad83fc 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java @@ -1,9 +1,9 @@ package org.tests.inheritance.cache; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "street") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java index 88b2de299f..8c568d3441 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java index 095ba5af6d..d8b082c943 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java @@ -1,10 +1,10 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class ComplexBean extends RootBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java index ccf784adcc..cda033333c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java @@ -2,9 +2,9 @@ import io.ebean.annotation.NotNull; -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 ElementBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java index 3c66367e89..d5ee430952 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java @@ -1,13 +1,13 @@ package org.tests.inheritance.cascadedelete; -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 java.util.List; import java.util.UUID; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class ReferencingBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java index 76d9ddc0c6..bd72f50b0d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java index e234228fc1..69a6674b9c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class SimpleBean extends RootBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 899381d4e9..6f42c6da89 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,6 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java index b192290cf0..61285db0f3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java index 5ef6ef7c89..b64ab0337b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,6 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7d..c8843ccee2 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java index 6d315b65a3..2ac44823e1 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java index c58afe6c11..cea72d5459 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.*; +import jakarta.persistence.*; @ChangeLog @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a69..fa3f577ecf 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef42..9e40cab92c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -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; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bbc..d39f7bb091 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -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; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java index e28fe6b66a..0386f7e52b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java index 036ceccf88..de8e5d6d47 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderedA extends OrderedParent { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java index d21a708e47..810060dc54 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderedB extends OrderedParent { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java index 43845541c2..1935a26078 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java @@ -1,8 +1,8 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java index 59bf6a04a3..7cee172f3e 100644 --- a/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java +++ b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java @@ -2,10 +2,10 @@ import io.ebean.Model; -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.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java index c251efd5a0..7ce8ba5bb4 100644 --- a/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java +++ b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java @@ -1,7 +1,7 @@ package org.tests.insert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OnlyIdEntity { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java index 2f30ccd495..592f3b8bbb 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java @@ -1,11 +1,11 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfCalendar extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCity.java b/ebean-test/src/test/java/org/tests/iud/PcfCity.java index 2612bc1f37..969cbb6cdc 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCity.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCity.java @@ -1,9 +1,9 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfCity extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCountry.java b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java index bdfb3f930e..e572994338 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCountry.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java @@ -1,8 +1,8 @@ package org.tests.iud; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/iud/PcfEvent.java b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java index 1a8aa8d40d..f6de132004 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfEvent.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java @@ -1,6 +1,6 @@ package org.tests.iud; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class PcfEvent extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfModel.java b/ebean-test/src/test/java/org/tests/iud/PcfModel.java index 1184352433..ef6030c175 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfModel.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfModel.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class PcfModel extends Model { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfPerson.java b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java index 1a3cfdf595..c29d311860 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfPerson.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java @@ -1,11 +1,11 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfPerson extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index 27434601ef..fbca4ace74 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -10,7 +10,7 @@ import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java index a3d937a777..8762122834 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java index 18cc8b8548..b8d4f4d960 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Sql; import org.tests.model.basic.Order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java index cb9d46d8de..0835146270 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java index 5827027800..ba37681909 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java index 3a2ae072c5..29aae4c43b 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java index ea2eb71fb2..91f07257a9 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java index bacfbdf9f6..c28f9e3cfd 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java @@ -4,9 +4,9 @@ import io.ebean.annotation.Platform; import io.ebean.annotation.SoftDelete; -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 = "main_entity") diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 8f36be0cbc..b20698a7f7 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -3,7 +3,7 @@ import io.ebean.annotation.DbForeignKey; import org.tests.model.basic.Cat; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java index 999ef1aa0a..4c0eb92d33 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java index 8da38cd599..10d04e357c 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java @@ -1,6 +1,6 @@ package org.tests.lazyloadconf; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "app_config_control") diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java index f59e7677ae..b301bf0347 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Cache(enableBeanCache = true) diff --git a/ebean-test/src/test/java/org/tests/level/Level1.java b/ebean-test/src/test/java/org/tests/level/Level1.java index 16f79a6ee7..29782a1170 100644 --- a/ebean-test/src/test/java/org/tests/level/Level1.java +++ b/ebean-test/src/test/java/org/tests/level/Level1.java @@ -1,6 +1,6 @@ package org.tests.level; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level2.java b/ebean-test/src/test/java/org/tests/level/Level2.java index 76d1339f44..b88e81f48b 100644 --- a/ebean-test/src/test/java/org/tests/level/Level2.java +++ b/ebean-test/src/test/java/org/tests/level/Level2.java @@ -1,6 +1,6 @@ package org.tests.level; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level3.java b/ebean-test/src/test/java/org/tests/level/Level3.java index 40393b38dc..6168a6ae5c 100644 --- a/ebean-test/src/test/java/org/tests/level/Level3.java +++ b/ebean-test/src/test/java/org/tests/level/Level3.java @@ -1,7 +1,7 @@ package org.tests.level; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Level3 { diff --git a/ebean-test/src/test/java/org/tests/level/Level4.java b/ebean-test/src/test/java/org/tests/level/Level4.java index 5ef9b6269d..b517ec0223 100644 --- a/ebean-test/src/test/java/org/tests/level/Level4.java +++ b/ebean-test/src/test/java/org/tests/level/Level4.java @@ -1,7 +1,7 @@ package org.tests.level; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Level4 { diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index 07491fa1fd..44eeddfe2a 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicWithLifecycleExceptions; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java index 0b9cf1f24f..57971c59f1 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -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 java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java index 2ae3f93406..dbaedd8798 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -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 java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MAddress.java b/ebean-test/src/test/java/org/tests/merge/MAddress.java index cfeb31bb6f..ccaef2c47a 100644 --- a/ebean-test/src/test/java/org/tests/merge/MAddress.java +++ b/ebean-test/src/test/java/org/tests/merge/MAddress.java @@ -1,6 +1,6 @@ package org.tests.merge; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MAddress extends MBase { diff --git a/ebean-test/src/test/java/org/tests/merge/MBase.java b/ebean-test/src/test/java/org/tests/merge/MBase.java index c0daf222ee..e11e850155 100644 --- a/ebean-test/src/test/java/org/tests/merge/MBase.java +++ b/ebean-test/src/test/java/org/tests/merge/MBase.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.util.UUID; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/merge/MContact.java b/ebean-test/src/test/java/org/tests/merge/MContact.java index 9331bbb430..5631f1f75a 100644 --- a/ebean-test/src/test/java/org/tests/merge/MContact.java +++ b/ebean-test/src/test/java/org/tests/merge/MContact.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MContactMessage.java b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java index a5f71b4526..5021a24267 100644 --- a/ebean-test/src/test/java/org/tests/merge/MContactMessage.java +++ b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java @@ -2,8 +2,8 @@ import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class MContactMessage extends MBase { diff --git a/ebean-test/src/test/java/org/tests/merge/MCustomer.java b/ebean-test/src/test/java/org/tests/merge/MCustomer.java index 802f8000bd..186b6a2fdb 100644 --- a/ebean-test/src/test/java/org/tests/merge/MCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/MCustomer.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MGroup.java b/ebean-test/src/test/java/org/tests/merge/MGroup.java index a455006af7..7c87c72343 100644 --- a/ebean-test/src/test/java/org/tests/merge/MGroup.java +++ b/ebean-test/src/test/java/org/tests/merge/MGroup.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/merge/MMachine.java b/ebean-test/src/test/java/org/tests/merge/MMachine.java index 896da51a11..ba78dd9f5d 100644 --- a/ebean-test/src/test/java/org/tests/merge/MMachine.java +++ b/ebean-test/src/test/java/org/tests/merge/MMachine.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/BaseModel.java b/ebean-test/src/test/java/org/tests/model/BaseModel.java index da67d03758..525f6f25a7 100644 --- a/ebean-test/src/test/java/org/tests/model/BaseModel.java +++ b/ebean-test/src/test/java/org/tests/model/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/EGenProps.java b/ebean-test/src/test/java/org/tests/model/EGenProps.java index 623b131f95..43ef3c445c 100644 --- a/ebean-test/src/test/java/org/tests/model/EGenProps.java +++ b/ebean-test/src/test/java/org/tests/model/EGenProps.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -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.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-test/src/test/java/org/tests/model/EWhoProps.java b/ebean-test/src/test/java/org/tests/model/EWhoProps.java index 54d3445d83..ddf93c42d1 100644 --- a/ebean-test/src/test/java/org/tests/model/EWhoProps.java +++ b/ebean-test/src/test/java/org/tests/model/EWhoProps.java @@ -1,6 +1,6 @@ package org.tests.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EWhoProps extends EWhoPropsSuper { diff --git a/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java index 156eb52d1c..2b3c9304c6 100644 --- a/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java +++ b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java @@ -5,9 +5,9 @@ import io.ebean.annotation.WhoCreated; import io.ebean.annotation.WhoModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java index af12d57873..d37f100702 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java index 58eae294d8..94dd05fe99 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java index b5863efb3b..af9ea87452 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Sum; import io.ebean.annotation.View; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java index d88df603d9..3b90352ea7 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java index dc3da08c27..2f1b5a83ed 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Sum; import io.ebean.annotation.View; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java index 66d3677f31..ff9feaff49 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java index e0cbd9352c..1bf9d7b674 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class DOrg extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java index 0e18650f65..1674e8c545 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java index a9e3f44310..14cea519e2 100644 --- a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java +++ b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java @@ -5,9 +5,9 @@ import io.ebean.annotation.DbArray; import io.ebean.annotation.NotNull; -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.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java index 523fa34362..7286a7cfd6 100644 --- a/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java +++ b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java @@ -4,9 +4,9 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.DbArray; -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.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Address.java b/ebean-test/src/test/java/org/tests/model/basic/Address.java index 98234699ae..0c3334d40a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Address.java @@ -3,7 +3,7 @@ import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Animal.java b/ebean-test/src/test/java/org/tests/model/basic/Animal.java index 069b1e4cfa..ba68c99d57 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Animal.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java index 761a8d4c70..ae3c9a1601 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java +++ b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java @@ -1,12 +1,12 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; @Entity public class AnimalShelter { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Article.java b/ebean-test/src/test/java/org/tests/model/basic/Article.java index 797366edd4..4cc6f020bb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Article.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Article.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java index d660c93f09..5aa6085b75 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance() diff --git a/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java index 080b87fa57..351fee45d8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java +++ b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java index 9cc71440db..0f02573585 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; /** * A user may have multiple bookmarks diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java index 305ab9497f..a01f78ef33 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java @@ -1,8 +1,8 @@ package org.tests.model.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; @Entity public class BBookmarkOrg { diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java index 064f4aa66a..2fe503e7d1 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -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 Chris diff --git a/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java index fcb91cdb3d..774cf8ef03 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -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 javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java index 86c39f5b49..da618902ed 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java index 89ae68bcdc..550abd3033 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.TimeZone; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/BigDog.java b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java index ddd6e54599..0aa1c331ac 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BigDog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("BDG") diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java index 4a71909a89..ac0a629f76 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CKeyAssoc { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java index aed4a10b93..4a353ac3df 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -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 CKeyDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java index 1b1cb0a81e..0067a35005 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java index a0d8c828c8..139b448f71 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/basic/Car.java b/ebean-test/src/test/java/org/tests/model/basic/Car.java index 268920a34d..c55fe81bf8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Car.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java index 37ee5720e6..b134230a0b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CarAccessory extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java index df2aef5bf0..7c2dd390c8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CarFuse { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Cat.java b/ebean-test/src/test/java/org/tests/model/basic/Cat.java index d3df201b61..a9d0581afe 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Cat.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Cat.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Formula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("CAT") diff --git a/ebean-test/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java index a4d6700714..97a48bf101 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Contact.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java index 1b2963624d..a0e4fcb7b4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ContactGroup extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java index ffe0b2e56e..f1fbc8075c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Country.java b/ebean-test/src/test/java/org/tests/model/basic/Country.java index bde38fc78d..73f9764214 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Country.java @@ -2,9 +2,9 @@ import io.ebean.annotation.*; -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 javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java index 0b4f98539c..0eff23d55a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Customer.java @@ -3,7 +3,7 @@ import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java index 5c4887e9ad..7e6d0a028d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-test/src/test/java/org/tests/model/basic/Dog.java b/ebean-test/src/test/java/org/tests/model/basic/Dog.java index 7b2fad5466..be7e4f4759 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Dog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Dog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java index 603102032e..42cae8c935 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -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 javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java index 214a2447fa..279b2b4b57 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java @@ -3,9 +3,9 @@ import io.ebean.annotation.*; import org.tests.model.json.PlainBean; -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 javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java index 0541f1b3f2..5aba6bcebb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java index 4ae5a6b1de..bcfa0be7c9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java index 410b0cbf3a..5a7d2b863e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java index 8af997f69c..36c5ccd311 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -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 EBasicClobNoVerChild { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java index 3fb5cc9e43..6975b21e0e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Date; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java index 77c6b2f2b3..063c26171e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java index f77af37f58..629d34250c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java index aaff1184e8..0fda7b6b3f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -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; @Entity @Table(name = "e_basicenc_relate") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java index 698f6eac28..3460cc9981 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java @@ -2,9 +2,9 @@ import io.ebean.annotation.EnumValue; -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 = "e_basic_enum_id") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java index 7cccf2ac1c..99cd57c829 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbEnumType; import io.ebean.annotation.DbEnumValue; -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.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java index 160fff74ab..297d4b2b3e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -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 = "e_basic_log") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java index 163827a182..9e1f225edb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -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 = "e_basic_ndc") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java index eaefd65fb5..3724a870b0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java @@ -1,11 +1,11 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java index 10fcbee547..f0e7c82f5d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.Identity; -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 java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java index 44902ed31d..11038e2610 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java @@ -6,7 +6,7 @@ import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_withlife") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java index e5df815e97..2d8a592d91 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java @@ -5,7 +5,7 @@ import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_with_ex") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java index eee062e946..ae91ad03c7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java @@ -6,7 +6,7 @@ import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_withlog") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index 20a1326b2b..7e416bd531 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java index 0655ac7812..22e21e00a3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java @@ -1,8 +1,8 @@ package org.tests.model.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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java index 8635706c4a..91bb9ae69a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java @@ -1,9 +1,9 @@ package org.tests.model.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; @Entity public class EDefaultProp { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java index 8449d7d926..31e9c24c7b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -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 java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java index 8c84ef4e5f..9af4fa94ec 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ENullCollectionDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java index 8a47cec81a..ee8534764e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EOptOneA extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java index 6b94d1ecc1..9f849a1968 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EOptOneB extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java index 15ac6809f1..f4f6513db5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EOptOneC extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java index a827bc5b4d..f9ad3cc1a0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ESimple { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java index 5db551231d..1530ffc950 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Currency; import java.util.Locale; import java.util.TimeZone; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java index 75cc12edba..8dc053dba8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java @@ -1,8 +1,8 @@ package org.tests.model.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; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java index 979a3ea28d..288bd8f401 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -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 java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java index 414828a981..72b7a359eb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class EVanillaCollectionDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java index 29a187be3d..7b72a709c5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java @@ -3,10 +3,10 @@ import io.ebean.types.Cidr; import io.ebean.types.Inet; -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 java.net.InetAddress; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java index 9f7dee4b6f..2c8c6fd1a9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java +++ b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -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; @Cache(readOnly = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java index 3f426696da..9fd059a8ec 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java index 4aaf5e2cac..c93fdb8d92 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "l2_cldf_reset_bean_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java index 0633e254fe..945ec1d197 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java index 8c88c06e98..1b3950f155 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -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 java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java index 3e6ebfaece..d0eadcd7e5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "non_updateprop") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java index a04fb62f3c..1fab0f8b09 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MProtectedConstructBean { diff --git a/ebean-test/src/test/java/org/tests/model/basic/MRole.java b/ebean-test/src/test/java/org/tests/model/basic/MRole.java index c66a1db607..8ce68ac0df 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MRole.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUser.java b/ebean-test/src/test/java/org/tests/model/basic/MUser.java index 7abf2ec605..0f45275b78 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUser.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUserType.java b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java index 9d147bceee..3dcf373e1d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUserType.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -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 = "muser_type") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java index 9b7b6b0839..84111f24bb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MnocRole { diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java index aa71e9497c..d75825808e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java index 7593dc6d07..9976f94874 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java index df731191e7..caf515c27e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java index 2534a6ebf3..b6261df26a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MyLobSizeJoinMany { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java index a4d8d65ee6..00bff96f04 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -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; /** * Not cached bean (copy of {@link OCachedBeanChild}} without {@link Cache} annotation diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java index abe945bb51..649a0c0072 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java index a2f99e85e0..8a67f8249d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -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; /** * Cached bean for testing caching implementation, especially relations. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java index 8ec1833796..b02aa68da7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java index 1ef25a2cae..7bb43c225f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java index ef6acaec8d..ed97d8cd80 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; /** * Cached entity for inheritance. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCar.java b/ebean-test/src/test/java/org/tests/model/basic/OCar.java index db0ebf12c2..17367e2f3c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCar.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCar.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OCar extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java index cb239a007f..74aebe6706 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java index 9f758cf212..7b4c55c20a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Order.java b/ebean-test/src/test/java/org/tests/model/basic/Order.java index dfb9f2aef5..1d97448687 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Order.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Order.java @@ -2,7 +2,7 @@ import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java index 364d94f2fe..8da916a41c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java index 3938372963..b7318d9680 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java index a587538a1b..9448671000 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/PFile.java b/ebean-test/src/test/java/org/tests/model/basic/PFile.java index ddac4e6c49..7652d1f2c5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PFile.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PFile.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class PFile extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java index eba148198d..76bf52c1cd 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; @Entity public class PFileContent extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java index 603cf43b48..ca2563ca5c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class PersistentFile extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java index dce5b6a1ef..34b89b18a9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; @Entity public class PersistentFileContent extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Person.java b/ebean-test/src/test/java/org/tests/model/basic/Person.java index 0d10d7df93..1d863ce715 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Person.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.List; @@ -11,7 +11,7 @@ public class Person implements Serializable { private static final long serialVersionUID = 495045977245770183L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Phone.java b/ebean-test/src/test/java/org/tests/model/basic/Phone.java index 736e748af2..32c660fd44 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Phone.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -11,7 +11,7 @@ public class Phone implements Serializable { private static final long serialVersionUID = -326610269092956952L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Product.java b/ebean-test/src/test/java/org/tests/model/basic/Product.java index b0fde6d073..df57dadd07 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Product.java @@ -2,10 +2,10 @@ import io.ebean.annotation.*; -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 javax.validation.constraints.Size; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Section.java b/ebean-test/src/test/java/org/tests/model/basic/Section.java index 0395411889..9856a09e55 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Section.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java index 26a5160421..e513fb55a6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; @Entity public class SomeEnumBean { diff --git a/ebean-test/src/test/java/org/tests/model/basic/SubSection.java b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java index b5e8888f28..d45f49ed3b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/SubSection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java index 80c0f8d363..07f614d658 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java index 9f084dc8dc..4e90897df9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java index e71c039982..4093264f57 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java index c20e06772d..d689cee104 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java @@ -3,8 +3,8 @@ import org.joda.time.LocalDate; import org.joda.time.LocalTime; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TJodaEntity { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java index 04a0543723..150b37c4ae 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -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 = "t_mapsuper1") diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java index 543958ed73..2a7373a180 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/basic/TOne.java b/ebean-test/src/test/java/org/tests/model/basic/TOne.java index 13ae7e7e29..09ac648454 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TOne.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * A basic entity to test simple things. diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java index 50667a7840..7c2b17939d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.Platform; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java index 6ef9960baf..2386261e16 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java index 53ce83a4b3..f02d1c6712 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java index a19c89c7db..c7a1d535e2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java @@ -1,13 +1,13 @@ package org.tests.model.basic; -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 javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TWithPreInsert implements TWithPreInsertCommon { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java index 5f679f9f61..95f4c1cea6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java index 674d0f8241..2b8963d99a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Formula; -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; import java.util.List; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/Trip.java b/ebean-test/src/test/java/org/tests/model/basic/Trip.java index 07cb5ad0a5..6b24fd7c6c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Trip.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Trip.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Truck.java b/ebean-test/src/test/java/org/tests/model/basic/Truck.java index c32d70777b..35785d85f8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Truck.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171bb..b766599c74 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java index 2d214ff75e..28305cb218 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -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; @Entity @Table(name = "ut_detail") diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java index 4c1b2998c6..f66526dbc1 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java @@ -3,7 +3,7 @@ import io.ebean.Model; import io.ebean.annotation.DbJsonB; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java index 6a97b4fed5..afdcf410d0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java index 1c9116065f..fe1b434bed 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java index cab8c4dde7..9ba8697048 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java index 00119e5ec0..c4b03be79b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d4..13b4ee34e3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f0..2f635062e8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5c..2b1df858ee 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java index 72fbc08cfd..30fb747bb9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java @@ -3,7 +3,7 @@ import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java index 1bb0a459b0..12783238b6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java index fcfb8479f3..d18724800a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Cache; import org.tests.model.basic.BasicDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @Cache(enableQueryCache = true) diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java index 548ee094cc..48b2ab9011 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Cache; import org.tests.model.basic.BasicDomain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java index 53d3685e82..1d6e957b4a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java index bed1d44abd..963c00a3f8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -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 javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java index 7c458bd12d..e8d565d280 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java @@ -2,9 +2,9 @@ import io.ebean.annotation.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 javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java index d570e1e4ad..72bfd3a586 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.SoftDelete; -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; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java index 08fb12bf77..7b5804be72 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class OCacheBase extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java index 4ee852d90e..ac63d82191 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.UniqueConstraint; @Cache(naturalKey = "appName") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java index d4a97b84de..baf35a3cac 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.UniqueConstraint; @Cache(naturalKey = {"app", "detail"}) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java index 5928181138..e8bba1e4a3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java @@ -2,9 +2,9 @@ import io.ebean.annotation.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; /** * Cached bean for testing caching implementation. diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java index 92cbde2eca..09aca6596d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java @@ -2,9 +2,9 @@ import io.ebean.annotation.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; /** * Cached bean for compound natural key. diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java index ac3eba8a9a..7dad96365b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.util.UUID; @Cache(naturalKey = "cid") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/First.java b/ebean-test/src/test/java/org/tests/model/basic/first/First.java index d6c96c825e..8e1e36bb2f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/First.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/First.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "f_first") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java index dd3ffd6240..b7c6ccd65f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.*; +import jakarta.persistence.*; @AttributeOverride(name = "name", column = @Column(name = "mod_name")) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java index 083c30f74e..2487835080 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java @@ -1,9 +1,9 @@ package org.tests.model.basic.first; -import javax.persistence.CascadeType; -import javax.persistence.JoinColumn; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; @MappedSuperclass public abstract class SuperSecond { diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java index c34292bbeb..0c22053566 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java @@ -1,7 +1,7 @@ package org.tests.model.basic.mapsuper; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MapSuperActual extends MapSuperNoId { diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java index d9781a5cb4..75fa06dac7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java @@ -2,8 +2,8 @@ import io.ebean.annotation.WhenCreated; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java index e49d35903b..4de72efeb2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ChangeLog; -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 java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java index a84ff7eb02..9744086718 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ChangeLog; -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 java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java index 249d137e41..530d3b1c2f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java @@ -3,8 +3,8 @@ import io.ebean.annotation.ChangeLog; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java index 9e2109f09f..a5635554eb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java @@ -3,8 +3,8 @@ import io.ebean.annotation.ChangeLog; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java index c405b9ed79..a3468b75e3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic.xtra; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "td_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java index bc398b70a4..b7039bb562 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java index 1f401072c3..4eb9655e7c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index 0412c5d753..e9951a7d31 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -7,7 +7,7 @@ import io.ebean.annotation.Transactional; import org.tests.model.basic.EBasicVer; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java index 32e5e3af81..fd0cc44121 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java index ad99b4a2d8..c26e4064b1 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSite.java b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java index 2023a8c4bc..036af85e56 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSite.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java @@ -1,8 +1,8 @@ package org.tests.model.bridge; -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.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java index f8eb5b2a32..d8d4b22b8d 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java index 9d4b37f1be..2d99c79313 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java index 99b3143b7b..2235787aa7 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java index 220990cade..36d1b627d6 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java index ceda123498..05ef197b0f 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java @@ -1,9 +1,9 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java index a6795de77f..ec196e0522 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java @@ -1,9 +1,9 @@ package org.tests.model.bridge; -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; @Entity @IdClass(BEmbId.class) diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BUser.java b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java index 7a87fe864e..9573f85b7a 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BUser.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java @@ -1,7 +1,7 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/cache/EColAB.java b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java index 763d70e6cc..50dbbdc955 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/EColAB.java +++ b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.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; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java index 07b3b9a915..9fc9c3e862 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Cache(enableQueryCache = true, enableBeanCache = true) diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java index d422eb5a48..0025e2782e 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java index 7da07463ba..b6fd4dcf91 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java index 886ea8d534..7f752081a4 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java @@ -1,6 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "sa_tire") diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java index 402f907888..6519db5728 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java @@ -1,6 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "sa_wheel") diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java index 3479c3a65e..8ef693d213 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java @@ -2,7 +2,7 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java index 746a2233be..3b1716a6e2 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java index d9f917421d..64d55b27cf 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java @@ -2,10 +2,10 @@ import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TTruckHolder { diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java index 1498b263a7..e53107abf2 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java @@ -1,8 +1,8 @@ package org.tests.model.carwheeltruck; -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.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java index 03a6f38dac..af2e93dc66 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java @@ -1,8 +1,8 @@ package org.tests.model.carwheeltruck; -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 TWheel { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java index d19b742dbe..2ea814a415 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CkeClient { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java index 4a897c1b60..480a38a96c 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java index 1c9de8ccc9..d457773748 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class CkeUser { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java index de55f7c1a6..08faf273af 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java index d44cf80521..be6109e190 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author rnentjes diff --git a/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java index a871d49aae..ae879544ee 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java index b5b48bcd9c..b59280abd6 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java index 3952899e21..a052406bdc 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.io.Serializable; diff --git a/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java b/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java index bcc21445f4..31bac0a102 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java +++ b/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java @@ -1,8 +1,8 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Entity public class FindControllerMain { diff --git a/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java b/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java index 41a2bd10e7..26e5863a08 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java +++ b/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java @@ -1,7 +1,7 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SoftRefA { diff --git a/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java b/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java index c7086096e5..da27e66e5e 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java +++ b/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java @@ -1,7 +1,7 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SoftRefB { diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java index 0caada2595..bb882913d9 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,7 +3,7 @@ import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Group.java b/ebean-test/src/test/java/org/tests/model/converstation/Group.java index eee84f8a7b..0bc0f845b9 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Group.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Group.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Message.java b/ebean-test/src/test/java/org/tests/model/converstation/Message.java index 51379a9403..45cda714e0 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Message.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Message.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -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 = "c_message") diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Participation.java b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java index dae00e2d50..a979ea9fac 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Participation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -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 = "c_participation") diff --git a/ebean-test/src/test/java/org/tests/model/converstation/User.java b/ebean-test/src/test/java/org/tests/model/converstation/User.java index f921fd85e5..6c0a2a2404 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/User.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/User.java @@ -4,9 +4,9 @@ import io.ebean.annotation.HistoryExclude; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java index fb40393c9a..5d64de0d54 100644 --- a/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java +++ b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java @@ -4,9 +4,9 @@ import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.AnEnumType; -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.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java index f1ce5936e7..a2842e1164 100644 --- a/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java +++ b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java @@ -3,8 +3,8 @@ import org.tests.model.ivo.Money; import org.tests.model.ivo.Oid; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class DPerson { diff --git a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java index 4deef720bf..2da96cdc6f 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DocStore; import org.tests.model.basic.Customer; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; /** diff --git a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java index 194fa83854..5482a6d6f7 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java @@ -3,8 +3,8 @@ import io.ebean.annotation.DocStore; import org.tests.model.basic.Product; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ManyToOne; @DocStore @DiscriminatorValue("PR") diff --git a/ebean-test/src/test/java/org/tests/model/docstore/Report.java b/ebean-test/src/test/java/org/tests/model/docstore/Report.java index 707a56bd84..d5dcaf8376 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/Report.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/Report.java @@ -2,8 +2,8 @@ import io.ebean.annotation.DocStore; -import javax.persistence.Inheritance; -import javax.persistence.OneToMany; +import jakarta.persistence.Inheritance; +import jakarta.persistence.OneToMany; import java.util.List; @DocStore diff --git a/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java index 5d44a2fb76..6ef36a15f0 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java @@ -5,9 +5,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java index 98b79cb680..4832d31125 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity @Draftable diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Doc.java b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java index e2c196644a..b0baa9573c 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Doc.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Draftable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Document.java b/ebean-test/src/test/java/org/tests/model/draftable/Document.java index 2652b22377..c16d144729 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Document.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Document.java @@ -5,10 +5,10 @@ import io.ebean.annotation.DraftOnly; import io.ebean.annotation.Draftable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java index f5cf0b0dda..63054b8010 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java @@ -2,8 +2,8 @@ import io.ebean.annotation.DraftableElement; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; /** * 'Owned' by @Draftable root. diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Link.java b/ebean-test/src/test/java/org/tests/model/draftable/Link.java index 547f3012bf..2a663ea976 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Link.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Link.java @@ -2,9 +2,9 @@ import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java index 2c1ca26c20..a08fce9d66 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java @@ -1,6 +1,6 @@ package org.tests.model.draftable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Organisation extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java index 96805eef78..81109a7267 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java @@ -1,9 +1,9 @@ package org.tests.model.elementcollection; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java index c41a7540a9..f49a82d4f7 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java index d65a134104..9838847e2b 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java index de38b9a11c..a9709b2450 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java @@ -1,9 +1,9 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EcTop { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java index 03b6cb0867..2880c8a00a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java index 7ce82c393d..ea9d3862c3 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java index b4e2b70d13..060c41eb42 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java index 2dad35c3ca..a4d0508b91 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java index d89cbc311d..8cd6661a76 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java index d6661f1e2e..eebaa3e643 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java index 6cf06f2828..9eec1fbe64 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java index 750512cc75..bddd013b03 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java index f9c319a039..6e98bc7d18 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java @@ -1,12 +1,12 @@ package org.tests.model.elementcollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EcsmParent { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java index 0f3cb85a16..6b474026f2 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java index 5dc697ddd1..cf194d7b7c 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java @@ -2,8 +2,8 @@ import org.tests.model.basic.Country; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class EAddr { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java index 4b737f0f55..99a689d017 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java @@ -3,10 +3,10 @@ import io.ebean.annotation.DbJson; import org.tests.model.json.PlainBean; -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; import java.util.Map; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java index 2542a066ba..dc69b52734 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java @@ -2,7 +2,7 @@ import io.ebean.annotation.NotNull; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java index c42510d678..fcff9d5c80 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "eemb_inner") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java index 2f6797c334..614d2547ae 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java index 98e3a17337..75571e97be 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java index edb13ac1bc..cb0cfb0afa 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java index b3d4ca3e3d..7d6e7e6e4d 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java @@ -1,9 +1,9 @@ package org.tests.model.embedded; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EPerAddr { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java index ef5e82a80f..ee6ad5d63e 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java index b532ceff66..3f0fa37f24 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson2 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java index 59e793384f..2604fadca8 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson3 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java index 574a557a6c..d7108f062f 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Eembeddable { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java b/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java index 09ff8312f5..0750888ce4 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbArray; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java index 912e95e87e..bb4e2e2e3b 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class PrimaryRevision { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java index dd624cabb8..637aab32d8 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RevisionId { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java index 341f0670eb..183643e706 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -3,8 +3,8 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java index b67046834b..80375f0e3e 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java index a0139709c3..2f9f718d4a 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class ChildPerson extends InheritablePerson { diff --git a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java index 621d818850..16ee7e8766 100644 --- a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java index 113e95bc09..a9ab1e796c 100644 --- a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java @@ -2,9 +2,9 @@ import org.tests.model.basic.EBasic; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java index 4f48c9d33b..8955af81d7 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/generated/MyPart.java b/ebean-test/src/test/java/org/tests/model/generated/MyPart.java index 5d9f2af8df..712d8d2201 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/MyPart.java +++ b/ebean-test/src/test/java/org/tests/model/generated/MyPart.java @@ -3,10 +3,10 @@ import io.ebean.annotation.DbPartition; import io.ebean.annotation.PartitionMode; -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.time.Instant; @DbPartition(mode = PartitionMode.MONTH, property = "eventTime") diff --git a/ebean-test/src/test/java/org/tests/model/generated/User.java b/ebean-test/src/test/java/org/tests/model/generated/User.java index be1336f440..ab0004a518 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/User.java +++ b/ebean-test/src/test/java/org/tests/model/generated/User.java @@ -1,6 +1,6 @@ package org.tests.model.generated; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Vilmos Nagy diff --git a/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java index a18dee6530..524c6151b6 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java +++ b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java @@ -5,7 +5,7 @@ import io.ebean.annotation.WhoCreated; import io.ebean.annotation.WhoModified; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; /** diff --git a/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java index da17e75577..c36d87365c 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java +++ b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.History; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java index 6754e8e526..eaa052a74b 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java +++ b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Length; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/history/HeDoc.java b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java index 35944a322f..7cfc28139e 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HeDoc.java +++ b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java @@ -2,8 +2,8 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/history/HeLink.java b/ebean-test/src/test/java/org/tests/model/history/HeLink.java index 8bc4e20110..d831d703d0 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HeLink.java +++ b/ebean-test/src/test/java/org/tests/model/history/HeLink.java @@ -5,9 +5,9 @@ import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -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 java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiDoc.java b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java index 4d68e02d48..7f87b71305 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiDoc.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java @@ -2,8 +2,8 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/history/HiLink.java b/ebean-test/src/test/java/org/tests/model/history/HiLink.java index 9d62ea2355..7970ed7d62 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiLink.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiLink.java @@ -3,8 +3,8 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTOne.java b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java index 36018af058..c5300af5d4 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTThree.java b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java index 2b7ae54732..a4d3b67bb3 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTThree.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java @@ -3,7 +3,7 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java index 18c2d299d7..6af3bc0837 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java index aabe3d1975..2159c1d570 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java @@ -1,9 +1,9 @@ package org.tests.model.history; import io.ebean.annotation.History; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.tests.model.draftable.BaseDomain; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java index f9053cb327..85054a0aa3 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java @@ -2,9 +2,9 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class HistorylessOneToOne extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java index c315110e0c..deb7ff058a 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java +++ b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java @@ -4,8 +4,8 @@ import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/history/HsdUser.java b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java index 377bcf4ee1..899765e918 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HsdUser.java +++ b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java @@ -4,10 +4,10 @@ import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -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; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java index ea26510399..831dbcb1c9 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java @@ -4,7 +4,7 @@ import io.ebean.Model; import io.ebean.annotation.JsonIgnore; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoContact.java b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java index bc742aeb63..f12c56731c 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoContact.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class InfoContact extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java index bf93c9c587..fddace0c71 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java @@ -3,7 +3,7 @@ import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class InfoCustomer extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java index b409840cdf..c03817e0f1 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java @@ -1,7 +1,7 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("photo") diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java index e2c052a494..83fdef809e 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java @@ -1,6 +1,6 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java index e9734b902b..2088ee72c8 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java @@ -1,8 +1,8 @@ package org.tests.model.inheritmany; -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 IMRelated { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java index f8d38fab51..2d86ddc904 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java index 1eb67687ef..c5ed5a2e03 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("ONE") diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java index e63891f67a..2a125ea94b 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java index 8bfb682e29..d20c079da4 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class MBase { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java index 95e3b97e8a..c01f7000b9 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java index 422e935582..dbefb0b736 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java index d0c561c656..be4f5b8ede 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java @@ -1,8 +1,8 @@ package org.tests.model.inheritmany; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class MProfile extends MBase { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Address.java b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java index 78bc0ba808..e39408094d 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Address.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java @@ -1,9 +1,9 @@ package org.tests.model.interfaces; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Address implements IAddress { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Person.java b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java index a977661297..e46c9d9fe1 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Person.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java index 015d8ada09..9d29730a83 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Persona implements IPersona { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java index 0950feaabf..3f6be3bc92 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java index 74ccfedabb..af0f2f61d5 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java @@ -1,7 +1,7 @@ package org.tests.model.ivo; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ESomeConvertType { diff --git a/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index bd39796517..18a440b1b3 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -2,7 +2,7 @@ import org.tests.model.ivo.Money; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.math.BigDecimal; /** diff --git a/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java index 66bb6db7a3..9039422f22 100644 --- a/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java +++ b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java @@ -7,9 +7,9 @@ import org.joda.time.LocalDateTime; import org.joda.time.Period; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BasicJodaEntity { diff --git a/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java b/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java index 052d91156c..8f2be28db4 100644 --- a/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("A") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/BankAccount.java b/ebean-test/src/test/java/org/tests/model/join/BankAccount.java index 491303be79..9d08c14806 100644 --- a/ebean-test/src/test/java/org/tests/model/join/BankAccount.java +++ b/ebean-test/src/test/java/org/tests/model/join/BankAccount.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("B") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java b/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java index c9336de179..4cda044d1e 100644 --- a/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("C") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccess.java b/ebean-test/src/test/java/org/tests/model/join/HAccess.java index d0d0608f10..5e047f6e58 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccess.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccount.java b/ebean-test/src/test/java/org/tests/model/join/HAccount.java index 2ca8964035..300cc2e426 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccount.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccount.java @@ -1,6 +1,6 @@ package org.tests.model.join; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/join/HCustomer.java b/ebean-test/src/test/java/org/tests/model/join/HCustomer.java index 9a5ba3a9d1..974d261771 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/join/HCustomer.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class HCustomer { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java index ec14bf1362..268cbb5cdf 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbMap; -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.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java index ee4617c0eb..418938447e 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonBString { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java index 6a84ff2f7e..a36c31dc7d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonB; -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.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java index 8e801113cc..9a0d5e3b2d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonB; -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.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java index 225939bb7a..b8cf1d378f 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.DbJson; -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 io.ebean.annotation.MutationDetection.NONE; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java index 885e85bf87..d62f1247b9 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJsonB; import io.ebean.annotation.DbJsonType; -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.util.*; import static io.ebean.annotation.MutationDetection.HASH; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java index 30e0f502f1..351265f617 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbJson; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java index f4df608884..1262082ad4 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -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.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java index 6d26bd130e..fa7329d0f3 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -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.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java index e220af18cd..db9781ecd6 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java index 744ca6af5c..400ca24924 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJsonB; -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.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java index 2b470ef45c..6da1f23287 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -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.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java index 7e294914db..d37950daf0 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.DbJson; -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 io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java index 97ce8bb81a..ee0d1dbeea 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNode { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java index 527dcdfd06..d197e119ce 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeBlob { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java index f8f8392dc2..97ca45ab7a 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeJsonB { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java index c8b2939e37..c6f50aaa84 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeVarchar { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java index 45af516dc3..de99274910 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonString { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java index 928f048be8..0eca81645d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java @@ -2,9 +2,9 @@ import io.ebean.annotation.UnmappedJson; -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.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java index 614758a1c9..adf2e42fbb 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java @@ -4,8 +4,8 @@ import io.ebean.annotation.DbArray; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.*; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java index 051b4a3446..bd5c323d01 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJson; -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 io.ebean.annotation.MutationDetection.NONE; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java index ff591d427c..ae4ab5bc71 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; /** * Class with @Cache and lazy load property. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java index 6a096113b1..3104c45706 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithcache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Parent class with ChildWithCache. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java index 521d3d52b6..a0ba851d35 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithcache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Parent class with ChildWithCache. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java index a51758b3f6..3cd130d597 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithid; -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 Looney { diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java index 65930791fa..a51be7478b 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java @@ -2,7 +2,7 @@ import io.ebean.common.BeanList; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java index fa078515b8..82043652f7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java @@ -2,10 +2,10 @@ import io.ebean.Model; -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; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DRol.java b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java index f4abd56a23..ffee165ab6 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DRol.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java @@ -2,10 +2,10 @@ import io.ebean.Model; -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; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DRot.java b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java index bb2629fac6..0f7032646d 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DRot.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java @@ -2,10 +2,10 @@ import io.ebean.Model; -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; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java index a8cd7d51bd..67070bae57 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java @@ -1,8 +1,8 @@ package org.tests.model.m2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MailBox { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java index 2f51929df2..6e600ce381 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java index d29c2d1b7e..925724e3b4 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java index d6a1c1bd7b..bf25a6460c 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Identity; import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java index b582a16b0f..42dee37a70 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Identity; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java index 28e7636a49..5d1b608617 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -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 @Index(unique = true, columnNames = { "from_id", "to_id" }) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java index fabb580403..6fbe29ba17 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java @@ -4,7 +4,7 @@ import io.ebean.annotation.Platform; import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Identity(start = 1000) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java index e4710130c8..fe58eb5cf0 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java index 2bf201542e..617a670d3b 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Role.java b/ebean-test/src/test/java/org/tests/model/m2m/Role.java index 1b32e7ef92..c16f2d8e9a 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Role.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Role.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java index 32db7e3529..904a81fca7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Addr.java b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java index 83e06d26bb..86a629fe47 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Addr.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java @@ -1,9 +1,9 @@ package org.tests.model.m2o; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Addr { diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java index bf9b5b2c7b..ddd4a0d0e6 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java @@ -1,6 +1,6 @@ package org.tests.model.m2o; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/map/MpRole.java b/ebean-test/src/test/java/org/tests/model/map/MpRole.java index d30c79a4bd..7f272137a5 100644 --- a/ebean-test/src/test/java/org/tests/model/map/MpRole.java +++ b/ebean-test/src/test/java/org/tests/model/map/MpRole.java @@ -1,7 +1,7 @@ package org.tests.model.map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MpRole { diff --git a/ebean-test/src/test/java/org/tests/model/map/MpUser.java b/ebean-test/src/test/java/org/tests/model/map/MpUser.java index 94edddb19e..aa5c1357de 100644 --- a/ebean-test/src/test/java/org/tests/model/map/MpUser.java +++ b/ebean-test/src/test/java/org/tests/model/map/MpUser.java @@ -1,6 +1,6 @@ package org.tests.model.map; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java index 1c865f073c..322105751e 100644 --- a/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java +++ b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java @@ -1,7 +1,7 @@ package org.tests.model.mappedsuper; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ASimpleBean extends NotEnhancedMappedSuper { diff --git a/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java index 5a6aaf114a..421fc80ac9 100644 --- a/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java +++ b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java @@ -1,7 +1,7 @@ package org.tests.model.mappedsuper; -import javax.persistence.MappedSuperclass; -//import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +//import jakarta.persistence.Transient; @MappedSuperclass public class NotEnhancedMappedSuper { diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java index 71116ea0df..599a8f819f 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Formula; import io.ebean.annotation.Index; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java index c6823500ba..a6b2411793 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java index 73371c7400..ef06ec7b66 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -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 java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java index dfc9832c5c..b29ac64e8a 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Platform; import io.ebean.annotation.SoftDelete; -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 java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java index aeda58f12a..bc1fd31160 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java index 66f85692c8..d5c5851e8c 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java index b43c344a58..70cee6afdb 100644 --- a/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java +++ b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java @@ -2,8 +2,8 @@ import io.ebean.annotation.WhenCreated; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/Account.java b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java index a6173400cb..e564e3ea43 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/Account.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java @@ -3,9 +3,9 @@ import io.ebean.Finder; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_account") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java index 22cc9fc8b8..1a174ebfb9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java @@ -2,8 +2,8 @@ import org.tests.model.basic.BasicDomain; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity public class OCompany extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java index 7a0b406aa4..225a55e0b4 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java @@ -2,10 +2,10 @@ import org.tests.model.basic.BasicDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class ORoadShowMsg extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java index fd0b0c58b1..3b1409fdcd 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java index ac00af5d12..45357ad75c 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -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; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java index 108c91a940..c4bdee7019 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.*; +import jakarta.persistence.*; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java index d9a6944765..b3e8b3a310 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoBMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java index 5126f3b2b4..eb72bab1b3 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java @@ -1,8 +1,8 @@ package org.tests.model.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; @Entity public class OtoChild { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java index f64a6a81ed..0e9a00472f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java index 49d6eb502c..89fd880012 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoCust { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java index 25bba8431a..5a69c8f9c5 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OtoCustAddress { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java index 516c5f9aba..e3fa41232a 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -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; @Entity public class OtoMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java index aa26d4ad5a..4620152d7b 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java index 5f137af726..59e2225448 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OtoNotification { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java index 3c1cbc1936..995ad6ed14 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoPrime { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java index b09cf22752..8f29f18978 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java index 2d60a7dfa2..cacbe07acc 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java @@ -3,10 +3,10 @@ import io.ebean.Finder; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OtoSdChild { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java index 6dea4f1462..cd8e0a5f78 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java @@ -2,7 +2,7 @@ import io.ebean.Finder; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoSdMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java index 4f8b8d7d65..1cc3159171 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OtoThMany extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java index 933a8d7897..ed915162c6 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java @@ -2,8 +2,8 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OtoThOne extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java index 099a7aca8f..8ee8b1149d 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java index 36d7104c2d..cfcb4bda40 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java index df14dee017..eb89a30be7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java index e4371304fa..620ab44ff9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java index edd72b0ae3..041fc05718 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -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.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java index 58a9b06a99..9048b1b5e0 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java @@ -2,10 +2,10 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user_model") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java index 9b21ba4406..2297b8a509 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java @@ -2,8 +2,8 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user_model_optional") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/User.java b/ebean-test/src/test/java/org/tests/model/onetoone/User.java index f367492857..b273f4f347 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/User.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/User.java @@ -3,9 +3,9 @@ import io.ebean.Finder; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java index 4445f8d3b6..6628346349 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java @@ -2,10 +2,10 @@ import io.ebean.Finder; -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; @Entity public class Album extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java index 3b316eb91e..95e26fe53f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java @@ -6,8 +6,8 @@ import io.ebean.annotation.WhenModified; import org.joda.time.DateTime; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class BaseModel extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java index bfbcfd0029..ecd24912d3 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java @@ -6,9 +6,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PreRemove; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PreRemove; @Entity public class Cover extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java index eef657be55..ad023f0d33 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java @@ -4,7 +4,7 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "calcd_data") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java index 00704eb27a..83fda8d6f7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "calcd_input") diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java index d131ed6d80..851d85c089 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java @@ -1,6 +1,6 @@ package org.tests.model.orderentity; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java index eb8543c64c..9fe853adbf 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java @@ -1,6 +1,6 @@ package org.tests.model.orderentity; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.math.BigDecimal; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java index 75790e26ac..c4b07d3cdd 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmBeanListChild extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java index 6a9cd478f5..1aacb79d66 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java @@ -2,13 +2,13 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmBeanListParent extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java index 5a22543a10..7086754b7e 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java @@ -1,9 +1,9 @@ package org.tests.model.orphanremoval; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java index 6fe3be4dd5..ce709fccbf 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java @@ -1,8 +1,8 @@ package org.tests.model.orphanremoval; -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 javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java index 96384d261c..630fdc7f84 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java index 9565a6a42b..5642729d05 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java index de541ec3ce..cbd9020bed 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MPrinter { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java index 3bef094f5e..05ac1b808a 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MPrinterState { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java index 5efcd73409..982004a1fa 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java @@ -1,7 +1,7 @@ package org.tests.model.prnt; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MSomeOther { diff --git a/ebean-test/src/test/java/org/tests/model/pview/Paggview.java b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java index cc317f7181..e253151593 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Paggview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java @@ -1,9 +1,9 @@ package org.tests.model.pview; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "paggview") diff --git a/ebean-test/src/test/java/org/tests/model/pview/Pview.java b/ebean-test/src/test/java/org/tests/model/pview/Pview.java index a985fb76ca..5545cf66ea 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Pview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Pview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/pview/Wview.java b/ebean-test/src/test/java/org/tests/model/pview/Wview.java index 10f8b62378..59d4bdf2a0 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Wview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Wview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java index 35a4449963..ee8a0dafce 100644 --- a/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java +++ b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java index 80cbd64c84..ba49af4588 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java @@ -1,8 +1,8 @@ package org.tests.model.selfref; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java index 2efff0071b..8c2022887d 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java index 7999dcb80f..a9e7674085 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java index f29430aed2..619c0d403d 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "self_ref_customer") diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java index 2e054e5ad6..08eef4990b 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index 256fe56343..1ed17e9234 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -5,7 +5,7 @@ import io.ebean.Query; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/site/DataContainer.java b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java index 47c91a6e19..040d4b728a 100644 --- a/ebean-test/src/test/java/org/tests/model/site/DataContainer.java +++ b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java @@ -1,7 +1,7 @@ package org.tests.model.site; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/Site.java b/ebean-test/src/test/java/org/tests/model/site/Site.java index 1b950f821c..eaf05e05a9 100644 --- a/ebean-test/src/test/java/org/tests/model/site/Site.java +++ b/ebean-test/src/test/java/org/tests/model/site/Site.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java index 179706233d..d7767f65bc 100644 --- a/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java +++ b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java @@ -1,7 +1,7 @@ package org.tests.model.site; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java index fb08f91744..5ec01a4c89 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java +++ b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java @@ -2,13 +2,13 @@ import io.ebean.Model; -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; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TreeEntity extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java index 0ca927b7b1..e637ff4003 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java index 6c1670f1d6..4c918b3441 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class EBasicNoSDChild { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java index f70f9c491e..ddabcee36f 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java @@ -1,7 +1,7 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EBasicSDChild extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java index 78d9ae6eef..7b5d42e231 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java index 1c50b91dcc..cd8de963a1 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java index bdc49070a6..4632ca9cc5 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ESoftDelDown extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java index af19536f4b..ed6208e630 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java index 6de6824292..a51133cb72 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java @@ -2,7 +2,7 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ESoftDelOneA { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java index b89192b31b..c9982fb38f 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class ESoftDelOneB { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java index 3b90c42407..b056a3b6ea 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java index 31e36afe89..493ee11038 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java index c7b14cc462..eae7d82353 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ESoftDelUp extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java index bcac7764a1..84b357c8f8 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java index 8b9ce71e7d..ad3827f0a1 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java @@ -2,10 +2,10 @@ import io.ebean.annotation.SoftDelete; -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 java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java index 608343d56b..dc23490ca7 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java @@ -2,10 +2,10 @@ import io.ebean.annotation.SoftDelete; -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; @Entity public class ESoftDelY { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java index 5ce11c1751..fe0365f3f1 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java @@ -2,8 +2,8 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java index ec96fa3e9b..604732292c 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java @@ -1,7 +1,7 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EsdDetail extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java index 29632338b8..36bb2b1a47 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java @@ -1,10 +1,10 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EsdMaster extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Category.java b/ebean-test/src/test/java/org/tests/model/survey/Category.java index 9cbeca792a..e6f07d66c1 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Category.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Category.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/survey/Group.java b/ebean-test/src/test/java/org/tests/model/survey/Group.java index 5b1fb9e999..8c60ef6ed5 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Group.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Group.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/survey/Question.java b/ebean-test/src/test/java/org/tests/model/survey/Question.java index 1f5c9d081b..fcc73cefd4 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Question.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Question.java @@ -1,9 +1,9 @@ package org.tests.model.survey; -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 Question { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Survey.java b/ebean-test/src/test/java/org/tests/model/survey/Survey.java index 328dd2ab27..626e0e5b31 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Survey.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Survey.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java index 04721196e5..253ef06ff9 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java @@ -1,9 +1,9 @@ package org.tests.model.tevent; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class TEvent { diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java index 6e34922297..c68e683219 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java @@ -1,9 +1,9 @@ package org.tests.model.tevent; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java index bcbad8ef2e..286ad84e2f 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java index 4b2cc1f5b9..eb5f8543bd 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java @@ -1,9 +1,9 @@ package org.tests.model.types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; import java.io.File; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java index 1a0fee0bf0..baac0af7f8 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java @@ -1,9 +1,9 @@ package org.tests.model.types; -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 java.nio.file.Path; import java.sql.Date; import java.time.*; diff --git a/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java index 678e0321c8..ce29e9af9f 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java @@ -1,8 +1,8 @@ package org.tests.model.types; -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.time.MonthDay; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java index dd28ae1845..ac5f4f3625 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java @@ -4,7 +4,7 @@ import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java index 152ba6212a..c0bddb2704 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java @@ -4,9 +4,9 @@ import io.ebean.Model; import io.ebean.annotation.SoftDelete; -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.io.Serializable; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java index 7f8332c6f2..495b88571a 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java @@ -4,10 +4,10 @@ import io.ebean.Model; import io.ebean.annotation.SoftDelete; -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 java.io.Serializable; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java index 26223b8012..41e52d89ff 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java index fdcce67824..e96ab10bc0 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionToy.java b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java index b7491ecb3c..cb4a2ef11b 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionToy.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java @@ -1,9 +1,9 @@ package org.tests.model.version; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class VersionToy { diff --git a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java index 1700e0f2d7..12fea41af2 100644 --- a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java +++ b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java @@ -4,7 +4,7 @@ import io.ebean.annotation.View; import org.tests.model.basic.Order; -import javax.persistence.*; +import jakarta.persistence.*; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java index 3f961f85ed..3ef3e757fb 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class WithZero { diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java index c6ea438216..247be873af 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OMVertex.java b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java index 95d57d1335..643ca97cb6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OMVertex.java +++ b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java @@ -1,9 +1,9 @@ package org.tests.o2m; -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 java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java index 95ec6d1012..231906f2fd 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java +++ b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java @@ -1,7 +1,7 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java index 8c6c908b69..e301781f9c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java @@ -1,8 +1,8 @@ package org.tests.o2m; -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 OmAccountChildDBO { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java index b2aa63d003..24d4bd6d02 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java @@ -2,12 +2,12 @@ import io.ebean.Model; -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 java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmAccountDBO extends Model { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java index b94ca0a66d..f40dcba43a 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java @@ -1,9 +1,9 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmBasicChild { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java index 76f23c86ad..6fbb944560 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java @@ -2,13 +2,13 @@ import io.ebean.annotation.Where; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmBasicParent { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java index 4116954281..a281cbb8a1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java @@ -1,6 +1,6 @@ package org.tests.o2m.dm; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Attachment extends HistoryColumns { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java index 28482c8050..70d3a8ba79 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java @@ -1,6 +1,6 @@ package org.tests.o2m.dm; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java b/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java index 31d8f127e0..77ade92bf2 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java @@ -2,10 +2,10 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class HistoryColumns extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java index 6b71ab2382..4dc015cc39 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java @@ -2,7 +2,7 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class PersonEntity extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java index 1cb1bfa1a1..7001f70989 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java @@ -2,10 +2,10 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java index 325d0b8119..6aa5116e75 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class WorkflowOperationEntity extends HistoryColumns { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java index eda26cf3dd..8240cb659f 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java @@ -1,9 +1,9 @@ package org.tests.o2m.jointable; -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; @Entity @Table(name="monkey") diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java index 4e335aa0c3..336f8e78ad 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java index 5782c220fe..5f44e6b5e1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java index db64e6be2e..f52ecfd4bc 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java index 14644d2003..d05c1aac18 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ClassA extends ClassSuper { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java index 305b33999b..da4008ed0c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ClassB extends ClassSuper { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java index 2b62d81bfe..94ed3eb67c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java @@ -2,7 +2,7 @@ import org.tests.o2m.jointable.JtMonkey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java index b5b18eb6d7..2301dac7d1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java index 7d2e40a42c..eb6de80a81 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java @@ -1,9 +1,9 @@ package org.tests.o2m.lazy; -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; @Entity @Table(name = "oml_baz") diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java index c460d5d508..1cf44412e6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java index a08a0a58fd..7b0d40f880 100644 --- a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java +++ b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java @@ -1,6 +1,6 @@ package org.tests.o2m.recurse; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java index aa77c3e738..6d789d5d68 100644 --- a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java +++ b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class RMItemHolder extends Model { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java index 6be6928fd1..693084324f 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java @@ -1,10 +1,10 @@ package org.tests.o2o; -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; @Entity public class OtoLevelA { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java index 5f7899cbf2..fbb1fa6f13 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java @@ -1,9 +1,9 @@ package org.tests.o2o; -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; @Entity public class OtoLevelB { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java index b5caa688e6..bbbe2b2cb5 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java @@ -1,7 +1,7 @@ package org.tests.o2o; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OtoLevelC { diff --git a/ebean-test/src/test/java/org/tests/order/OrderMaster.java b/ebean-test/src/test/java/org/tests/order/OrderMaster.java index 71a6978a9b..976ccf0b8c 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderMaster.java +++ b/ebean-test/src/test/java/org/tests/order/OrderMaster.java @@ -1,9 +1,9 @@ package org.tests.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java index 4e1751cab1..caea178fa4 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java @@ -1,6 +1,6 @@ package org.tests.order; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java index 19ea3481c4..e20aa6e85f 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/order/OrderToy.java b/ebean-test/src/test/java/org/tests/order/OrderToy.java index a305b47c93..6c226fdfd2 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderToy.java +++ b/ebean-test/src/test/java/org/tests/order/OrderToy.java @@ -1,8 +1,8 @@ package org.tests.order; -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 OrderToy { diff --git a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java index 2557d17822..6a1ac7c852 100644 --- a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java index 59307d83cc..cd6bce0657 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -15,7 +15,7 @@ import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 6297765774..4b9cba7196 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -10,7 +10,7 @@ import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/ebean-test/src/test/java/org/tests/query/cache/Acl.java b/ebean-test/src/test/java/org/tests/query/cache/Acl.java index 0594164fc8..07c1bcf648 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Acl.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Acl.java @@ -1,8 +1,8 @@ package org.tests.query.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; @Entity public class Acl { diff --git a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java index 53d8f95e86..a8ba08dde1 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java +++ b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/query/cache/Contract.java b/ebean-test/src/test/java/org/tests/query/cache/Contract.java index 71cfcb727e..f43eb70e99 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Contract.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Contract.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java index 409715391f..9050d49aa1 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java +++ b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java @@ -1,9 +1,9 @@ package org.tests.query.cache; -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 javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/query/cache/Position.java b/ebean-test/src/test/java/org/tests/query/cache/Position.java index 288582d0d4..700f605293 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Position.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Position.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_position") diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index 31260a3a6e..5e57a7e4c9 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.UUID; import java.util.concurrent.ExecutionException; diff --git a/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java index 50ca71d5d7..f8ccd25aa5 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java +++ b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java index bbff6f0d3f..eaa2c90e8c 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java +++ b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java b/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java index a119896e8b..436319732a 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java +++ b/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java @@ -1,6 +1,6 @@ package org.tests.rawsql.transport; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/M2MDepart.java b/ebean-test/src/test/java/org/tests/sets/M2MDepart.java index bf945f7516..54eef165aa 100644 --- a/ebean-test/src/test/java/org/tests/sets/M2MDepart.java +++ b/ebean-test/src/test/java/org/tests/sets/M2MDepart.java @@ -1,8 +1,8 @@ package org.tests.sets; -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 java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/M2MEmp.java b/ebean-test/src/test/java/org/tests/sets/M2MEmp.java index fa70d8818a..08226f4ace 100644 --- a/ebean-test/src/test/java/org/tests/sets/M2MEmp.java +++ b/ebean-test/src/test/java/org/tests/sets/M2MEmp.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Objects; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/sets/MapDepart.java b/ebean-test/src/test/java/org/tests/sets/MapDepart.java index 562b58cdad..a8a4494e7f 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapDepart.java +++ b/ebean-test/src/test/java/org/tests/sets/MapDepart.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/MapDepart2.java b/ebean-test/src/test/java/org/tests/sets/MapDepart2.java index d542683d53..30c0fe377b 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapDepart2.java +++ b/ebean-test/src/test/java/org/tests/sets/MapDepart2.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/sets/MapEmp.java b/ebean-test/src/test/java/org/tests/sets/MapEmp.java index 1e972f9d6d..771f27b302 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapEmp.java +++ b/ebean-test/src/test/java/org/tests/sets/MapEmp.java @@ -1,8 +1,8 @@ package org.tests.sets; -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.util.Objects; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/MapEmp2.java b/ebean-test/src/test/java/org/tests/sets/MapEmp2.java index 4f33036c30..3b995b1c25 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapEmp2.java +++ b/ebean-test/src/test/java/org/tests/sets/MapEmp2.java @@ -1,8 +1,8 @@ package org.tests.sets; -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 MapEmp2 { diff --git a/ebean-test/src/test/java/org/tests/sets/O2MDepart.java b/ebean-test/src/test/java/org/tests/sets/O2MDepart.java index a2272e4f90..aa3ab94d41 100644 --- a/ebean-test/src/test/java/org/tests/sets/O2MDepart.java +++ b/ebean-test/src/test/java/org/tests/sets/O2MDepart.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/sets/O2MEmp.java b/ebean-test/src/test/java/org/tests/sets/O2MEmp.java index 971e2e26df..af72f1e629 100644 --- a/ebean-test/src/test/java/org/tests/sets/O2MEmp.java +++ b/ebean-test/src/test/java/org/tests/sets/O2MEmp.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Objects; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java index 694246b5b6..1582f4b8f4 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java index 553a77852b..f21f0fe224 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("EXT") diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java index b79e599505..63443db325 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java index f0f820ded2..8ee4c52254 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java index 26599cf733..b7248bf1cb 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("EXT") diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java index eb558952b9..6072f13b35 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("INT") diff --git a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java index a45108d280..3949426e23 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java +++ b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java @@ -1,6 +1,6 @@ package org.tests.sp.model; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java index 415dcecba2..8f3ef6fe9b 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java @@ -2,7 +2,7 @@ import org.tests.sp.model.IdEntity; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Door.java b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java index db8576e65c..463cad68c9 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Door.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java @@ -2,8 +2,8 @@ import org.tests.sp.model.IdEntity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "sp_car_door") diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java index 46d8ad41f9..1f7699ff5a 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java @@ -2,8 +2,8 @@ import org.tests.sp.model.IdEntity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "sp_car_wheel") diff --git a/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java b/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java index 4a2d303137..d934c9b8cb 100644 --- a/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java +++ b/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java @@ -1,8 +1,8 @@ package org.tests.timezone; import javax.annotation.Nullable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.time.LocalTime; @Entity diff --git a/ebean-test/src/test/java/org/tests/timezone/TzBean.java b/ebean-test/src/test/java/org/tests/timezone/TzBean.java index e760b5789d..e57120451c 100644 --- a/ebean-test/src/test/java/org/tests/timezone/TzBean.java +++ b/ebean-test/src/test/java/org/tests/timezone/TzBean.java @@ -1,9 +1,9 @@ package org.tests.timezone; -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.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index cdcf7bbdc9..f15da28af2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -10,7 +10,7 @@ import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index 74e4803403..aef2254a29 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -6,7 +6,7 @@ import io.ebean.annotation.TxIsolation; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import static org.assertj.core.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNested.java b/ebean-test/src/test/java/org/tests/transaction/TestNested.java index c346880830..7987698317 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNested.java @@ -4,7 +4,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.concurrent.Callable; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java index 4edd37ae91..2717cbc036 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -6,7 +6,7 @@ import io.ebean.TransactionCallbackAdapter; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java index 3ae5e80d2f..cbc86d998b 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -9,7 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index d497abbb1c..06366bf087 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -6,10 +6,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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 java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java index 904ae23509..9282e810ee 100644 --- a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java +++ b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index f078d2b9d8..721446c754 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -10,7 +10,7 @@ import org.tests.model.basic.xtra.DummyDao; import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/update/EPersonOnline.java b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java index 2322266520..f9d77ff269 100644 --- a/ebean-test/src/test/java/org/tests/update/EPersonOnline.java +++ b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Index; import io.ebean.annotation.WhenModified; -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 javax.validation.constraints.Size; import java.time.Instant; diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index 36dab37d0e..df45afd86c 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -11,7 +11,7 @@ import org.tests.model.basic.EBasic.Status; import org.tests.model.basic.ResetBasicData; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; @@ -100,7 +100,7 @@ public void delete_NoRowsDeleted_expect_false() { /** * I am expecting that Ebean detects there aren't any changes and don't execute any query. - * Currently a {@link javax.persistence.PersistenceException} with message 'Invalid value "null" for parameter "SQL"' is thrown. + * Currently a {@link jakarta.persistence.PersistenceException} with message 'Invalid value "null" for parameter "SQL"' is thrown. */ @Test public void testWithoutChangesAndIgnoreNullValues() { diff --git a/ebean-test/src/test/java/org/tests/update/objects/Child.java b/ebean-test/src/test/java/org/tests/update/objects/Child.java index 87166bfda2..1b4ef1049d 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Child.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Child.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_d") diff --git a/ebean-test/src/test/java/org/tests/update/objects/Parent.java b/ebean-test/src/test/java/org/tests/update/objects/Parent.java index 6a582a9812..1e7d9c4345 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Parent.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Parent.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_c") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java index 71fb728167..fb06607cbb 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_a") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java index cbd32a7fb9..bf28b7abf9 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_b") diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index 3299802d5c..d1e5362215 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -6,12 +6,12 @@ interface Constants { String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")"; String GENERATED = "io.ebean.typequery.Generated"; - String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass"; - String DISCRIMINATOR_VALUE = "javax.persistence.DiscriminatorValue"; - String INHERITANCE = "javax.persistence.Inheritance"; - String ENTITY = "javax.persistence.Entity"; - String EMBEDDABLE = "javax.persistence.Embeddable"; - String CONVERTER = "javax.persistence.Converter"; + String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; + String DISCRIMINATOR_VALUE = "jakarta.persistence.DiscriminatorValue"; + String INHERITANCE = "jakarta.persistence.Inheritance"; + String ENTITY = "jakarta.persistence.Entity"; + String EMBEDDABLE = "jakarta.persistence.Embeddable"; + String CONVERTER = "jakarta.persistence.Converter"; String EBEAN_COMPONENT = "io.ebean.annotation.EbeanComponent"; String DBARRAY = "io.ebean.annotation.DbArray"; diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 8e5439deab..e946197158 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -200,7 +200,7 @@ private boolean isStaticOrTransient(VariableElement field) { return ( modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT) || - hasAnnotations(field, "javax.persistence.Transient") + hasAnnotations(field, "jakarta.persistence.Transient") ); } diff --git a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java index 6f8bc9f095..cd28bccab5 100644 --- a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java +++ b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java @@ -6,7 +6,7 @@ import io.ebean.platform.cockroach.CockroachPlatform; import io.ebean.platform.yugabyte.YugabytePlatform; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.*; import java.util.Locale; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index 5b152eb4a0..58412960a0 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -7,12 +7,12 @@ interface Constants { String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")"; String GENERATED = "io.ebean.typequery.Generated"; - String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass"; - String DISCRIMINATOR_VALUE = "javax.persistence.DiscriminatorValue"; - String INHERITANCE = "javax.persistence.Inheritance"; - String ENTITY = "javax.persistence.Entity"; - String EMBEDDABLE = "javax.persistence.Embeddable"; - String CONVERTER = "javax.persistence.Converter"; + String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; + String DISCRIMINATOR_VALUE = "jakarta.persistence.DiscriminatorValue"; + String INHERITANCE = "jakarta.persistence.Inheritance"; + String ENTITY = "jakarta.persistence.Entity"; + String EMBEDDABLE = "jakarta.persistence.Embeddable"; + String CONVERTER = "jakarta.persistence.Converter"; String EBEAN_COMPONENT = "io.ebean.annotation.EbeanComponent"; String DBARRAY = "io.ebean.annotation.DbArray"; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 631eb4d3f8..e1bedcd1db 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -157,7 +157,7 @@ private boolean isStaticOrTransient(VariableElement field) { return ( modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT) || - hasAnnotations(field, "javax.persistence.Transient") + hasAnnotations(field, "jakarta.persistence.Transient") ); } diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 0d7eb9e7c0..97dc354afb 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -52,7 +52,7 @@ io.ebean querybean-generator - 13.16.0 + 13.22.0 diff --git a/tests/test-java16/src/main/java/org/example/records/Address.java b/tests/test-java16/src/main/java/org/example/records/Address.java index 2ac5314021..8d46b4bb17 100644 --- a/tests/test-java16/src/main/java/org/example/records/Address.java +++ b/tests/test-java16/src/main/java/org/example/records/Address.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record Address (String line1, String line2, String city) { diff --git a/tests/test-java16/src/main/java/org/example/records/BaseModel.java b/tests/test-java16/src/main/java/org/example/records/BaseModel.java index a2698576ca..d04e6705d9 100644 --- a/tests/test-java16/src/main/java/org/example/records/BaseModel.java +++ b/tests/test-java16/src/main/java/org/example/records/BaseModel.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.Identity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @Identity(start = 1000, cache = 100) @MappedSuperclass diff --git a/tests/test-java16/src/main/java/org/example/records/Contact.java b/tests/test-java16/src/main/java/org/example/records/Contact.java index 4b054511fe..044da173bc 100644 --- a/tests/test-java16/src/main/java/org/example/records/Contact.java +++ b/tests/test-java16/src/main/java/org/example/records/Contact.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class Contact extends Model { diff --git a/tests/test-java16/src/main/java/org/example/records/Course.java b/tests/test-java16/src/main/java/org/example/records/Course.java index e3798c02c0..d9aa30e267 100644 --- a/tests/test-java16/src/main/java/org/example/records/Course.java +++ b/tests/test-java16/src/main/java/org/example/records/Course.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Length; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.util.HashMap; import java.util.Map; diff --git a/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java index dc95a87235..d1639d901e 100644 --- a/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java +++ b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Identity(start = 1000) @Entity diff --git a/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java index d3436db7b9..4b48ccce0b 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record CustomAccessors(String line1, String line2, String city) { diff --git a/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java index 964821c69d..7a3c3a96c8 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/tests/test-java16/src/main/java/org/example/records/CustomEquals.java b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java index 1883a708c8..e528e5da9a 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomEquals.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java @@ -2,7 +2,7 @@ import io.avaje.lang.NonNullApi; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @NonNullApi diff --git a/tests/test-java16/src/main/java/org/example/records/CustomToString.java b/tests/test-java16/src/main/java/org/example/records/CustomToString.java index 8712fa38aa..eebbb610e0 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomToString.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomToString.java @@ -2,7 +2,7 @@ import io.avaje.lang.NonNullApi; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @NonNullApi @Embeddable diff --git a/tests/test-java16/src/main/java/org/example/records/UserRole.java b/tests/test-java16/src/main/java/org/example/records/UserRole.java index 1d25f6e976..8c05a19e6c 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserRole.java +++ b/tests/test-java16/src/main/java/org/example/records/UserRole.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity public class UserRole extends Model { diff --git a/tests/test-java16/src/main/java/org/example/records/UserRoleId.java b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java index a0807de0a9..0b27543eaa 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserRoleId.java +++ b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record UserRoleId(Integer userId, String roleId) { diff --git a/tests/test-java16/src/main/java/org/example/records/UserSite.java b/tests/test-java16/src/main/java/org/example/records/UserSite.java index fb881c32e9..536709b23f 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserSite.java +++ b/tests/test-java16/src/main/java/org/example/records/UserSite.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @IdClass(UserSiteId.class) diff --git a/tests/test-java16/src/main/java/org/example/records/UserSiteId.java b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java index 36c4dd599c..c43e452d2d 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserSiteId.java +++ b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.UUID; @Embeddable diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt index c70290d630..6629ef6ad6 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import org.example.otherpackage.GenericType; diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt index 44789893f7..b50b8dfc0e 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt @@ -2,9 +2,9 @@ package org.example.domain; import java.time.Instant; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import io.ebean.Model; import io.ebean.annotation.WhenCreated; diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt index b96fd987c9..c50b3c6005 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt @@ -1,6 +1,6 @@ package org.example.domain -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "t_inner") diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt index a24154449c..0accb25462 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class GenericTypeAttributeConverter : AttributeConverter, String> { diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt index 55981a0a87..f6173c64b0 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class PhoneAttributeConverter : AttributeConverter { diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt index 690978ce33..7b0594a593 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class ValidEmailAttributeConverter : AttributeConverter { diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt index 514739a392..bd3348f7a9 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt @@ -1,8 +1,8 @@ package org.example.order -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.example.api.ICustomer @Entity diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt index a5e87f9d9c..1c846069c1 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt @@ -1,12 +1,12 @@ package org.example.order -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.persistence.Version +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.persistence.Version @Entity @Table(name = "t_order") diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt index 6a7e123ecf..7d5a9c9bfb 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt @@ -1,9 +1,9 @@ package org.example.order 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 @Entity class OrderItem( From 004f4deae3469bcecbef7aa2b66276272992a7a1 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 18 Sep 2023 14:59:17 +0200 Subject: [PATCH 107/240] Regression of #3133 with formula properties --- .../dmlbind/MatchedImportedFactory.java | 2 +- .../model/composite/DataWithFormula.java | 65 +++++++++++++++++++ .../model/composite/DataWithFormulaKey.java | 59 +++++++++++++++++ .../model/composite/DataWithFormulaMain.java | 44 +++++++++++++ .../model/composite/TestDataWithFormula.java | 43 ++++++++++++ 5 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java create mode 100644 ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java create mode 100644 ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java create mode 100644 ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java index 99e6380433..8715621076 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java @@ -41,7 +41,7 @@ private static MatchedImportedProperty findMatch(BeanProperty prop, BeanDescript } // match on property name for (BeanProperty beanProperty : desc.propertiesBaseScalar()) { - if (prop.name().equals(beanProperty.name())) { + if (!beanProperty.isFormula() && prop.name().equals(beanProperty.name())) { return new MatchedImportedScalar(prop, beanProperty); } } diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java new file mode 100644 index 0000000000..e3f5c1ae87 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java @@ -0,0 +1,65 @@ +package org.tests.model.composite; + + +import io.ebean.annotation.Formula; +import io.ebean.annotation.Index; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; + +@Entity + +public class DataWithFormula { + + private static final long serialVersionUID = 1L; + + @EmbeddedId + private DataWithFormulaKey id; + + + @Formula(select = "${ta}.meta_key") + private String metaKey; + + @Formula(select = "${ta}.value_index") + private Integer valueIndex; + + @ManyToOne + @JoinColumn(name = "main_id", insertable = false, nullable = false) + private DataWithFormulaMain main; + + @Index + private String stringValue; + + public DataWithFormulaKey getId() { + return id; + } + + public void setId(DataWithFormulaKey id) { + this.id = id; + } + + public String getMetaKey() { + return metaKey; + } + + public void setMetaKey(String metaKey) { + this.metaKey = metaKey; + } + + public Integer getValueIndex() { + return valueIndex; + } + + public void setValueIndex(Integer valueIndex) { + this.valueIndex = valueIndex; + } + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(String stringValue) { + this.stringValue = stringValue; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java new file mode 100644 index 0000000000..1d2d55c732 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java @@ -0,0 +1,59 @@ +package org.tests.model.composite; + +import io.ebean.annotation.NotNull; +import jakarta.persistence.Embeddable; + +import java.util.Objects; +import java.util.UUID; + +@Embeddable +public class DataWithFormulaKey { + + private static final long serialVersionUID = 1L; + + @NotNull + private UUID mainId; + + @NotNull + private String metaKey = ""; + + @NotNull + private Integer valueIndex = 0; + + public UUID getMainId() { + return mainId; + } + + public void setMainId(UUID mainId) { + this.mainId = mainId; + } + + public String getMetaKey() { + return metaKey; + } + + public void setMetaKey(String metaKey) { + this.metaKey = metaKey; + } + + public Integer getValueIndex() { + return valueIndex; + } + + public void setValueIndex(Integer valueIndex) { + this.valueIndex = valueIndex; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + DataWithFormulaKey that = (DataWithFormulaKey) o; + return Objects.equals(mainId, that.mainId) && Objects.equals(metaKey, that.metaKey) && Objects.equals(valueIndex, that.valueIndex); + } + + @Override + public int hashCode() { + return Objects.hash(mainId, metaKey, valueIndex); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java new file mode 100644 index 0000000000..e527ab9717 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java @@ -0,0 +1,44 @@ +package org.tests.model.composite; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; + +import java.util.List; +import java.util.UUID; + +@Entity +public class DataWithFormulaMain { + @Id + private UUID id; + + private String title; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "main") + private List metaData; + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public List getMetaData() { + return metaData; + } + + public void setMetaData(List metaData) { + this.metaData = metaData; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java new file mode 100644 index 0000000000..0f9e01b67f --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java @@ -0,0 +1,43 @@ +package org.tests.model.composite; + +import io.ebean.DB; +import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + + +public class TestDataWithFormula extends BaseTestCase { + + @Test + public void test1() { + + + DataWithFormulaMain main = new DataWithFormulaMain(); + main.setId(UUID.randomUUID()); + main.setTitle("Main"); + + DataWithFormulaKey key = new DataWithFormulaKey(); + key.setMainId(main.getId()); + key.setMetaKey("meta"); + key.setValueIndex(42); + DataWithFormula data = new DataWithFormula(); + data.setId(key); + data.setStringValue("SomeValue"); + main.setMetaData(List.of(data)); + + LoggedSql.start(); + DB.save(main); + List sqls = LoggedSql.stop(); + + assertThat(sqls).hasSize(3); + assertThat(sqls.get(0)).contains("insert into data_with_formula_main (id, title) values (?,?);"); // main + assertThat(sqls.get(1)).contains("insert into data_with_formula (main_id, meta_key, value_index, string_value) values (?,?,?,?)"); // main + assertThat(sqls.get(2)).contains("-- bind"); + + } +} From 6d2038355f8643ad7facd78049a5039834a564e3 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 18 Sep 2023 10:50:50 +0200 Subject: [PATCH 108/240] use glassfish jaxb instead of old com.sun jaxb --- ebean-ddl-generator/pom.xml | 6 +++--- ebean-test/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 0bf3e19390..a6158b8c66 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -54,9 +54,9 @@ 4.0.0 - com.sun.xml.bind - jaxb-impl - 4.0.0 + org.glassfish.jaxb + jaxb-runtime + 4.0.3 runtime diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 6eb14a3990..7b4bfc5715 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -91,9 +91,9 @@ 4.0.0 - com.sun.xml.bind - jaxb-impl - 4.0.0 + org.glassfish.jaxb + jaxb-runtime + 4.0.3 runtime From 0b0b7cbc67c9686a9c85fc6258225fdd03cc30fd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 19 Sep 2023 22:47:23 +1200 Subject: [PATCH 109/240] Follow up #3223 - tidy test only Make Embedded Id bean more immutable via final fields and constructor --- .../model/composite/DataWithFormula.java | 4 --- .../model/composite/DataWithFormulaKey.java | 26 +++++++------------ .../model/composite/DataWithFormulaMain.java | 1 + .../model/composite/TestDataWithFormula.java | 10 +++---- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java index e3f5c1ae87..57e11b5a33 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java @@ -9,15 +9,11 @@ import jakarta.persistence.ManyToOne; @Entity - public class DataWithFormula { - private static final long serialVersionUID = 1L; - @EmbeddedId private DataWithFormulaKey id; - @Formula(select = "${ta}.meta_key") private String metaKey; diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java index 1d2d55c732..ea19701d18 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaKey.java @@ -9,41 +9,33 @@ @Embeddable public class DataWithFormulaKey { - private static final long serialVersionUID = 1L; - @NotNull - private UUID mainId; + private final UUID mainId; @NotNull - private String metaKey = ""; + private final String metaKey; @NotNull - private Integer valueIndex = 0; + private final Integer valueIndex; - public UUID getMainId() { - return mainId; + public DataWithFormulaKey(UUID mainId, String metaKey, Integer valueIndex) { + this.mainId = mainId; + this.metaKey = metaKey; + this.valueIndex = valueIndex; } - public void setMainId(UUID mainId) { - this.mainId = mainId; + public UUID getMainId() { + return mainId; } public String getMetaKey() { return metaKey; } - public void setMetaKey(String metaKey) { - this.metaKey = metaKey; - } - public Integer getValueIndex() { return valueIndex; } - public void setValueIndex(Integer valueIndex) { - this.valueIndex = valueIndex; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java index e527ab9717..8677b3be13 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormulaMain.java @@ -10,6 +10,7 @@ @Entity public class DataWithFormulaMain { + @Id private UUID id; diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java index 0f9e01b67f..afdca7bb1d 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java @@ -11,20 +11,16 @@ import static org.assertj.core.api.Assertions.assertThat; -public class TestDataWithFormula extends BaseTestCase { +class TestDataWithFormula extends BaseTestCase { @Test - public void test1() { - + void test1() { DataWithFormulaMain main = new DataWithFormulaMain(); main.setId(UUID.randomUUID()); main.setTitle("Main"); - DataWithFormulaKey key = new DataWithFormulaKey(); - key.setMainId(main.getId()); - key.setMetaKey("meta"); - key.setValueIndex(42); + DataWithFormulaKey key = new DataWithFormulaKey(main.getId(), "meta", 42); DataWithFormula data = new DataWithFormula(); data.setId(key); data.setStringValue("SomeValue"); From d5048db2c676d9506fd7d36ae210d7bfcaf5ba1a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 19 Sep 2023 23:02:31 +1200 Subject: [PATCH 110/240] Follow up #3223 - Add @IdClass example test --- .../model/composite/Data2WithFormula.java | 60 +++++++++++++++++++ .../model/composite/Data2WithFormulaMain.java | 45 ++++++++++++++ .../model/composite/TestData2WithFormula.java | 40 +++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 ebean-test/src/test/java/org/tests/model/composite/Data2WithFormula.java create mode 100644 ebean-test/src/test/java/org/tests/model/composite/Data2WithFormulaMain.java create mode 100644 ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java diff --git a/ebean-test/src/test/java/org/tests/model/composite/Data2WithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/Data2WithFormula.java new file mode 100644 index 0000000000..85997692e8 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/composite/Data2WithFormula.java @@ -0,0 +1,60 @@ +package org.tests.model.composite; + + +import io.ebean.annotation.Index; +import jakarta.persistence.*; + +import java.util.UUID; + +@IdClass(DataWithFormulaKey.class) +@Entity +public class Data2WithFormula { + + @Id + private UUID mainId; + + @Id + private String metaKey; + + @Id + private Integer valueIndex; + + @ManyToOne + @JoinColumn(name = "main_id", insertable = false, nullable = false) + private Data2WithFormulaMain main; + + @Index + private String stringValue; + + public UUID mainId() { + return mainId; + } + + public void setMainId(UUID mainId) { + this.mainId = mainId; + } + + public String getMetaKey() { + return metaKey; + } + + public void setMetaKey(String metaKey) { + this.metaKey = metaKey; + } + + public Integer getValueIndex() { + return valueIndex; + } + + public void setValueIndex(Integer valueIndex) { + this.valueIndex = valueIndex; + } + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(String stringValue) { + this.stringValue = stringValue; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/composite/Data2WithFormulaMain.java b/ebean-test/src/test/java/org/tests/model/composite/Data2WithFormulaMain.java new file mode 100644 index 0000000000..e18c9bb28c --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/composite/Data2WithFormulaMain.java @@ -0,0 +1,45 @@ +package org.tests.model.composite; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; + +import java.util.List; +import java.util.UUID; + +@Entity +public class Data2WithFormulaMain { + + @Id + private UUID id; + + private String title; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "main") + private List metaData; + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public List getMetaData() { + return metaData; + } + + public void setMetaData(List metaData) { + this.metaData = metaData; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java new file mode 100644 index 0000000000..4b3848672d --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java @@ -0,0 +1,40 @@ +package org.tests.model.composite; + +import io.ebean.DB; +import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + + +class TestData2WithFormula extends BaseTestCase { + + @Test + void test1() { + + Data2WithFormulaMain main = new Data2WithFormulaMain(); + main.setId(UUID.randomUUID()); + main.setTitle("Main"); + + Data2WithFormula data = new Data2WithFormula(); + data.setMainId(main.getId()); + data.setMetaKey("meta"); + data.setValueIndex(42); + data.setStringValue("SomeValue"); + main.setMetaData(List.of(data)); + + LoggedSql.start(); + DB.save(main); + List sqls = LoggedSql.stop(); + + assertThat(sqls).hasSize(3); + assertThat(sqls.get(0)).contains("insert into data2_with_formula_main (id, title) values (?,?);"); // main + assertThat(sqls.get(1)).contains("insert into data2_with_formula (main_id, meta_key, value_index, string_value) values (?,?,?,?)"); // main + assertThat(sqls.get(2)).contains("-- bind"); + + } +} From dc7b73fc25265a4dccca74b222bee3f240cb0aff Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 19 Sep 2023 23:03:30 +1200 Subject: [PATCH 111/240] Follow up #3223 - modify test, could use @Column(insertable = false, updatable = false) instead of @Formula --- .../java/org/tests/model/composite/DataWithFormula.java | 7 +++---- .../org/tests/model/composite/TestDataWithFormula.java | 8 ++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java index 57e11b5a33..7bfb45f163 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/DataWithFormula.java @@ -3,10 +3,7 @@ import io.ebean.annotation.Formula; import io.ebean.annotation.Index; -import jakarta.persistence.EmbeddedId; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; +import jakarta.persistence.*; @Entity public class DataWithFormula { @@ -14,9 +11,11 @@ public class DataWithFormula { @EmbeddedId private DataWithFormulaKey id; + // @Column(insertable = false, updatable = false) @Formula(select = "${ta}.meta_key") private String metaKey; + // @Column(insertable = false, updatable = false) @Formula(select = "${ta}.value_index") private Integer valueIndex; diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java index afdca7bb1d..839dc2997e 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java @@ -35,5 +35,13 @@ void test1() { assertThat(sqls.get(1)).contains("insert into data_with_formula (main_id, meta_key, value_index, string_value) values (?,?,?,?)"); // main assertThat(sqls.get(2)).contains("-- bind"); + + DataWithFormula found = DB.find(DataWithFormula.class) + .where().idEq(key) + .findOne(); + + assertThat(found.getStringValue()).isEqualTo("SomeValue"); + assertThat(found.getId().getMainId()).isEqualTo(key.getMainId()); + assertThat(found.getMetaKey()).isEqualTo(key.getMetaKey()); } } From eab4f9c739be93b99411c608a2173bd0cf764f2d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 20 Sep 2023 23:12:04 +1200 Subject: [PATCH 112/240] Add Java 21 to Multi-JDK Build --- .github/workflows/multi-jdk-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multi-jdk-build.yml b/.github/workflows/multi-jdk-build.yml index a7f2b3284f..081d538076 100644 --- a/.github/workflows/multi-jdk-build.yml +++ b/.github/workflows/multi-jdk-build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [11, 17] + java_version: [11, 17, 21] os: [ubuntu-latest] steps: From 429843c358bfc4aaf828419e659f0bae0c945d8f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 4 Oct 2023 23:15:14 +1300 Subject: [PATCH 113/240] #3209 MetricsAsJson escape the SQL string content --- .../java/io/ebean/meta/MetricsAsJson.java | 13 +++++++++- .../java/io/ebean/meta/MetricsAsJsonTest.java | 25 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ebean-api/src/test/java/io/ebean/meta/MetricsAsJsonTest.java diff --git a/ebean-api/src/main/java/io/ebean/meta/MetricsAsJson.java b/ebean-api/src/main/java/io/ebean/meta/MetricsAsJson.java index 7a9e787744..86b137c8ce 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetricsAsJson.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetricsAsJson.java @@ -187,11 +187,22 @@ private void logQuery(MetaQueryMetric metric) throws IOException { } if (isIncludeDetail(metric)) { append("loc", metric.location()); - append("sql", metric.sql()); + append("sql", escape(metric.sql())); } metricEnd(); } + static String escape(String sql) { + return sql == null ? null : sql + .replace("\\", "\\\\") + .replace("\"", "\\\"") + .replace("\b", "\\b") + .replace("\f", "\\f") + .replace("\n", "\\n") + .replace("\r", "\\r") + .replace("\t", "\\t"); + } + private boolean isIncludeDetail(MetaTimedMetric metric) { return includeExtraAttributes == 2 || includeExtraAttributes == 1 && metric.initialCollection(); } diff --git a/ebean-api/src/test/java/io/ebean/meta/MetricsAsJsonTest.java b/ebean-api/src/test/java/io/ebean/meta/MetricsAsJsonTest.java new file mode 100644 index 0000000000..b1bb6d59dc --- /dev/null +++ b/ebean-api/src/test/java/io/ebean/meta/MetricsAsJsonTest.java @@ -0,0 +1,25 @@ +package io.ebean.meta; + +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +class MetricsAsJsonTest { + + @Test + void trimIt() { + assertThat(MetricsAsJson.escape(null)).isNull(); + assertThat(MetricsAsJson.escape("abc")).isEqualTo("abc"); + } + + @Test + void escape() { + assertThat(MetricsAsJson.escape("a\"bc")).isEqualTo("a\\\"bc"); + assertThat(MetricsAsJson.escape("a\tbc")).isEqualTo("a\\tbc"); + assertThat(MetricsAsJson.escape("a\bbc")).isEqualTo("a\\bbc"); + assertThat(MetricsAsJson.escape("a\bc")).isEqualTo("a\\bc"); + assertThat(MetricsAsJson.escape("a\rbc")).isEqualTo("a\\rbc"); + assertThat(MetricsAsJson.escape("a\nbc")).isEqualTo("a\\nbc"); + assertThat(MetricsAsJson.escape("a\\bc")).isEqualTo("a\\\\bc"); + } +} From bdc236159b910b789991d02c9750755ad760be46 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 6 Oct 2023 22:03:45 +1300 Subject: [PATCH 114/240] Bump avaje-config to 3.8 --- ebean-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 127bcd1aa3..5f3870054d 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -39,7 +39,7 @@ io.avaje avaje-config - 3.4 + 3.8 From 45467a3358bda4c291003b095f24f3153c1d2e5f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 6 Oct 2023 22:07:01 +1300 Subject: [PATCH 115/240] Bump ebean-agent --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 85e5480f46..f1cad248bf 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ 13.9.0 7.1 8.7 - 13.22.0 - 13.22.0 + 13.22.1 + 13.22.1 false From 1cc1d29c2fe39604c36d83621d94ada00ae86843 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 6 Oct 2023 22:38:26 +1300 Subject: [PATCH 116/240] Deprecate ServletContextListener (for shutdown in servlet container) Deprecated for removal - no intention to replace. Create your own ServletContextListener if needed for your application. --- .../src/main/java/io/ebean/event/ServletContextListener.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java index ed18bd413e..bcb3d33596 100644 --- a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java +++ b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java @@ -3,6 +3,9 @@ import jakarta.servlet.ServletContextEvent; /** + * Deprecated for removal - no intention to replace. Create your own copy of this + * ServletContextListener if needed for your application. + *

* Listens for webserver server starting and stopping events. *

* This should be used when the deployment is into a servlet container where the webapp @@ -15,6 +18,7 @@ * hook that Ebean registers. *

*/ +@Deprecated(forRemoval = true) public class ServletContextListener implements jakarta.servlet.ServletContextListener { /** From 1614166d75c8a62faad1f23d66bd6511d009adcd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 6 Oct 2023 22:59:00 +1300 Subject: [PATCH 117/240] Rename ebean-postgis -> ebean-postgis-types + add new composite ebean-postgis With this, people can depend on ebean-postgis (the composite) and get all the dependencies they need (which is ebean-platform-postgres + ebean-postgis-types + others). This should just make it easier for people in that currently we need both ebean-postgis + ebean-postgres which isn't obvious enough. --- composites/ebean-postgis/pom.xml | 72 +++++++++++++++++++ .../io/ebean/postgis/assembly/Assembly.java | 7 ++ .../src/main/java/module-info.java | 10 +++ composites/pom.xml | 1 + ebean-core-type/pom.xml | 2 +- ebean-core/pom.xml | 2 +- .../.editorconfig | 0 .../LICENSE | 0 ebean-postgis-types/README.md | 3 + .../pom.xml | 9 +-- .../postgis/PostgisExtraTypeFactory.java | 0 .../postgis/PostgisGeoTypeBindProvider.java | 0 .../ebean/postgis/PostgisGeoTypeBinder.java | 0 .../io/ebean/postgis/ScalarTypePgisBase.java | 0 .../postgis/ScalarTypePgisLineString.java | 0 .../ScalarTypePgisMultiLineString.java | 0 .../postgis/ScalarTypePgisMultiPoint.java | 0 .../postgis/ScalarTypePgisMultiPolygon.java | 0 .../io/ebean/postgis/ScalarTypePgisPoint.java | 0 .../ebean/postgis/ScalarTypePgisPolygon.java | 0 .../postgis/latte/ScalarTypeGeoLatteBase.java | 0 .../latte/ScalarTypeGeoLatteLineString.java | 0 .../ScalarTypeGeoLatteMultiLineString.java | 0 .../latte/ScalarTypeGeoLatteMultiPoint.java | 0 .../latte/ScalarTypeGeoLatteMultiPolygon.java | 0 .../latte/ScalarTypeGeoLattePoint.java | 0 .../latte/ScalarTypeGeoLattePolygon.java | 0 .../src/main/java9/module-info.java | 2 +- .../io.ebean.core.type.ExtraTypeFactory | 0 .../io.ebeaninternal.api.GeoTypeProvider | 0 .../java/org/example/domain/BaseEntity.java | 0 .../java/org/example/domain/CachedBean.java | 0 .../test/java/org/example/domain/MyBean.java | 0 .../org/example/domain/OtherBeanGeoLatte.java | 0 .../domain/TestCacheSerialization.java | 0 .../org/example/domain/TestInsertQuery.java | 0 .../example/domain/TestOtherInsertQuery.java | 0 .../java/org/example/domain/TestQuery.java | 0 .../src/test/resources/application-test.yml | 0 .../src/test/resources/logback-test.xml | 0 .../resources/notused-test-ebean.properties | 0 ebean-postgis/README.md | 2 - ebean-test/pom.xml | 2 +- platforms/postgres/pom.xml | 2 +- pom.xml | 2 +- 45 files changed, 102 insertions(+), 14 deletions(-) create mode 100644 composites/ebean-postgis/pom.xml create mode 100644 composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java create mode 100644 composites/ebean-postgis/src/main/java/module-info.java rename {ebean-postgis => ebean-postgis-types}/.editorconfig (100%) rename {ebean-postgis => ebean-postgis-types}/LICENSE (100%) create mode 100644 ebean-postgis-types/README.md rename {ebean-postgis => ebean-postgis-types}/pom.xml (93%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/java9/module-info.java (93%) rename {ebean-postgis => ebean-postgis-types}/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory (100%) rename {ebean-postgis => ebean-postgis-types}/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/BaseEntity.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/CachedBean.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/MyBean.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/OtherBeanGeoLatte.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/TestCacheSerialization.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/TestInsertQuery.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/TestOtherInsertQuery.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/java/org/example/domain/TestQuery.java (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/resources/application-test.yml (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/resources/logback-test.xml (100%) rename {ebean-postgis => ebean-postgis-types}/src/test/resources/notused-test-ebean.properties (100%) delete mode 100644 ebean-postgis/README.md diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml new file mode 100644 index 0000000000..ad963c712e --- /dev/null +++ b/composites/ebean-postgis/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 13.22.0 + ../.. + + + ebean-postgis + ebean-postgis composite + ebean-postgis + + + 2.5.1 + 42.6.0 + + + + + + io.ebean + ebean-api + 13.22.0 + + + + io.ebean + ebean-core + 13.22.0 + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-migration + ${ebean-migration.version} + + + + + io.ebean + ebean-querybean + 13.22.0 + + + + io.ebean + ebean-platform-postgres + 13.22.0 + + + + net.postgis + postgis-jdbc + ${postgis.jdbc.version} + + + + org.postgresql + postgresql + ${postgres.jdbc.version} + + + + diff --git a/composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java b/composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java new file mode 100644 index 0000000000..fea71cbb3d --- /dev/null +++ b/composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java @@ -0,0 +1,7 @@ +package io.ebean.postgis.assembly; + +/** + * Nothing interesting here - required placeholder for javadoc. + */ +public class Assembly { +} diff --git a/composites/ebean-postgis/src/main/java/module-info.java b/composites/ebean-postgis/src/main/java/module-info.java new file mode 100644 index 0000000000..63bf6fcb15 --- /dev/null +++ b/composites/ebean-postgis/src/main/java/module-info.java @@ -0,0 +1,10 @@ +module io.ebean.postgis { + + requires transitive io.ebean.api; + requires transitive io.ebean.core; + requires transitive io.ebean.datasource; + requires transitive io.ebean.querybean; + requires transitive io.ebean.platform.postgres; + // requires transitive io.ebean.postgis.types; + +} diff --git a/composites/pom.xml b/composites/pom.xml index c2700b6a76..d5e0a79fbb 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -23,6 +23,7 @@ ebean-nuodb ebean-oracle ebean-postgres + ebean-postgis ebean-sqlite ebean-sqlserver diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index cd0c86d685..f5e8239612 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -30,7 +30,7 @@ org.postgresql postgresql - 42.4.3 + 42.6.0 true diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 10ba232154..48a4c1467e 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -151,7 +151,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 true diff --git a/ebean-postgis/.editorconfig b/ebean-postgis-types/.editorconfig similarity index 100% rename from ebean-postgis/.editorconfig rename to ebean-postgis-types/.editorconfig diff --git a/ebean-postgis/LICENSE b/ebean-postgis-types/LICENSE similarity index 100% rename from ebean-postgis/LICENSE rename to ebean-postgis-types/LICENSE diff --git a/ebean-postgis-types/README.md b/ebean-postgis-types/README.md new file mode 100644 index 0000000000..455d8a2bed --- /dev/null +++ b/ebean-postgis-types/README.md @@ -0,0 +1,3 @@ +# ebean.postgis.types + +Ebean support for Postgres Geometry types diff --git a/ebean-postgis/pom.xml b/ebean-postgis-types/pom.xml similarity index 93% rename from ebean-postgis/pom.xml rename to ebean-postgis-types/pom.xml index e015cb359e..d8826e9fc1 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -7,11 +7,8 @@ 13.22.0 - ebean postgis - ebean postgis module - https://ebean.io/ - - ebean-postgis + ebean postgis types + ebean-postgis-types 2.5.1 @@ -50,7 +47,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 provided diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisExtraTypeFactory.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBindProvider.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/PostgisGeoTypeBinder.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java b/ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java similarity index 100% rename from ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java rename to ebean-postgis-types/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java diff --git a/ebean-postgis/src/main/java9/module-info.java b/ebean-postgis-types/src/main/java9/module-info.java similarity index 93% rename from ebean-postgis/src/main/java9/module-info.java rename to ebean-postgis-types/src/main/java9/module-info.java index a24837bc86..8d00fe655f 100644 --- a/ebean-postgis/src/main/java9/module-info.java +++ b/ebean-postgis-types/src/main/java9/module-info.java @@ -4,7 +4,7 @@ /** * Provides GeoTypeProvider and ExtraTypeFactory. */ -module io.ebean.postgis { +module io.ebean.postgis.types { provides ExtraTypeFactory with io.ebean.postgis.PostgisExtraTypeFactory; provides GeoTypeProvider with io.ebean.postgis.PostgisGeoTypeBindProvider; diff --git a/ebean-postgis/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory b/ebean-postgis-types/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory similarity index 100% rename from ebean-postgis/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory rename to ebean-postgis-types/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory diff --git a/ebean-postgis/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider b/ebean-postgis-types/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider similarity index 100% rename from ebean-postgis/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider rename to ebean-postgis-types/src/main/resources/META-INF/services/io.ebeaninternal.api.GeoTypeProvider diff --git a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java b/ebean-postgis-types/src/test/java/org/example/domain/BaseEntity.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/BaseEntity.java rename to ebean-postgis-types/src/test/java/org/example/domain/BaseEntity.java diff --git a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java b/ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/CachedBean.java rename to ebean-postgis-types/src/test/java/org/example/domain/CachedBean.java diff --git a/ebean-postgis/src/test/java/org/example/domain/MyBean.java b/ebean-postgis-types/src/test/java/org/example/domain/MyBean.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/MyBean.java rename to ebean-postgis-types/src/test/java/org/example/domain/MyBean.java diff --git a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java b/ebean-postgis-types/src/test/java/org/example/domain/OtherBeanGeoLatte.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java rename to ebean-postgis-types/src/test/java/org/example/domain/OtherBeanGeoLatte.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestCacheSerialization.java b/ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestCacheSerialization.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestCacheSerialization.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestInsertQuery.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestOtherInsertQuery.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestOtherInsertQuery.java diff --git a/ebean-postgis/src/test/java/org/example/domain/TestQuery.java b/ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java similarity index 100% rename from ebean-postgis/src/test/java/org/example/domain/TestQuery.java rename to ebean-postgis-types/src/test/java/org/example/domain/TestQuery.java diff --git a/ebean-postgis/src/test/resources/application-test.yml b/ebean-postgis-types/src/test/resources/application-test.yml similarity index 100% rename from ebean-postgis/src/test/resources/application-test.yml rename to ebean-postgis-types/src/test/resources/application-test.yml diff --git a/ebean-postgis/src/test/resources/logback-test.xml b/ebean-postgis-types/src/test/resources/logback-test.xml similarity index 100% rename from ebean-postgis/src/test/resources/logback-test.xml rename to ebean-postgis-types/src/test/resources/logback-test.xml diff --git a/ebean-postgis/src/test/resources/notused-test-ebean.properties b/ebean-postgis-types/src/test/resources/notused-test-ebean.properties similarity index 100% rename from ebean-postgis/src/test/resources/notused-test-ebean.properties rename to ebean-postgis-types/src/test/resources/notused-test-ebean.properties diff --git a/ebean-postgis/README.md b/ebean-postgis/README.md deleted file mode 100644 index a88d4c0b64..0000000000 --- a/ebean-postgis/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# ebean-com.avaje.ebean.postgis -Ebean support for Postgres Geometry types - org.com.avaje.ebean.postgis and org.geolatte.geom diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7b4bfc5715..014f9e5a2d 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -196,7 +196,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 org.checkerframework diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml index 13e2eab2b8..7cc9f09a74 100644 --- a/platforms/postgres/pom.xml +++ b/platforms/postgres/pom.xml @@ -28,7 +28,7 @@ org.postgresql postgresql - 42.5.1 + 42.6.0 test diff --git a/pom.xml b/pom.xml index f1cad248bf..2d849afb32 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ querybean-generator kotlin-querybean-generator ebean-querybean - ebean-postgis + ebean-postgis-types ebean-redis platforms composites From 73cfea605381943eae3213fbf514e7d095300ffa Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 6 Oct 2023 23:06:41 +1300 Subject: [PATCH 118/240] For postgres dependency exclude checker framework dependency --- composites/ebean-postgis/pom.xml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml index ad963c712e..c726e09bf7 100644 --- a/composites/ebean-postgis/pom.xml +++ b/composites/ebean-postgis/pom.xml @@ -56,16 +56,23 @@ 13.22.0 - - net.postgis - postgis-jdbc - ${postgis.jdbc.version} - - org.postgresql postgresql ${postgres.jdbc.version} + + + + * + * + + + + + + net.postgis + postgis-jdbc + ${postgis.jdbc.version} From 9aadc347d7fbb8b0781011f20ed9cc68780729ae Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 6 Oct 2023 23:15:43 +1300 Subject: [PATCH 119/240] Add ebean-postgres-types to ebean-bom --- ebean-bom/pom.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index cc39738cc0..079790130b 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -179,12 +179,6 @@ test - - io.ebean - ebean-postgis - 13.22.0 - - io.ebean ebean-redis @@ -253,6 +247,18 @@ 13.22.0 + + io.ebean + ebean-postgis + 13.22.0 + + + + io.ebean + ebean-postgis-types + 13.22.0 + + io.ebean ebean-sqlite From 395edb62bfea40312e37a2cfde2a20cfd4c85310 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 9 Oct 2023 21:10:56 +1300 Subject: [PATCH 120/240] In version 13.22 if the entity definition is in a different package, the generated query bean cannot resolve the symbol erro --- .../java/org/example/domain/OtherMain.java | 18 ++++++++++++++++++ .../org/example/domain/other/OtherBean.java | 13 +++++++++++++ .../querybean/generator/ProcessingContext.java | 3 ++- .../querybean/generator/PropertyTypeAssoc.java | 8 ++++++-- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 ebean-querybean/src/test/java/org/example/domain/OtherMain.java create mode 100644 ebean-querybean/src/test/java/org/example/domain/other/OtherBean.java diff --git a/ebean-querybean/src/test/java/org/example/domain/OtherMain.java b/ebean-querybean/src/test/java/org/example/domain/OtherMain.java new file mode 100644 index 0000000000..e1760e4d66 --- /dev/null +++ b/ebean-querybean/src/test/java/org/example/domain/OtherMain.java @@ -0,0 +1,18 @@ +package org.example.domain; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import org.example.domain.other.OtherBean; + +@SuppressWarnings("unused") +@Entity +public class OtherMain { + + @Id + long id; + + @ManyToOne + OtherBean other; + +} diff --git a/ebean-querybean/src/test/java/org/example/domain/other/OtherBean.java b/ebean-querybean/src/test/java/org/example/domain/other/OtherBean.java new file mode 100644 index 0000000000..9e8ddbefe3 --- /dev/null +++ b/ebean-querybean/src/test/java/org/example/domain/other/OtherBean.java @@ -0,0 +1,13 @@ +package org.example.domain.other; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + +@SuppressWarnings("unused") +@Entity +public class OtherBean { + + @Id + long id; + String name; +} diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index e1bedcd1db..28a9b537e3 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -362,7 +362,8 @@ private static Object readTargetEntityFromAnnotation(AnnotationMirror mirror) { private PropertyType createPropertyTypeAssoc(String fullName) { String[] split = Split.split(fullName); String propertyName = "Q" + split[1] + ".Assoc"; - return new PropertyTypeAssoc(propertyName); + String importName = split[0] + ".query.Q" + split[1]; + return new PropertyTypeAssoc(propertyName, importName); } /** diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeAssoc.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeAssoc.java index 6e6847c865..321ba40e45 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeAssoc.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/PropertyTypeAssoc.java @@ -7,13 +7,17 @@ */ class PropertyTypeAssoc extends PropertyType { + private final String importName; + /** * Construct given the associated bean type name and package. * * @param qAssocTypeName the associated bean type name. + * @param importName the import for the Assoc bean. */ - PropertyTypeAssoc(String qAssocTypeName) { + PropertyTypeAssoc(String qAssocTypeName, String importName) { super(qAssocTypeName); + this.importName = importName; } /** @@ -21,7 +25,7 @@ class PropertyTypeAssoc extends PropertyType { */ @Override void addImports(Set allImports) { - // do nothing + allImports.add(importName); } } From b3a577e3f956cadff544492020a10a70e719ff9b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 9 Oct 2023 22:03:02 +1300 Subject: [PATCH 121/240] #3234 - Query Bean Generator Generates Non-Compilable Code When Entity Uses @Embeddable Inner Class For Primary Key Type --- .../example/domain/other/OtherSiteUser.java | 47 +++++++++++++++++++ .../generator/ProcessingContext.java | 12 ++++- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 ebean-querybean/src/test/java/org/example/domain/other/OtherSiteUser.java diff --git a/ebean-querybean/src/test/java/org/example/domain/other/OtherSiteUser.java b/ebean-querybean/src/test/java/org/example/domain/other/OtherSiteUser.java new file mode 100644 index 0000000000..fe5553462b --- /dev/null +++ b/ebean-querybean/src/test/java/org/example/domain/other/OtherSiteUser.java @@ -0,0 +1,47 @@ +package org.example.domain.other; + +import jakarta.persistence.*; + +import java.util.Objects; +import java.util.UUID; + +@SuppressWarnings("unused") +@Entity +public class OtherSiteUser { + + @Embeddable + public static class Id { + + // Use siteId, userId matching by db column naming convention + public UUID siteId; + public UUID userId; + + public Id(UUID siteId, UUID userId) { + this.siteId = siteId; + this.userId = userId; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Id that = (Id) o; + return Objects.equals(siteId, that.siteId) && Objects.equals(userId, that.userId); + } + + @Override + public int hashCode() { + return Objects.hash(siteId, userId); + } + } + + @EmbeddedId + Id id; + + String description; + + @Version + long version; + + } diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 28a9b537e3..149fe62ecc 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -80,7 +80,7 @@ class ProcessingContext implements Constants { /** * For partial compile the previous list of prefixed entity classes. */ - private List loadedPrefixEntities = new ArrayList<>(); + private final List loadedPrefixEntities = new ArrayList<>(); /** * The package for the generated EntityClassRegister. @@ -360,7 +360,15 @@ private static Object readTargetEntityFromAnnotation(AnnotationMirror mirror) { * Create the QAssoc PropertyType. */ private PropertyType createPropertyTypeAssoc(String fullName) { - String[] split = Split.split(fullName); + TypeElement typeElement = elementUtils.getTypeElement(fullName); + String type; + if (typeElement.getNestingKind().isNested()) { + type = typeElement.getEnclosingElement().toString() + "$" + typeElement.getSimpleName(); + } else { + type = typeElement.getQualifiedName().toString(); + } + + String[] split = Split.split(type); String propertyName = "Q" + split[1] + ".Assoc"; String importName = split[0] + ".query.Q" + split[1]; return new PropertyTypeAssoc(propertyName, importName); From ac6473e0392a320cc171228cab79deb34a8479f1 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 00:59:06 +1300 Subject: [PATCH 122/240] Change SQL log to include executeBatch() via BatchedPstmt --- .../java/io/ebeaninternal/server/persist/BatchedPstmt.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java index ddd1747a16..e39f79629d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java @@ -84,6 +84,9 @@ public PreparedStatement statement(BatchPostExecute postExecute) throws SQLExcep */ private void flushStatementBatch() throws SQLException { final int[] rows = pstmt.executeBatch(); + if (transaction.isLogSql()) { + transaction.logSql(" -- executeBatch() size:{0} sql:{1}", rows.length, sql); + } if (rows.length != list.size()) { throw new IllegalStateException("Invalid state on executeBatch, rows:" + rows.length + " != " + list.size()); } @@ -153,6 +156,9 @@ private void postExecute() { private void executeAndCheckRowCounts() throws SQLException { try { results = pstmt.executeBatch(); + if (transaction.isLogSql()) { + transaction.logSql(" -- executeBatch() size:{0} sql:{1}", results.length, sql); + } if (results.length != list.size()) { throw new SQLException("Invalid state on executeBatch, rows:" + results.length + " != " + list.size()); } From 0bead4135ebafb50beec9fbfc6c9c0c57af7709a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 00:59:25 +1300 Subject: [PATCH 123/240] Change SQL log to include executeBatch() via BatchedPstmt Adjustments to tests to support this --- .../base/EbeanServer_deleteAllByIdTest.java | 2 +- .../xtest/base/EbeanServer_saveAllTest.java | 8 +-- .../basic/TestDeleteCascadingOneToMany.java | 4 +- .../basic/delete/TestDeleteCascadeById.java | 19 +++--- .../batchinsert/TestBatchInsertFlush.java | 8 +-- ...tBatchInsertWithInitialisedCollection.java | 2 +- .../tests/cascade/TestMultiCascadeBatch.java | 9 ++- .../org/tests/cascade/TestOrderedList.java | 8 +-- .../TestOrphanCollectionReplacement.java | 24 +++---- .../org/tests/cascade/TestPrivateOwned.java | 2 +- .../org/tests/ddl/TestForeignKeyModes.java | 4 +- .../delete/TestDeleteCascadeWithListener.java | 4 +- .../TestInheritanceOrderColumn.java | 4 +- .../org/tests/iud/TestPersistCascade.java | 20 +++--- .../org/tests/m2m/TestM2MDeleteNoCascade.java | 12 ++-- .../java/org/tests/merge/TestMergeBasic.java | 8 +-- .../org/tests/merge/TestMergeCustomer.java | 62 +++++++++---------- .../java/org/tests/merge/TestMergeM2M.java | 11 ++-- .../TestInsertBatchThenFlushThenUpdate.java | 4 +- .../basic/xtra/TestInsertBatchThenUpdate.java | 10 +-- ...TestInsertBatchWithDifferentRootTypes.java | 4 +- .../model/composite/TestData2WithFormula.java | 4 +- .../model/composite/TestDataWithFormula.java | 2 +- .../elementcollection/EcmPersonTest.java | 2 +- .../elementcollection/EcsPersonTest.java | 2 +- .../TestElementCollectionBasic.java | 35 ++++++----- .../TestElementCollectionBasicCache.java | 6 +- .../TestElementCollectionBasicMap.java | 15 ++--- .../TestElementCollectionBasicMapAsLob.java | 2 +- .../TestElementCollectionBasicMapCache.java | 8 +-- .../TestElementCollectionBasicSet.java | 14 ++--- .../TestElementCollectionCascadeMultiple.java | 17 ++--- .../TestElementCollectionEmbeddedList.java | 14 ++--- ...estElementCollectionEmbeddedListCache.java | 8 +-- ...stElementCollectionEmbeddedListCache2.java | 8 +-- .../TestElementCollectionEmbeddedMap.java | 15 ++--- ...TestElementCollectionEmbeddedMapCache.java | 8 +-- .../onetoone/TestOneToOneOrphanRemove.java | 14 +++-- .../onetoone/TestOneToOneOrphanStringId.java | 16 ++--- .../album/DeleteById_SoftDelete_Tests.java | 10 +-- .../orphanremoval/TestOrphanRemoveO2M.java | 2 +- .../org/tests/model/site/TestTreeModel.java | 4 +- .../org/tests/o2m/StatefulO2MSoftDelete.java | 4 +- ...anyStatelessUpdateResultsInSoftDelete.java | 40 ++++++------ .../o2m/jointable/TestOneToManyJoinTable.java | 12 ++-- .../TestOneToManyJoinTableInheritance.java | 14 ++--- .../TestOneToManyJoinTableNoTableName.java | 2 +- .../java/org/tests/order/TestOrderColumn.java | 8 +-- .../test/java/org/tests/sets/TestO2MMap.java | 6 +- .../test/java/org/tests/sets/TestO2MMap2.java | 2 +- .../test/java/org/tests/sets/TestO2MSet.java | 7 ++- .../TestSoftDeleteStatelessUpdate.java | 2 +- .../transaction/TestBatchModelFlush.java | 12 ++-- .../TestTransparentPersist.java | 21 ++++--- .../org/tests/update/TestSqlUpdateInTxn.java | 2 +- .../org/tests/update/TestStatelessUpdate.java | 15 +++-- 56 files changed, 303 insertions(+), 279 deletions(-) diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java index a8db827a3b..f9b70507b8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java @@ -33,7 +33,7 @@ void saveAllByVarArgs() { assertNotNull(bean2.getId()); List loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(4); + assertThat(loggedSql).hasSize(5); assertThat(loggedSql.get(0)).contains("insert into e_basicver"); assertSqlBind(loggedSql, 1, 3); diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java index 1bf75ad6b5..8736c29029 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java @@ -28,7 +28,7 @@ public void saveAll() { // assert List loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(4); + assertThat(loggedSql).hasSize(5); assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); @@ -50,7 +50,7 @@ public void saveAll() { DB.deleteAll(someBeans); loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(4); + assertThat(loggedSql).hasSize(5); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?"); } @@ -125,7 +125,7 @@ public void saveAll_withTransaction() { // assert List loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(4); + assertThat(loggedSql).hasSize(5); assertThat(loggedSql.get(0)).contains("insert into e_basicver ("); assertThat(loggedSql.get(0)).contains("name, description, other, last_update) values ("); @@ -151,7 +151,7 @@ public void saveAll_withTransaction() { txn.commit(); } loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(4); + assertThat(loggedSql).hasSize(5); assertThat(loggedSql.get(0)).contains("delete from e_basicver where id=?"); } diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java index 44301ed277..6809eae31b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java @@ -27,12 +27,12 @@ void testDeleteCascadingOneToMany() { DB.delete(a0); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(6); assertThat(sql.get(0)).contains("select t0.id from section t0 where article_id=?"); assertThat(sql.get(1)).contains("select t0.id from sub_section t0 where (section_id)"); // in | any assertThat(sql.get(2)).contains("delete from section where id"); // in | any assertThat(sql.get(3)).contains(" -- bind"); - assertThat(sql.get(4)).contains("delete from article where id=? and version=?"); + assertThat(sql.get(5)).contains("delete from article where id=? and version=?"); } @Test diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index fc64a94913..53969c2156 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -40,25 +40,30 @@ void test() { DB.delete(o); List sql = LoggedSql.collect(); - assertThat(sql).hasSize(6); + assertThat(sql).hasSize(8); assertThat(sql.get(0)).contains("select t0.id from o_order_detail t0 where order_id=?"); assertThat(sql.get(1)).contains("delete from o_order_detail where id"); assertThat(sql.get(2)).contains("-- bind(Array[3]"); assertThat(sql.get(3)).contains("delete from or_order_ship where order_id = ?"); assertThat(sql.get(4)).contains("-- bind("); - assertThat(sql.get(5)).contains("delete from o_order where id=? and updtime=?"); + assertThat(sql.get(5)).contains("-- executeBatch"); + assertThat(sql.get(6)).contains("-- executeBatch"); + assertThat(sql.get(7)).contains("delete from o_order where id=? and updtime=?"); DB.delete(cust); sql = LoggedSql.stop(); - assertThat(sql).hasSize(9); + assertThat(sql).hasSize(12); assertThat(sql.get(0)).contains("select t0.id from contact t0 where customer_id="); assertThat(sql.get(1)).contains("delete from contact_note where (contact_id)"); assertThat(sql.get(2)).contains(" -- bind(Array[3]="); assertThat(sql.get(3)).contains("delete from contact where id"); assertThat(sql.get(4)).contains(" -- bind(Array[3]"); - assertThat(sql.get(5)).contains("delete from o_customer where id=? and version=?"); - assertThat(sql.get(6)).contains("delete from o_address where id=? and updtime=?"); - assertThat(sql.get(7)).contains(" -- bind("); - assertThat(sql.get(8)).contains(" -- bind("); + assertThat(sql.get(5)).contains(" -- executeBatch"); + assertThat(sql.get(6)).contains(" -- executeBatch"); + assertThat(sql.get(7)).contains("delete from o_customer where id=? and version=?"); + assertThat(sql.get(8)).contains("delete from o_address where id=? and updtime=?"); + assertThat(sql.get(9)).contains(" -- bind("); + assertThat(sql.get(10)).contains(" -- bind("); + assertThat(sql.get(11)).contains(" -- executeBatch"); } } diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 34be40f666..2eb6ef3fa1 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -100,7 +100,7 @@ public void no_cascade() { assertSql(sql.get(0)).contains("insert into t_atable_thatisrelatively"); assertSql(sql.get(1)).contains("-- bind("); // detail - assertThat(sql.get(3)).contains("insert into t_detail_with_other_namexxxyy"); + assertThat(sql.get(4)).contains("insert into t_detail_with_other_namexxxyy"); assertThat(((SpiTransaction) transaction).label()).isEqualTo("TestBatchInsertFlush.no_cascade"); @@ -205,7 +205,7 @@ public void transactional_flushOnGetId() { assertThat(LoggedSql.collect()).isEmpty(); Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSql.collect()).hasSize(3); + assertThat(LoggedSql.collect()).hasSize(4); EBasicVer b3 = new EBasicVer("b3"); server.save(b3); @@ -231,7 +231,7 @@ public void testFlushOnGetId() { assertThat(LoggedSql.collect()).isEmpty(); Integer id = b1.getId(); assertNotNull(id); - assertThat(LoggedSql.collect()).hasSize(3); + assertThat(LoggedSql.collect()).hasSize(4); EBasicVer b3 = new EBasicVer("b3"); server.save(b3, txn); @@ -298,7 +298,7 @@ public void noflushWhenIdIsLoaded() { server.save(b3, txn); txn.commit(); - assertThat(LoggedSql.collect()).hasSize(5); + assertThat(LoggedSql.collect()).hasSize(7); } finally { txn.end(); diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index e0aa7c9082..a32ce5ebce 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -40,7 +40,7 @@ public void test() { } List loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(4); + assertThat(loggedSql).hasSize(5); assertThat(loggedSql.get(0)).contains("insert into o_cached_bean ("); assertThat(loggedSql.get(0)).contains("name) values (?"); } diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index 79a6cbc322..b93a47c8bb 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -55,12 +55,15 @@ public void save() { assertThat(list).hasSize(3); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("insert into site (id, name"); assertSql(sql.get(1)).contains("insert into site (id, name"); assertSqlBind(sql.get(2)); - assertThat(sql.get(3)).contains("insert into site (id, name"); - assertSqlBind(sql.get(4)); + assertThat(sql.get(3)).contains(" -- executeBatch"); + assertThat(sql.get(4)).contains("insert into site (id, name"); + assertSqlBind(sql.get(5)); + assertThat(sql.get(6)).contains(" -- executeBatch"); + } @Test diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java index c88f318e56..15ceacfc8b 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java @@ -77,7 +77,7 @@ private void fetchAndReorder(Long id) { DB.save(fresh); sql = LoggedSql.collect(); - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(8); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?"); assertSql(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?"); @@ -86,7 +86,7 @@ private void fetchAndReorder(Long id) { DB.save(fresh); sql = LoggedSql.collect(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=? where id=? and version=?; -- bind(m1-mod3"); assertSql(sql.get(1)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?"); assertThat(sql.get(2)).contains("bind(was 1,3,2,"); @@ -94,10 +94,10 @@ private void fetchAndReorder(Long id) { DB.delete(fresh); sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from om_ordered_detail where master_id = ?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("delete from om_ordered_master where id=? and version=?"); + assertSql(sql.get(3)).contains("delete from om_ordered_master where id=? and version=?"); } @Test diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java index d39cf93cbc..7311719c74 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java @@ -20,20 +20,20 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithStatement() { long parentId = setup(1000); // can be handled by statement for SqlServer List sql = doUpdate(parentId, name -> !"c0".equals(name)); if (isH2() || isPostgresCompatible()) { // using deleted=true vs deleted=1 - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(6); assertThat(sql.get(0)).contains("update coone_many set deleted=true where coone_id = ? and not ( id "); assertThat(sql.get(1)).contains(" -- bind("); - assertThat(sql.get(2)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); - assertThat(sql.get(3)).contains(" -- bind("); + assertThat(sql.get(3)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); + assertThat(sql.get(4)).contains(" -- bind("); } if (isSqlServer()) { // statement mode - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(6); assertThat(sql.get(0)).contains("update coone_many set deleted=1 where coone_id = ? and not ( id "); assertThat(sql.get(1)).contains(" -- bind("); - assertThat(sql.get(2)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); - assertThat(sql.get(3)).contains(" -- bind("); + assertThat(sql.get(3)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); + assertThat(sql.get(4)).contains(" -- bind("); } COOne fetchedUser2 = DB.find(COOne.class, parentId); requireNonNull(fetchedUser2); @@ -51,14 +51,14 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithFilter() { List sql = doUpdate(parentId, name -> !"c0".equals(name)); if (isH2() || isPostgresCompatible()) { // using deleted=true vs deleted=1 // CHECKME: H2 would not require the batch mode here and could theoretically do it in fewer statements - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertThat(sql.get(0)).contains("select t0.id from coone_many t0 where coone_id=? and t0.deleted = false and t0.deleted = false; --bind"); if (isH2()) { assertThat(sql.get(1)).contains("update coone_many set deleted=true where id in (?)"); } assertThat(sql.get(2)).contains(" -- bind("); - assertThat(sql.get(3)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); - assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(4)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); + assertThat(sql.get(5)).contains(" -- bind("); } if (isSqlServer()) { @@ -86,15 +86,15 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithManyReplacement() { List sql = doUpdate(parentId, name -> Integer.parseInt(name.substring(1)) >= 2500); if (isH2()) { // using deleted=true vs deleted=1 // CHECKME: H2 would not require the batch mode here and could theoretically do it in fewer statements - assertThat(sql).hasSize(8); + assertThat(sql).hasSize(11); assertThat(sql.get(0)).contains("select t0.id from coone_many t0 where coone_id=? and t0.deleted = false and t0.deleted = false; --bind"); // find all Ids assertThat(sql.get(1)).contains("update coone_many set deleted=true where id in (?,?,?"); assertThat(sql.get(2)).contains(" -- bind(Array[1000]="); // update first 1000 assertThat(sql.get(3)).contains(" -- bind(Array[1000]="); // update second 1000 assertThat(sql.get(4)).contains("update coone_many set deleted=true where id in (?,?,?"); assertThat(sql.get(5)).contains(" -- bind(Array[500]="); // update last 500 - assertThat(sql.get(6)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); - assertThat(sql.get(7)).contains(" -- bind("); + assertThat(sql.get(8)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); + assertThat(sql.get(9)).contains(" -- bind("); } if (isPostgresCompatible()) { assertThat(sql).hasSize(7); diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java index 16ce0afb1e..696f72bb63 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -71,7 +71,7 @@ public void insertThenUpdate() { DB.save(m0); List loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(2); + assertThat(loggedSql).hasSize(3); assertThat(loggedSql.get(0)).contains("delete from t_detail_with_other_namexxxyy where id=?"); assertSqlBind(loggedSql.get(1)); diff --git a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java index ef3c8d6009..9f3b654eb2 100644 --- a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -79,10 +79,10 @@ public void noneViaManyToMany() { DB.delete(none); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from dfk_none_via_mto_m_dfk_one where dfk_none_via_mto_m_id = ?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("delete from dfk_none_via_mto_m where id=?"); + assertSql(sql.get(3)).contains("delete from dfk_none_via_mto_m where id=?"); } @IgnorePlatform(Platform.NUODB) diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index 6412c63f6a..6b29a76425 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -28,11 +28,11 @@ public void test() { List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(6); + assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("select t0.id from dc_detail t0 where master_id=?"); assertSql(sql.get(1)).contains("delete from dc_detail where id=?"); assertSqlBind(sql, 2, 4); - assertThat(sql.get(5)).contains("delete from dc_master where id=? and version=?"); + assertThat(sql.get(6)).contains("delete from dc_master where id=? and version=?"); } awaitListenerPropagation(); diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index 295180236f..1859dc49bf 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -32,7 +32,7 @@ public void test() { LoggedSql.start(); DB.save(master); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); // Some platforms insert ids and others don't need to... assertSql(trimId(sql, 1)) .contains("insert into ordered_parent (order_master_inheritance_id, dtype, common_name, ordered_aname, sort_order) values"); @@ -53,7 +53,7 @@ public void test() { LoggedSql.start(); DB.save(result); sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?"); result = DB.find(OrderMasterInheritance.class).findOne(); diff --git a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java index cc9c9b5e95..39136c2844 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java @@ -30,16 +30,16 @@ public void insert() { assertSql(sql.get(0)).contains("insert into pcf_country"); assertSql(sql.get(1)).contains("insert into pcf_person"); assertSqlBind(sql, 2, 7); - assertThat(sql.get(8)).contains("insert into pcf_calendar"); - assertSqlBind(sql, 9, 20); - assertThat(sql.get(21)).contains("insert into pcf_city"); - assertSqlBind(sql, 22, 24); - assertThat(sql.get(25)).contains("insert into pcf_event"); - assertSqlBind(sql, 26, 45); - assertThat(sql.get(46)).contains("insert into pcf_event"); - assertSqlBind(sql, 47, 66); - assertThat(sql.get(67)).contains("insert into pcf_event"); - assertSqlBind(sql, 68, 87); + assertThat(sql.get(9)).contains("insert into pcf_calendar"); + assertSqlBind(sql, 10, 21); + assertThat(sql.get(23)).contains("insert into pcf_city"); + assertSqlBind(sql, 24, 26); + assertThat(sql.get(28)).contains("insert into pcf_event"); + assertSqlBind(sql, 29, 48); + assertThat(sql.get(50)).contains("insert into pcf_event"); + assertSqlBind(sql, 51, 70); + assertThat(sql.get(72)).contains("insert into pcf_event"); + assertSqlBind(sql, 73, 87); } country.deletePermanent(); diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index a90ce7ea0b..36f71abdb7 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -75,12 +75,14 @@ public void update() { DB.update(user); final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("update mnoc_user set user_name=?, version=? where user_id=? and version=?"); assertSql(sql.get(1)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); assertSqlBind(sql.get(2)); assertThat(sql.get(3)).contains("insert into mnoc_user_mnoc_role (mnoc_user_user_id, mnoc_role_role_id) values (?, ?)"); assertSqlBind(sql.get(4)); + assertThat(sql.get(5)).contains("-- executeBatch"); + assertThat(sql.get(6)).contains("-- executeBatch"); } @Test @@ -107,10 +109,10 @@ public void deleteBatch() { } final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(8); + assertThat(sql).hasSize(12); assertSql(sql.get(0)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); - assertThat(sql.get(4)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); - assertSql(sql.get(2)).contains("delete from mnoc_user where user_id=? and version=?"); - assertThat(sql.get(6)).contains("delete from mnoc_user where user_id=? and version=?"); + assertThat(sql.get(6)).contains("delete from mnoc_user_mnoc_role where mnoc_user_user_id = ?"); + assertSql(sql.get(3)).contains("delete from mnoc_user where user_id=? and version=?"); + assertThat(sql.get(9)).contains("delete from mnoc_user where user_id=? and version=?"); } } diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java index d52266cb30..61e5093d8f 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java @@ -63,10 +63,10 @@ public void with_setClientGeneratedIds_expect_noDifferenceWithToMany() { assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?)"); assertThat(sql.get(4)).contains("-- bind("); assertThat(sql.get(5)).contains("-- bind("); - assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?"); - assertThat(sql.get(7)).contains("-- bind("); + assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?"); assertThat(sql.get(8)).contains("-- bind("); assertThat(sql.get(9)).contains("-- bind("); + assertThat(sql.get(10)).contains("-- bind("); } else { assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);"); @@ -111,8 +111,8 @@ public void test() { assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?)"); assertThat(sql.get(4)).contains("-- bind("); assertThat(sql.get(5)).contains("-- bind("); - assertThat(sql.get(6)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?"); - assertThat(sql.get(9)).contains("-- bind("); + assertThat(sql.get(7)).contains("update uutwo set name=?, notes=?, version=?, master_id=? where id=? and version=?"); + assertThat(sql.get(10)).contains("-- bind("); } else { assertThat(sql.get(3)).contains("insert into uutwo (id, name, notes, version, master_id) values (?,?,?,?,?);"); diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index 51de98fa5a..e48d2be8ed 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -92,11 +92,11 @@ public void customerWithAddresses_setClientGeneratedIds_expect_selectAndUpdate() server().merge(mCustomer, options); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(6); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); assertSql(sql.get(1)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); assertSqlBind(sql, 2, 3); - assertThat(sql.get(4)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); + assertThat(sql.get(5)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); } @Test @@ -121,13 +121,13 @@ public void customerWithAddresses_newAddress_setClientGeneratedIds_expect_insert server().merge(mCustomer, options); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(6); + assertThat(sql).hasSize(8); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); assertSql(sql.get(1)).contains("insert into maddress (id, street, city, version) values (?,?,?,?)"); assertSqlBind(sql.get(2)); - assertThat(sql.get(3)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); - assertSqlBind(sql.get(4)); - assertThat(sql.get(5)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); + assertThat(sql.get(4)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); + assertSqlBind(sql.get(5)); + assertThat(sql.get(7)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); } @Test @@ -154,16 +154,16 @@ public void customerWithAddresses_newAddressWithId_setClientGeneratedIds_expect_ server().merge(mCustomer, options); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("select t0.id, t2.id, t1.id from mcustomer t0 left join maddress t2 on t2.id = t0.shipping_address_id left join maddress t1 on t1.id = t0.billing_address_id where t0.id = ?"); // Additional check to see if the address with the unknown UUID is 'insert' or 'update' assertSql(sql.get(1)).contains("select t0.id from maddress t0 where t0.id = ?"); assertSql(sql.get(2)).contains("insert into maddress (id, street, city, version) values (?,?,?,?)"); assertSqlBind(sql.get(3)); - assertThat(sql.get(4)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); - assertSqlBind(sql.get(5)); - assertThat(sql.get(6)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); + assertThat(sql.get(5)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); + assertSqlBind(sql.get(6)); + assertThat(sql.get(8)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); } @Test @@ -212,12 +212,12 @@ public void whenContacts_isNull_expect_deleteContacts() { List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(20); + assertThat(sql).hasSize(26); } assertSql(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id where t0.id = ?"); assertSql(sql.get(1)).contains("delete from mcontact_message where contact_id = ?"); - assertThat(sql.get(3)).contains("delete from mcontact where id=?"); - assertThat(sql.get(19)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); + assertThat(sql.get(4)).contains("delete from mcontact where id=?"); + assertThat(sql.get(25)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); } @@ -238,12 +238,12 @@ public void whenContacts_isEmpty_expect_deleteContacts() { List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(20); + assertThat(sql).hasSize(26); } assertSql(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id where t0.id = ?"); assertSql(sql.get(1)).contains("delete from mcontact_message where contact_id = ?"); - assertThat(sql.get(3)).contains("delete from mcontact where id=?"); - assertThat(sql.get(19)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); + assertThat(sql.get(4)).contains("delete from mcontact where id=?"); + assertThat(sql.get(25)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); } @Test @@ -276,17 +276,17 @@ public void whenContacts_mixed_expect_deleteInsertUpdateContacts() { List sql = LoggedSql.stop(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(16); + assertThat(sql).hasSize(20); assertSql(sql.get(0)).contains("select t0.id, t1.id from mcustomer t0 left join mcontact t1 on t1.customer_id = t0.id where t0.id = ?"); assertSql(sql.get(1)).contains("delete from mcontact_message where contact_id = ?"); - assertThat(sql.get(3)).contains("delete from mcontact where id=?"); - assertThat(sql.get(7)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); + assertThat(sql.get(4)).contains("delete from mcontact where id=?"); + assertThat(sql.get(9)).contains("update mcustomer set name=?, version=?, shipping_address_id=?, billing_address_id=? where id=? and version=?"); } if (isPersistBatchOnCascade()) { - assertThat(sql.get(8)).contains("insert into mcontact"); - assertThat(sql.get(9)).contains("-- bind("); - assertThat(sql.get(11)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?"); + assertThat(sql.get(10)).contains("insert into mcontact"); + assertThat(sql.get(11)).contains("-- bind("); + assertThat(sql.get(14)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?"); } else { assertThat(sql.get(6)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?"); assertThat(sql.get(7)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?"); @@ -323,15 +323,15 @@ public void fullMonty() { assertSql(sql.get(1)).contains("select t0.contact_id, t0.id from mcontact_message t0 where (t0.contact_id) in (?,?,?,?,?,?,?,?,?,?)"); } assertSql(sql.get(2)).contains("delete from mcontact_message where contact_id = ?"); - assertThat(sql.get(4)).contains("delete from mcontact where id=?"); - assertThat(sql.get(5)).contains("delete from mcontact_message where contact_id = ?"); - assertThat(sql.get(7)).contains("delete from mcontact where id=?"); - - assertThat(sql.get(8)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); - assertThat(sql.get(13)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?"); - assertSqlBind(sql, 14, 17); - assertThat(sql.get(18)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?"); - assertSqlBind(sql, 19, 22); + assertThat(sql.get(5)).contains("delete from mcontact where id=?"); + assertThat(sql.get(6)).contains("delete from mcontact_message where contact_id = ?"); + assertThat(sql.get(9)).contains("delete from mcontact where id=?"); + + assertThat(sql.get(10)).contains("update maddress set street=?, city=?, version=? where id=? and version=?"); + assertThat(sql.get(17)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?"); + assertSqlBind(sql, 18, 21); + assertThat(sql.get(23)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?"); + assertSqlBind(sql, 24, 29); } } diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java index 5e0cfc1fae..245311daf0 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java @@ -41,11 +41,12 @@ public void m2mMerge() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(6); + assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("select"); assertSql(sql.get(1)).contains("insert into mmachine"); assertSql(sql.get(2)).contains("insert into mmachine_mgroup"); assertSqlBind(sql, 3, 5); + assertSql(sql.get(6)).contains(" -- executeBatch"); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("select"); @@ -66,13 +67,13 @@ public void m2mMerge() { DB.merge(m1, options); sql = LoggedSql.collect(); - assertThat(sql).hasSize(9); + assertThat(sql).hasSize(11); assertSql(sql.get(0)).contains("select"); assertSql(sql.get(1)).contains("delete from mmachine_mgroup"); assertSqlBind(sql, 2, 4); - assertThat(sql.get(5)).contains("insert into mmachine_mgroup"); - assertSqlBind(sql, 6, 7); - assertThat(sql.get(8)).contains("update mmachine"); + assertThat(sql.get(6)).contains("insert into mmachine_mgroup"); + assertSqlBind(sql, 7, 8); + assertThat(sql.get(10)).contains("update mmachine"); } } diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index 23a8020cce..fb1af1d3c0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -41,7 +41,7 @@ public void test() { txn.flush(); List loggedSql1 = LoggedSql.start(); - assertThat(loggedSql1).hasSize(4); + assertThat(loggedSql1).hasSize(6); parent.setName("MyDesk"); DB.save(parent); @@ -53,7 +53,7 @@ public void test() { // insert statements for EdExtendedParent List loggedSql2 = LoggedSql.start(); - assertThat(loggedSql2).hasSize(2); + assertThat(loggedSql2).hasSize(3); assertThat(loggedSql2.get(0)).contains(" update td_parent "); } } diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index f757beedfa..675f79588a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -48,10 +48,10 @@ public void test() { // insert statements for EdExtendedParent List loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(6); + assertThat(loggedSql).hasSize(9); assertThat(loggedSql.get(0)).contains("insert into td_parent"); - assertThat(loggedSql.get(2)).contains("insert into td_child "); - assertThat(loggedSql.get(4)).contains("update td_parent set parent_name=? where parent_id=?"); + assertThat(loggedSql.get(3)).contains("insert into td_child "); + assertThat(loggedSql.get(6)).contains("update td_parent set parent_name=? where parent_id=?"); } } @@ -91,9 +91,9 @@ public void test_noFlushOn_getterOfNonGeneratedProperty() { // insert statements for EdExtendedParent List loggedSql = LoggedSql.stop(); - assertThat(loggedSql).hasSize(4); + assertThat(loggedSql).hasSize(6); assertThat(loggedSql.get(0)).contains("insert into td_parent"); - assertThat(loggedSql.get(2)).contains("insert into td_child "); + assertThat(loggedSql.get(3)).contains("insert into td_child "); } } diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index 3b7a18da91..e321664b61 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { @@ -63,8 +64,7 @@ public void testDifferRootTypes() { // insert statements for EdExtendedParent List loggedSql2 = LoggedSql.start(); - assertEquals(7, loggedSql2.size()); - + assertThat(loggedSql2).hasSize(10); } } diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java index 4b3848672d..9a9aa12433 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestData2WithFormula.java @@ -31,10 +31,10 @@ void test1() { DB.save(main); List sqls = LoggedSql.stop(); - assertThat(sqls).hasSize(3); + assertThat(sqls).hasSize(4); assertThat(sqls.get(0)).contains("insert into data2_with_formula_main (id, title) values (?,?);"); // main assertThat(sqls.get(1)).contains("insert into data2_with_formula (main_id, meta_key, value_index, string_value) values (?,?,?,?)"); // main assertThat(sqls.get(2)).contains("-- bind"); - + assertThat(sqls.get(3)).contains("-- executeBatch"); } } diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java index 839dc2997e..40885418df 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestDataWithFormula.java @@ -30,7 +30,7 @@ void test1() { DB.save(main); List sqls = LoggedSql.stop(); - assertThat(sqls).hasSize(3); + assertThat(sqls).hasSize(4); assertThat(sqls.get(0)).contains("insert into data_with_formula_main (id, title) values (?,?);"); // main assertThat(sqls.get(1)).contains("insert into data_with_formula (main_id, meta_key, value_index, string_value) values (?,?,?,?)"); // main assertThat(sqls.get(2)).contains("-- bind"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index a296baabfe..5a085990f4 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -31,7 +31,7 @@ public void readJsonThenInsert() { final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ecm_person "); assertSql(sql.get(1)).contains("insert into ecm_person_phone_numbers "); assertSql(sql.get(2)).contains("-- bind"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index 7c624dfcdd..a2163514ea 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -30,7 +30,7 @@ public void jsonReadThenInsert() { final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ecs_person "); assertSql(sql.get(1)).contains("insert into ecs_person_phone "); assertSql(sql.get(2)).contains("-- bind"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 590d0d7960..1d8b1623ad 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -28,7 +28,7 @@ void insertThen_UpdateWhenNotChanged_expect_noChanges() { List sql = LoggedSql.collect(); assertThat(eventLog()).containsOnly("preInsert", "postInsert"); - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); final EcPerson found = DB.find(EcPerson.class) .setId(person.getId()) @@ -66,10 +66,11 @@ void test() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ec_person"); assertSql(sql.get(1)).contains("insert into ec_person_phone"); assertSqlBind(sql, 2, 3); + assertThat(sql.get(4)).contains("-- executeBatch"); } else { assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into ec_person"); @@ -148,7 +149,7 @@ private void updateBasicInBatch(EcPerson bean) { } List sql = LoggedSql.collect(); - assertThat(sql).hasSize(2); + assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("update ec_person"); assertThat(eventLog()).containsExactly("preUpdate", "postUpdate"); @@ -163,12 +164,12 @@ private void updateBoth(EcPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ec_person_phone where owner_id=?"); assertSqlBind(sql.get(2)); - assertThat(sql.get(3)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); - assertSqlBind(sql, 4, 6); + assertThat(sql.get(4)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); + assertSqlBind(sql, 5, 7); } else { assertThat(sql).hasSize(5); @@ -194,12 +195,12 @@ private void updateBothInBatch(EcPerson bean) { } List sql = LoggedSql.collect(); - assertThat(sql).hasSize(9); + assertThat(sql).hasSize(12); assertSql(sql.get(0)).contains("update ec_person set name=?, version=? where id=? and version=?"); - assertSql(sql.get(2)).contains("delete from ec_person_phone where owner_id=?"); - assertSqlBind(sql, 3); - assertThat(sql.get(4)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); - assertSqlBind(sql, 5, 8); + assertSql(sql.get(3)).contains("delete from ec_person_phone where owner_id=?"); + assertSqlBind(sql, 4); + assertThat(sql.get(6)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); + assertSqlBind(sql, 7, 10); assertThat(eventLog()).containsExactly("preUpdate", "postUpdate"); @@ -226,11 +227,11 @@ private void updateOnlyCollectionInBatch(EcPerson bean) { } List sql = LoggedSql.collect(); - assertThat(sql).hasSize(8); + assertThat(sql).hasSize(10); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?"); assertSqlBind(sql, 1); - assertSql(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); - assertSqlBind(sql, 3, 7); + assertSql(sql.get(3)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); + assertSqlBind(sql, 4, 8); assertThat(eventLog()).containsExactly("preUpdate", "postUpdate"); @@ -243,11 +244,11 @@ private void updateOnlyCollection(EcPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(9); + assertThat(sql).hasSize(11); assertSql(sql.get(0)).contains("delete from ec_person_phone where owner_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); - assertSqlBind(sql, 3, 8); + assertSql(sql.get(3)).contains("insert into ec_person_phone (owner_id,phone) values (?,?)"); + assertSqlBind(sql, 4, 9); } else { assertThat(sql).hasSize(7); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index ac5e0444f8..85b4231fce 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -43,8 +43,8 @@ public void test() { sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); - assertSqlBind(sql, 4, 6); + assertThat(sql).hasSize(9); + assertSqlBind(sql, 5, 7); } else { assertThat(sql).hasSize(5); } @@ -69,7 +69,7 @@ public void test() { sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); // cache hit + assertThat(sql).hasSize(9); // cache hit } else { assertThat(sql).hasSize(5); // cache hit } diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 0e5b018530..881f8a737f 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -25,10 +25,11 @@ public void test() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ecm_person"); assertSql(sql.get(1)).contains("insert into ecm_person_phone"); assertSqlBind(sql, 2, 3); + assertSql(sql.get(4)).contains(" -- executeBatch"); } else { assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into ecm_person"); @@ -107,12 +108,12 @@ private void updateBoth(EcmPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?"); assertSqlBind(sql.get(2)); - assertThat(sql.get(3)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,phnum) values (?,?,?)"); - assertSqlBind(sql, 4, 6); + assertThat(sql.get(4)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,phnum) values (?,?,?)"); + assertSqlBind(sql, 5, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("update ecm_person set name=?, version=? where id=? and version=?"); @@ -142,11 +143,11 @@ private void updateOnlyCollection(EcmPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,phnum) values (?,?,?)"); - assertSqlBind(sql, 3, 6); + assertSql(sql.get(3)).contains("insert into ecm_person_phone_numbers (ecm_person_id,type,phnum) values (?,?,?)"); + assertSqlBind(sql, 4, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("delete from ecm_person_phone_numbers where ecm_person_id=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index f37b231c33..6a516a5081 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -23,7 +23,7 @@ public void test() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ecmc_person"); assertSql(sql.get(1)).contains("insert into ecmc_person_phone"); assertSqlBind(sql, 2, 3); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 92e8935ac3..868f31ee8c 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -45,8 +45,8 @@ public void test() { sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); - assertSqlBind(sql, 4, 6); + assertThat(sql).hasSize(9); + assertSqlBind(sql, 5, 7); } else { assertThat(sql).hasSize(5); } @@ -73,8 +73,8 @@ public void test() { sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(5); // cache hit - assertSqlBind(sql, 3, 4); + assertThat(sql).hasSize(7); // cache hit + assertSqlBind(sql, 4, 5); } else { assertThat(sql).hasSize(3); // cache hit } diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 91ac844972..cec750a084 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -23,7 +23,7 @@ void test() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ecs_person"); assertSql(sql.get(1)).contains("insert into ecs_person_phone"); assertSqlBind(sql, 2, 3); @@ -104,12 +104,12 @@ private void updateBoth(EcsPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecs_person_phone where ecs_person_id=?"); assertSqlBind(sql.get(2)); - assertThat(sql.get(3)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)"); - assertSqlBind(sql, 4, 6); + assertThat(sql.get(4)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)"); + assertSqlBind(sql, 5, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("update ecs_person set name=?, version=? where id=? and version=?"); @@ -139,11 +139,11 @@ private void updateOnlyCollection(EcsPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)"); - assertSqlBind(sql, 3, 6); + assertSql(sql.get(3)).contains("insert into ecs_person_phone (ecs_person_id,phone) values (?,?)"); + assertSqlBind(sql, 4, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("delete from ecs_person_phone where ecs_person_id=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index 003c721a43..0c56cb168a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -29,17 +29,20 @@ public void test() { save(top); final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(9); + assertThat(sql).hasSize(13); assertSql(sql.get(0)).contains("insert into ecs_person"); assertSql(sql.get(1)).contains("-- bind"); - assertSql(sql.get(2)).contains("insert into ec_top"); - assertThat(sql.get(3)).contains("-- bind"); - assertThat(sql.get(4)).contains("insert into ecs_person_phone"); - assertThat(sql.get(5)).contains("-- bind"); - assertThat(sql.get(6)).contains("-- bind"); - assertThat(sql.get(7)).contains("insert into ec_top_ecs_person"); + assertThat(sql.get(2)).contains("-- executeBatch"); + assertSql(sql.get(3)).contains("insert into ec_top"); + assertThat(sql.get(4)).contains("-- bind"); + assertThat(sql.get(6)).contains("insert into ecs_person_phone"); + assertThat(sql.get(7)).contains("-- bind"); assertThat(sql.get(8)).contains("-- bind"); + assertThat(sql.get(9)).contains("insert into ec_top_ecs_person"); + assertThat(sql.get(10)).contains("-- bind"); + assertThat(sql.get(11)).contains("-- executeBatch() rows:2 sql:insert into ecs_person_phone"); + assertThat(sql.get(12)).contains("-- executeBatch() rows:1 sql:insert into ec_top_ecs_person"); } @Transactional(batchSize = 20) diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index a3ec36ab72..29c03adc97 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -23,7 +23,7 @@ public void test() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ecbl_person"); assertSql(sql.get(1)).contains("insert into ecbl_person_phone_numbers"); assertSqlBind(sql, 2, 3); @@ -103,12 +103,12 @@ private void updateBoth(EcblPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecbl_person_phone_numbers where person_id=?"); assertSqlBind(sql.get(2)); - assertThat(sql.get(3)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); - assertSqlBind(sql, 4, 6); + assertThat(sql.get(4)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); + assertSqlBind(sql, 5, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("update ecbl_person set name=?, version=? where id=? and version=?"); @@ -138,11 +138,11 @@ private void updateOnlyCollection(EcblPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); - assertSqlBind(sql, 3, 6); + assertSql(sql.get(3)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); + assertSqlBind(sql, 4, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 9aef4c0296..556d2bdb4c 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -48,11 +48,11 @@ void test() { sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(5); // update of collection only + assertThat(sql).hasSize(7); // update of collection only assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); - assertSqlBind(sql, 3, 4); + assertSql(sql.get(3)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); + assertSqlBind(sql, 4, 5); } else { assertThat(sql).hasSize(3); // update of collection only assertSql(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?"); @@ -77,7 +77,7 @@ void test() { DB.save(three); sql = LoggedSql.collect(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); EcblPerson four = DB.find(EcblPerson.class) .setId(person.getId()) diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java index 44fa51e7bf..a0fde93343 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java @@ -49,11 +49,11 @@ void test() { sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(5); // update of collection only + assertThat(sql).hasSize(7); // update of collection only assertSql(sql.get(0)).contains("delete from ecbl_person2_phone_numbers where person_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ecbl_person2_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); - assertSqlBind(sql, 3, 4); + assertSql(sql.get(3)).contains("insert into ecbl_person2_phone_numbers (person_id,country_code,area,phnum) values (?,?,?,?)"); + assertSqlBind(sql, 4, 5); } else { assertThat(sql).hasSize(3); // update of collection only assertSql(sql.get(0)).contains("delete from ecbl_person2_phone_numbers where person_id=?"); @@ -77,7 +77,7 @@ void test() { DB.save(three); sql = LoggedSql.collect(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); EcblPerson2 four = DB.find(EcblPerson2.class) .setId(person.getId()) diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index bc3cacff1f..95f4bfaeeb 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -24,10 +24,11 @@ public void test() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("insert into ecbm_person"); assertSql(sql.get(1)).contains("insert into ecbm_person_phone_numbers"); assertSqlBind(sql, 2, 3); + assertThat(sql.get(4)).contains(" -- executeBatch"); } else { assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("insert into ecbm_person"); @@ -96,11 +97,11 @@ private void updateBoth(EcbmPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?"); assertSql(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?"); - assertThat(sql.get(3)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,phnum)"); - assertSqlBind(sql, 4, 6); + assertThat(sql.get(4)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,phnum)"); + assertSqlBind(sql, 5, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?"); @@ -130,11 +131,11 @@ private void updateOnlyCollection(EcbmPerson bean) { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,phnum) values (?,?,?,?,?)"); - assertSqlBind(sql, 3, 6); + assertSql(sql.get(3)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,phnum) values (?,?,?,?,?)"); + assertSqlBind(sql, 4, 7); } else { assertThat(sql).hasSize(5); assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 96fa04c78d..b10947d65c 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -49,11 +49,11 @@ public void test() { sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(5); // update of collection only + assertThat(sql).hasSize(7); // update of collection only assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,phnum) values (?,?,?,?,?)"); - assertSqlBind(sql, 3, 4); + assertSql(sql.get(3)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,phnum) values (?,?,?,?,?)"); + assertSqlBind(sql, 4, 5); } else { assertThat(sql).hasSize(4); // update of collection only assertSql(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?"); @@ -79,7 +79,7 @@ public void test() { DB.save(three); sql = LoggedSql.collect(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); EcbmPerson four = DB.find(EcbmPerson.class) .setId(person.getId()) diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 780564b83c..b9afd5fa2d 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -33,21 +33,23 @@ public void base() { DB.save(jack); List sql = LoggedSql.collect(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("update oto_cust set version=? where cid=? and version=?"); - assertThat(sql.get(3)).contains("insert into oto_cust_address "); - assertThat(sql.get(4)).contains("-- bind("); + assertThat(sql.get(2)).contains("-- executeBatch"); + assertSql(sql.get(3)).contains("update oto_cust set version=? where cid=? and version=?"); + assertThat(sql.get(4)).contains("insert into oto_cust_address "); + assertThat(sql.get(5)).contains("-- bind("); jack.setAddress(null); DB.save(jack); sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from oto_cust_address where aid=? and version=?"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("update oto_cust set version=? where cid=? and version=?"); + assertThat(sql.get(2)).contains("-- executeBatch"); + assertSql(sql.get(3)).contains("update oto_cust set version=? where cid=? and version=?"); OtoCustAddress foundAddress = DB.find(OtoCustAddress.class, address2.getAid()); assertThat(foundAddress).isNull(); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 698a17dc7f..b38c754b11 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -25,10 +25,10 @@ public void test_updateInsert() { DB.save(b); List update = LoggedSql.collect(); - assertThat(update).hasSize(3); + assertThat(update).hasSize(4); assertThat(update.get(0)).contains("insert into oto_aone"); assertSqlBind(update.get(1)); - assertThat(update.get(2)).contains("update oto_atwo set aone_id=? where id=?"); + assertThat(update.get(3)).contains("update oto_atwo set aone_id=? where id=?"); DB.delete(b); @@ -51,10 +51,10 @@ public void test_cascade() { DB.save(b); List inserts = LoggedSql.collect(); - assertThat(inserts).hasSize(3); + assertThat(inserts).hasSize(4); assertThat(inserts.get(0)).contains("insert into oto_aone"); assertSqlBind(inserts.get(1)); - assertThat(inserts.get(2)).contains("insert into oto_atwo"); + assertThat(inserts.get(3)).contains("insert into oto_atwo"); DB.delete(b); @@ -82,12 +82,12 @@ public void test_remove() { DB.save(b); List sql = LoggedSql.collect(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("insert into oto_aone"); assertSqlBind(sql.get(1)); - assertSql(sql.get(2)).contains("update oto_atwo set aone_id=? where id=?"); - assertThat(sql.get(3)).contains("delete from oto_aone where id=?"); - assertSqlBind(sql.get(4)); + assertSql(sql.get(3)).contains("update oto_atwo set aone_id=? where id=?"); + assertThat(sql.get(4)).contains("delete from oto_aone where id=?"); + assertSqlBind(sql.get(5)); DB.delete(b); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index 6da1a4ecd3..53d6d59325 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -204,7 +204,7 @@ public void ebean_deleteAll_when_softDelete() { DB.deleteAll(beans); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); } else { @@ -223,7 +223,7 @@ public void deleteAll_when_softDelete() { DB.deleteAll(beans); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); } @@ -246,7 +246,7 @@ public void deleteAll_when_softDelete_withTransaction() { } List sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); if (isPersistBatchOnCascade()) { assertSql(sql.get(0)).contains("update cover set deleted=? where id=?"); } @@ -266,7 +266,7 @@ public void deleteAllPermanent_when_softDelete() { DB.deleteAllPermanent(beans); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from cover where id=?"); } @@ -284,7 +284,7 @@ public void deleteAllPermanent_when_softDelete_withTransaction() { } List sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from cover where id=?"); } diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index 8712ce8f33..df01d1bf78 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -30,7 +30,7 @@ public void clear_expect_deletes() { assertThat(DB.find(OrpDetail.class, "d1")).isNull(); assertThat(DB.find(OrpDetail.class, "d2")).isNull(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("delete from orp_detail where id=?"); assertSqlBind(sql, 1, 2); } diff --git a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java index 9dc6df3e2e..501306ebfa 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java +++ b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java @@ -25,10 +25,10 @@ public void saveCascade() { grandparent.save(); final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertSql(sql.get(0)).contains("insert into tree_entity"); assertSql(sql.get(1)).contains("insert into tree_entity"); - assertThat(sql.get(3)).contains("insert into tree_entity"); + assertThat(sql.get(4)).contains("insert into tree_entity"); } } diff --git a/ebean-test/src/test/java/org/tests/o2m/StatefulO2MSoftDelete.java b/ebean-test/src/test/java/org/tests/o2m/StatefulO2MSoftDelete.java index ab44e37d6e..22c9e1e3b3 100644 --- a/ebean-test/src/test/java/org/tests/o2m/StatefulO2MSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/o2m/StatefulO2MSoftDelete.java @@ -36,8 +36,8 @@ void statefulUpdateShouldntDelete() { var updateSql = LoggedSql.stop(); updateSql.forEach(sql -> assertThat(sql).doesNotContain("delete from workflow_entity")); if (isH2()) { - assertThat(updateSql.get(4)).contains("update workflow_operation_entity set deleted=true where workflow_id = ?"); - assertThat(updateSql.get(6)).contains("update workflow_entity set when_modified=?, deleted=? where id=?"); + assertThat(updateSql.get(5)).contains("update workflow_operation_entity set deleted=true where workflow_id = ?"); + assertThat(updateSql.get(8)).contains("update workflow_entity set when_modified=?, deleted=? where id=?"); } } } diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java index 19e5abbbec..eda78efe82 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyStatelessUpdateResultsInSoftDelete.java @@ -141,7 +141,7 @@ void duplicateKeyWorkflowEntityInsertInsteadOfUpdate() { DB.save(goodsAfterInsert); var sql = LoggedSql.collect(); if (isH2() || isPostgresCompatible()) { // using deleted=true vs deleted=1 - assertThat(sql).hasSize(2); + assertThat(sql).hasSize(3); assertThat(sql.get(0)).contains("update workflow_operation_entity set deleted=true where workflow_id = ?"); } @@ -166,14 +166,14 @@ void duplicateKeyWorkflowEntityInsertInsteadOfUpdate() { sql = LoggedSql.collect(); assertThat(sql).isNotEmpty(); if (isH2() || isPostgresCompatible()) { // using deleted=true vs deleted=1 - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(10); assertThat(sql.get(0)).contains("update workflow_entity set when_modified=? where id=?"); assertThat(sql.get(1)).contains(" -- bind("); - assertThat(sql.get(2)).contains("update workflow_operation_entity set deleted=true where workflow_id = ?"); - assertThat(sql.get(3)).contains(" -- bind("); - assertThat(sql.get(4)).contains("insert into workflow_operation_entity (name, version, when_created, when_modified"); - assertThat(sql.get(5)).contains(" -- bind("); - assertThat(sql.get(6)).contains("update goods_entity set when_modified=?, workflow_entity_id=? where id=?"); + assertThat(sql.get(3)).contains("update workflow_operation_entity set deleted=true where workflow_id = ?"); + assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(6)).contains("insert into workflow_operation_entity (name, version, when_created, when_modified"); + assertThat(sql.get(7)).contains(" -- bind("); + assertThat(sql.get(9)).contains("update goods_entity set when_modified=?, workflow_entity_id=? where id=?"); } var ops = workflow.getOperations(); @@ -218,12 +218,12 @@ void softDeleteIncludedInQuery() throws Exception { var sql = LoggedSql.collect(); if (isH2() || isPostgresCompatible()) { // using deleted=true vs deleted=1 - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertThat(sql.get(0)).contains("update workflow_entity set when_modified=? where id=?"); assertThat(sql.get(1)).contains(" -- bind("); - assertThat(sql.get(2)).contains("update workflow_operation_entity set deleted=true where workflow_id = ?"); - assertThat(sql.get(3)).contains(" -- bind("); - assertThat(sql.get(4)).contains("update goods_entity set when_modified=?, workflow_entity_id=? where id=?"); + assertThat(sql.get(3)).contains("update workflow_operation_entity set deleted=true where workflow_id = ?"); + assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(6)).contains("update goods_entity set when_modified=?, workflow_entity_id=? where id=?"); } try (var writer = new StringWriter()) { @@ -296,12 +296,12 @@ void setArrayListDoInsertInsteadUpdate() { assertThat(sql).isNotEmpty(); assertThat(sql.get(0)).contains("delete from attachment where goods_entity_id = ?"); assertThat(sql.get(1)).contains(" -- bind("); - assertThat(sql.get(2)).contains("insert into attachment (id, goods_entity_id, name, "); - assertThat(sql.get(3)).contains(" -- bind("); + assertThat(sql.get(3)).contains("insert into attachment (id, goods_entity_id, name, "); assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(5)).contains(" -- bind("); if (isH2() || isPostgresCompatible() || isMySql()) { // i.e. using identity, not using sequence - assertThat(sql.get(5)).contains("insert into attachment (goods_entity_id, name,"); - assertThat(sql.get(6)).contains(" -- bind("); + assertThat(sql.get(6)).contains("insert into attachment (goods_entity_id, name,"); + assertThat(sql.get(7)).contains(" -- bind("); } persistedGoods = DB.find(GoodsEntity.class, goods.getId()); @@ -328,13 +328,13 @@ void setArrayListDoInsertInsteadUpdate() { assertThat(sql.get(1)).contains(" -- bind("); assertThat(sql.get(2)).contains(" -- bind("); assertThat(sql.get(3)).contains(" -- bind("); - assertThat(sql.get(4)).contains("insert into attachment (id, goods_entity_id, name,"); - assertThat(sql.get(5)).contains(" -- bind("); + assertThat(sql.get(5)).contains("insert into attachment (id, goods_entity_id, name,"); assertThat(sql.get(6)).contains(" -- bind("); + assertThat(sql.get(7)).contains(" -- bind("); if (isH2() || isPostgresCompatible()) { // using identity, not using sequence - assertThat(sql).hasSize(9); - assertThat(sql.get(7)).contains("insert into attachment (goods_entity_id, name, "); - assertThat(sql.get(8)).contains(" -- bind("); + assertThat(sql).hasSize(12); + assertThat(sql.get(8)).contains("insert into attachment (goods_entity_id, name, "); + assertThat(sql.get(9)).contains(" -- bind("); } var persistedGoods2 = DB.find(GoodsEntity.class, goods.getId()); diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 5c295e5eab..70c1442983 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -38,7 +38,7 @@ public void base() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into troop_monkey (troop_pid, monkey_mid) values (?, ?)"); assertSqlBind(sql, 1, 2); @@ -96,14 +96,14 @@ private void insertWithCascade() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(13); + assertThat(sql).hasSize(16); assertSql(sql.get(0)).contains("insert into trainer "); assertSql(sql.get(1)).contains("insert into monkey "); assertSqlBind(sql, 2, 4); - assertThat(sql.get(5)).contains("update monkey set food_preference=?, version=? where mid=? and version=?"); - assertThat(sql.get(6)).contains("-- bind("); - assertThat(sql.get(7)).contains("insert into trainer_monkey "); - assertSqlBind(sql, 8, 12); + assertThat(sql.get(6)).contains("update monkey set food_preference=?, version=? where mid=? and version=?"); + assertThat(sql.get(7)).contains("-- bind("); + assertThat(sql.get(9)).contains("insert into trainer_monkey "); + assertSqlBind(sql, 10, 14); } else { assertThat(sql).hasSize(10); diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index 818bf8b85d..ba3fa1a53d 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -35,20 +35,20 @@ public void testSave() { List sql = LoggedSql.collect(); - assertThat(sql).hasSize(11); + assertThat(sql).hasSize(14); assertSql(sql.get(0)).contains("insert into class_super "); if (idType() == IdType.IDENTITY) { assertSql(sql.get(1)).contains("-- bind(ClassA)"); assertSql(sql.get(2)).contains("-- bind(ClassB)"); } - assertThat(sql.get(3)).contains("insert into monkey "); + assertThat(sql.get(4)).contains("insert into monkey "); if (idType() == IdType.IDENTITY) { - assertThat(sql.get(4)).contains("-- bind(Sim"); - assertThat(sql.get(5)).contains("-- bind(Tim"); - assertThat(sql.get(6)).contains("-- bind(Uim"); - assertThat(sql.get(7)).contains("insert into class_super_monkey (class_super_sid, monkey_mid) values (?, ?)"); + assertThat(sql.get(5)).contains("-- bind(Sim"); + assertThat(sql.get(6)).contains("-- bind(Tim"); + assertThat(sql.get(7)).contains("-- bind(Uim"); + assertThat(sql.get(9)).contains("insert into class_super_monkey (class_super_sid, monkey_mid) values (?, ?)"); } - assertSqlBind(sql, 8, 10); + assertSqlBind(sql, 10, 12); ClassA dbA = DB.find(ClassA.class, 1); ClassB dbB = DB.find(ClassB.class, 2); diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index 792d58e2b5..06c2e620aa 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -38,7 +38,7 @@ public void base() { List sql = LoggedSql.collect(); if (isPersistBatchOnCascade()) { - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)"); assertSqlBind(sql, 1, 2); } else { diff --git a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java index 54587376d8..ea4dea33aa 100644 --- a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java @@ -100,7 +100,7 @@ void testModifyTree() { LoggedSql.start(); DB.save(result); final List sql = LoggedSql.collect(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertThat(sql.get(0)).contains("update order_toy set title=?, sort_order=? where id=?"); assertThat(sql.get(1)).contains("bind(tt10"); @@ -138,10 +138,10 @@ void testRemoveElement() { DB.save(result); final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(6); assertSql(sql.get(0)).contains("delete from order_toy where id=?"); - assertSql(sql.get(2)).contains("update order_toy set sort_order=? where id=?"); - assertSql(sql.get(3)).contains("bind(2,"); + assertSql(sql.get(3)).contains("update order_toy set sort_order=? where id=?"); + assertSql(sql.get(4)).contains("bind(2,"); } } diff --git a/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java b/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java index eefe0482d7..2c3c5f30b0 100644 --- a/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java +++ b/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java @@ -68,11 +68,11 @@ void beanMap_when_clear_thenAddSave() { DB.save(dept); sql = LoggedSql.collect(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertThat(sql.get(0)).contains("delete from map_emp where id=?"); assertThat(sql.get(1)).contains(" -- bind"); assertThat(sql.get(2)).contains(" -- bind"); - assertThat(sql.get(3)).contains("insert into map_emp (code, name, department_id) values (?,?,?)"); - assertThat(sql.get(4)).contains(" -- bind"); + assertThat(sql.get(4)).contains("insert into map_emp (code, name, department_id) values (?,?,?)"); + assertThat(sql.get(5)).contains(" -- bind"); } } diff --git a/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java b/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java index f5fd876162..da585f7930 100644 --- a/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java +++ b/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java @@ -67,7 +67,7 @@ void beanMap_when_clear_thenAddSave() { DB.save(dept); sql = LoggedSql.collect(); - assertThat(sql).hasSize(2); + assertThat(sql).hasSize(3); assertThat(sql.get(0)).contains("insert into map_emp2 (code, name, department_id) values (?,?,?)"); assertThat(sql.get(1)).contains(" -- bind"); } diff --git a/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java b/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java index 06a76b2514..5da6dca4b8 100644 --- a/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java +++ b/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java @@ -60,11 +60,12 @@ void beanSet_when_clear_thenAddSave() { DB.save(dept); sql = LoggedSql.collect(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertThat(sql.get(0)).contains("delete from o2_memp where id=?"); assertThat(sql.get(1)).contains(" -- bind"); assertThat(sql.get(2)).contains(" -- bind"); - assertThat(sql.get(3)).contains("insert into o2_memp (id, code, name, department_id) values (?,?,?,?)"); - assertThat(sql.get(4)).contains(" -- bind"); + assertThat(sql.get(3)).contains("-- executeBatch"); + assertThat(sql.get(4)).contains("insert into o2_memp (id, code, name, department_id) values (?,?,?,?)"); + assertThat(sql.get(5)).contains(" -- bind"); } } diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java index 54b93195f7..dd8bd30955 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java @@ -40,7 +40,7 @@ public void test() { DB.update(upd); List sql = LoggedSql.collect(); - assertThat(sql).hasSize(6); + assertThat(sql).hasSize(8); assertSql(sql.get(0)).contains("update esd_master set name=? where id=?"); if (isPlatformBooleanNative()) { assertSql(sql.get(1)).contains("update esd_detail set deleted=true where master_id = ? and not"); diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 7018883a8f..ad84cd9eda 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -72,7 +72,7 @@ public void multipleTopLevel_expect_singleFlush() { // DEBUG io.ebean.SUM - txn[1001] BatchControl flush [MnyB:100 i:2, Role:101 i:2, MnyTopic:102 i:2] - assertThat(sql).hasSize(9); + assertThat(sql).hasSize(12); // first saved to batch - (depth 100) assertSql(sql.get(0)).contains("insert into mny_b"); @@ -81,14 +81,14 @@ public void multipleTopLevel_expect_singleFlush() { assertSql(sql.get(2)).contains(" -- bind(BatchMultipleTop_1"); } // second saved to batch - (depth 101) - assertThat(sql.get(3)).contains("insert into mt_role"); - assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(4)).contains("insert into mt_role"); assertThat(sql.get(5)).contains(" -- bind("); + assertThat(sql.get(6)).contains(" -- bind("); // third saved to batch - (depth 102) - assertThat(sql.get(6)).contains("insert into mny_topic"); + assertThat(sql.get(8)).contains("insert into mny_topic"); if (idType() == IdType.IDENTITY) { - assertThat(sql.get(7)).contains(" -- bind(MnyTopic_0"); - assertThat(sql.get(8)).contains(" -- bind(MnyTopic_1"); + assertThat(sql.get(9)).contains(" -- bind(MnyTopic_0"); + assertThat(sql.get(10)).contains(" -- bind(MnyTopic_1"); } DB.delete(t0); diff --git a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 8d5e87505f..050a8ec55f 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -48,11 +48,11 @@ public void insertFlush_mutateFlush_expect_update() { EBasicVer found = DB.find(EBasicVer.class, newBean.getId()); assertThat(found.getName()).isEqualTo("make it dirty - auto save"); - assertThat(sql).hasSize(4); + assertThat(sql).hasSize(6); assertThat(sql.get(0)).contains("insert into e_basicver"); assertThat(sql.get(1)).contains(" -- bind("); - assertThat(sql.get(2)).contains("update e_basicver set name=?, last_update=? where id=? and last_update=?"); - assertThat(sql.get(3)).contains(" -- bind("); + assertThat(sql.get(3)).contains("update e_basicver set name=?, last_update=? where id=? and last_update=?"); + assertThat(sql.get(4)).contains(" -- bind("); DB.delete(found); } @@ -248,17 +248,18 @@ public void updateReferenceOnlyWithPersistCascade_Insert_andUpdateForeignKey() { assertThat(checkOrder.getCustomer().getName()).isEqualTo("newCust CascadePersist"); assertThat(checkOrder.getShipments().size()).isEqualTo(1); - assertThat(sql).hasSize(10); + assertThat(sql).hasSize(14); assertSql(sql.get(0)).contains("select t0.id, t0.status, t0.order_date"); assertThat(sql.get(1)).contains("insert into o_customer"); assertThat(sql.get(2)).contains(" -- bind("); - assertThat(sql.get(3)).contains("update o_order set updtime=?, kcustomer_id=? where id=? and updtime=?"); - assertThat(sql.get(4)).contains(" -- bind("); - assertSql(sql.get(5)).contains("select t0.order_id, t0.id, t0.ship_time, t0.cretime, t0.updtime, t0.version, t0.order_id from or_order_ship"); - assertThat(sql.get(6)).contains("delete from or_order_ship"); - assertThat(sql.get(7)).contains(" -- bind("); - assertThat(sql.get(8)).contains("insert into or_order_ship"); + assertThat(sql.get(3)).contains(" -- executeBatch"); + assertThat(sql.get(4)).contains("update o_order set updtime=?, kcustomer_id=? where id=? and updtime=?"); + assertThat(sql.get(5)).contains(" -- bind("); + assertSql(sql.get(7)).contains("select t0.order_id, t0.id, t0.ship_time, t0.cretime, t0.updtime, t0.version, t0.order_id from or_order_ship"); + assertThat(sql.get(8)).contains("delete from or_order_ship"); assertThat(sql.get(9)).contains(" -- bind("); + assertThat(sql.get(11)).contains("insert into or_order_ship"); + assertThat(sql.get(12)).contains(" -- bind("); DB.delete(checkOrder); DB.delete(Customer.class, checkOrder.getCustomer().getId()); diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index ccbfc084b7..b8108dcf7a 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -62,7 +62,7 @@ public void testExecute_inTransaction_withBatch() { } List sql = LoggedSql.stop(); - assertThat(sql).hasSize(3); + assertThat(sql).hasSize(4); assertSql(sql.get(0)).contains("update audit_log set description = description where id = ?"); assertSqlBind(sql, 1, 2); } diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index df45afd86c..7fcc602096 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -347,12 +347,14 @@ public void testStatelessRecursiveUpdateWithChangesInDetailOnly() { DB.update(updateCustomer); final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertThat(sql.get(0)).contains("update o_customer set updtime=? where id=?"); assertThat(sql.get(1)).contains("insert into contact"); assertThat(sql.get(2)).contains(" -- bind("); - assertThat(sql.get(3)).contains("update contact set last_name=?, customer_id=? where id=?"); - assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(3)).contains(" -- executeBatch"); + assertThat(sql.get(4)).contains("update contact set last_name=?, customer_id=? where id=?"); + assertThat(sql.get(5)).contains(" -- bind("); + assertThat(sql.get(6)).contains(" -- executeBatch"); // assert Customer assCustomer = DB.find(Customer.class, customer.getId()); @@ -402,12 +404,13 @@ public void testStatelessRecursiveUpdateWithChangesInDetailOnlyAnd() { DB.update(updateCustomer); final List sql = LoggedSql.stop(); - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertThat(sql.get(0)).contains("update o_customer set updtime=? where id=?"); assertThat(sql.get(1)).contains("insert into contact"); assertThat(sql.get(2)).contains(" -- bind("); - assertThat(sql.get(3)).contains("update contact set last_name=?, customer_id=? where id=?"); - assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(3)).contains(" -- executeBatch"); + assertThat(sql.get(4)).contains("update contact set last_name=?, customer_id=? where id=?"); + assertThat(sql.get(5)).contains(" -- bind("); // assert Customer assCustomer = DB.find(Customer.class, customer.getId()); From b80c67286ba16ff0509774fb2438678040ebac03 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 01:02:11 +1300 Subject: [PATCH 124/240] Change SQL log to include executeBatch() via BatchedPstmt Adjustments to tests to support this --- .../TestElementCollectionCascadeMultiple.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index 0c56cb168a..1b43781248 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -41,8 +41,8 @@ public void test() { assertThat(sql.get(8)).contains("-- bind"); assertThat(sql.get(9)).contains("insert into ec_top_ecs_person"); assertThat(sql.get(10)).contains("-- bind"); - assertThat(sql.get(11)).contains("-- executeBatch() rows:2 sql:insert into ecs_person_phone"); - assertThat(sql.get(12)).contains("-- executeBatch() rows:1 sql:insert into ec_top_ecs_person"); + assertThat(sql.get(11)).contains("-- executeBatch() size:2 sql:insert into ecs_person_phone"); + assertThat(sql.get(12)).contains("-- executeBatch() size:1 sql:insert into ec_top_ecs_person"); } @Transactional(batchSize = 20) From 80fc0723c8c8cd47cf2611c5196d9c2b980147fe Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 21:24:35 +1300 Subject: [PATCH 125/240] Failing test for OneToOne with SoftDelete join missing deleted predicate --- .../model/softdelete/ESoftDelOneBOwner.java | 59 +++++++++++++++++++ .../softdelete/TestSoftDeleteOtoImported.java | 47 +++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneBOwner.java create mode 100644 ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoImported.java diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneBOwner.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneBOwner.java new file mode 100644 index 0000000000..e2303d5593 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneBOwner.java @@ -0,0 +1,59 @@ +package org.tests.model.softdelete; + +import io.ebean.annotation.SoftDelete; +import jakarta.persistence.*; + +@SuppressWarnings("unused") +@Entity +public class ESoftDelOneBOwner { + + @Id + long id; + + String name; + + @ManyToOne + ESoftDelOneB oneb; + + @SoftDelete + boolean deleted; + + @Version + long version; + + public ESoftDelOneBOwner(String name) { + 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 ESoftDelOneB oneb() { + return oneb; + } + + public void setOneb(ESoftDelOneB oneb) { + this.oneb = oneb; + } + + public long getVersion() { + return version; + } + + public void setVersion(long version) { + this.version = version; + } +} diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoImported.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoImported.java new file mode 100644 index 0000000000..f420f2bb24 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoImported.java @@ -0,0 +1,47 @@ +package org.tests.softdelete; + +import io.ebean.DB; +import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.Test; +import org.tests.model.softdelete.ESoftDelOneA; +import org.tests.model.softdelete.ESoftDelOneB; +import org.tests.model.softdelete.ESoftDelOneBOwner; + +import static org.assertj.core.api.Assertions.assertThat; + +class TestSoftDeleteOtoImported extends BaseTestCase { + + @Test + void extraJoinToOtoImported_expect_softDeletePredicate() { + ESoftDelOneB b = new ESoftDelOneB("xbImported"); + DB.save(b); + + ESoftDelOneA a = new ESoftDelOneA("xaImported"); + a.setOneb(b); + DB.save(a); + + ESoftDelOneBOwner co = new ESoftDelOneBOwner("xoImport"); + co.setOneb(b); + DB.save(co); + + LoggedSql.start(); + var listResult = DB.find(ESoftDelOneBOwner.class) + .where() + .eq("oneb.onea.name", "xaImported") + .findList(); + + var countResult = DB.find(ESoftDelOneBOwner.class) + .where() + .eq("oneb.onea.name", "xaImported") + .findCount(); + + var sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + + assertThat(listResult).hasSize(1); + assertThat(countResult).isEqualTo(1); + assertThat(sql.get(0)).contains("and t2.deleted = "); + assertThat(sql.get(1)).contains("and t2.deleted = "); + } +} From 5684919a9fb7e781a4bf82e7691df53ef9ac7e57 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 21:27:26 +1300 Subject: [PATCH 126/240] Fix for OneToOne with SoftDelete join missing deleted predicate --- .../io/ebeaninternal/server/deploy/DbSqlContext.java | 6 ++++++ .../ebeaninternal/server/query/DefaultDbSqlContext.java | 9 ++++++++- .../ebeaninternal/server/query/SqlTreeNodeExtraJoin.java | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java index be515b634a..522aff8471 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java @@ -148,4 +148,10 @@ public interface DbSqlContext { * Add extra joins *IF* required to support inheritance discriminator in projection. */ void flushExtraJoins(); + + /** + * Return true if the last join was added and false means the join was suppressed + * as it was already added to the query. + */ + boolean joinAdded(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java index 9488ad1189..7e5df0f3f2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java @@ -38,6 +38,7 @@ final class DefaultDbSqlContext implements DbSqlContext { private final CQueryDraftSupport draftSupport; private final CQueryHistorySupport historySupport; private final boolean historyQuery; + private boolean joinSuppressed; DefaultDbSqlContext(SqlTreeAlias alias, String columnAliasPrefix, CQueryHistorySupport historySupport, CQueryDraftSupport draftSupport, String fromForUpdate) { @@ -50,6 +51,11 @@ final class DefaultDbSqlContext implements DbSqlContext { this.fromForUpdate = fromForUpdate; } + @Override + public boolean joinAdded() { + return !joinSuppressed; + } + @Override public boolean isIncludeSoftDelete() { return alias.isIncludeSoftDelete(); @@ -118,9 +124,10 @@ public void addJoin(String type, String table, TableJoinColumn[] cols, String a1 } String joinKey = table + "-" + a1 + "-" + a2; if (tableJoins.contains(joinKey)) { + joinSuppressed = true; return; } - + joinSuppressed = false; tableJoins.add(joinKey); sb.append(' ').append(type); boolean addAsOfOnClause = false; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index 9b88064067..43a3953cb8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -145,7 +145,7 @@ public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) { assocBeanProperty.appendFrom(ctx, joinType, null); } joinType = assocBeanProperty.addJoin(joinType, prefix, ctx); - if (!oneToOneExported && assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) { + if (ctx.joinAdded() && assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) { ctx.append(" and ").append(assocBeanProperty.softDeletePredicate(ctx.tableAlias(prefix))); } } From 131d531922a7516b685d399e300118d5cc25ef42 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 21:32:28 +1300 Subject: [PATCH 127/240] #3240 followup no functional change, tidy use of ctx.joinAdded() --- .../io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java | 4 +++- .../ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index 43a3953cb8..6c5a2ead1a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -10,6 +10,8 @@ import java.util.List; import java.util.Set; +import static io.ebeaninternal.api.SpiQuery.TemporalMode.SOFT_DELETED; + /** * The purpose is to add an extra join to the query. *

@@ -145,7 +147,7 @@ public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) { assocBeanProperty.appendFrom(ctx, joinType, null); } joinType = assocBeanProperty.addJoin(joinType, prefix, ctx); - if (ctx.joinAdded() && assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) { + if (temporalMode != SOFT_DELETED && ctx.joinAdded() && assocBeanProperty.isTargetSoftDelete()) { ctx.append(" and ").append(assocBeanProperty.softDeletePredicate(ctx.tableAlias(prefix))); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java index 325f58ceaa..ada05c4c97 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java @@ -88,14 +88,14 @@ private void appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) { if (nodeBeanProp instanceof STreePropertyAssocOne) { nodeBeanProp.addJoin(joinType, parentAlias, alias, ctx); - if (softDelete) { + if (softDelete && ctx.joinAdded()) { ctx.append(" and ").append(target.softDeletePredicate(alias)); } } else { STreePropertyAssocMany manyProp = (STreePropertyAssocMany) nodeBeanProp; if (!manyProp.hasJoinTable()) { manyProp.addJoin(joinType, parentAlias, alias, ctx); - if (softDelete) { + if (softDelete && ctx.joinAdded()) { ctx.append(" and ").append(target.softDeletePredicate(alias)); } } else { From 90a6b71b7e8fe5546ee4c9a86c5b4d576e1bd6bb Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 21:33:23 +1300 Subject: [PATCH 128/240] #3240 followup no functional change, tidy use of ctx.joinAdded() --- ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index e48d2be8ed..e18f2983ea 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -331,7 +331,6 @@ public void fullMonty() { assertThat(sql.get(17)).contains("update mcontact set email=?, first_name=?, last_name=?, version=?, customer_id=? where id=? and version=?"); assertSqlBind(sql, 18, 21); assertThat(sql.get(23)).contains("update mcontact_message set title=?, subject=?, notes=?, version=?, contact_id=? where id=? and version=?"); - assertSqlBind(sql, 24, 29); } } From e5f64f42116429b9e75fe8b9d105d9be4b55d415 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 21:38:17 +1300 Subject: [PATCH 129/240] Fix test with sql logging including executeBatch() --- .../cascade/TestOrphanCollectionReplacement.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java index 7311719c74..4b1313afc9 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java @@ -97,25 +97,25 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithManyReplacement() { assertThat(sql.get(9)).contains(" -- bind("); } if (isPostgresCompatible()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertThat(sql.get(0)).contains("select t0.id from coone_many t0 where coone_id=? and t0.deleted = false and t0.deleted = false; --bind"); // find all Ids assertThat(sql.get(1)).contains("update coone_many set deleted=true where id = any(?"); assertThat(sql.get(2)).contains(" -- bind(Array[1000]="); // update first 1000 assertThat(sql.get(3)).contains(" -- bind(Array[1000]="); // update first 1000 assertThat(sql.get(4)).contains(" -- bind(Array[500]="); // update last 500 - assertThat(sql.get(5)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); - assertThat(sql.get(6)).contains(" -- bind("); + assertThat(sql.get(6)).contains("insert into coone_many (coone_id, name, deleted) values (?,?,?)"); + assertThat(sql.get(7)).contains(" -- bind("); } if (isSqlServer()) { - assertThat(sql).hasSize(7); + assertThat(sql).hasSize(9); assertThat(sql.get(0)).contains("select t0.id from coone_many t0 where coone_id=? and t0.deleted = 0 and t0.deleted = 0; --bind"); // find all Ids assertThat(sql.get(1)).contains("update coone_many set deleted=1 where id in (?,?,?"); assertThat(sql.get(2)).contains(" -- bind(Array[2000]="); // update first 2000 assertThat(sql.get(3)).contains("update coone_many set deleted=1 where id in (?,?,?"); assertThat(sql.get(4)).contains(" -- bind(Array[500]="); // update next 500 - assertThat(sql.get(5)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); - assertThat(sql.get(6)).contains(" -- bind("); + assertThat(sql.get(6)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); + assertThat(sql.get(7)).contains(" -- bind("); } COOne fetchedUser2 = DB.find(COOne.class, parentId); From a1a3b33fc6c9551c3a9fb0607f8d7d5847c4d695 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 21:47:14 +1300 Subject: [PATCH 130/240] Fix test with sql logging including executeBatch() for sqlserver --- .../tests/cascade/TestOrphanCollectionReplacement.java | 10 ++++------ .../test/java/org/tests/query/TestQueryFilterMany.java | 2 +- .../src/test/java/org/tests/sets/TestO2MMap.java | 9 +++++++-- .../src/test/java/org/tests/sets/TestO2MMap2.java | 9 +++++++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java index 4b1313afc9..9cf89ece24 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java @@ -63,12 +63,12 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithFilter() { if (isSqlServer()) { // filter mode - assertThat(sql).hasSize(5); + assertThat(sql).hasSize(7); assertThat(sql.get(0)).contains("select t0.id from coone_many t0 where coone_id=? and t0.deleted = 0 and t0.deleted = 0; --bind"); assertThat(sql.get(1)).contains("update coone_many set deleted=1 where id in (?)"); assertThat(sql.get(2)).contains(" -- bind("); - assertThat(sql.get(3)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); - assertThat(sql.get(4)).contains(" -- bind("); + assertThat(sql.get(4)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); + assertThat(sql.get(5)).contains(" -- bind("); } COOne fetchedUser2 = DB.find(COOne.class, parentId); requireNonNull(fetchedUser2); @@ -108,7 +108,7 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithManyReplacement() { } if (isSqlServer()) { - assertThat(sql).hasSize(9); + assertThat(sql).hasSize(11); assertThat(sql.get(0)).contains("select t0.id from coone_many t0 where coone_id=? and t0.deleted = 0 and t0.deleted = 0; --bind"); // find all Ids assertThat(sql.get(1)).contains("update coone_many set deleted=1 where id in (?,?,?"); assertThat(sql.get(2)).contains(" -- bind(Array[2000]="); // update first 2000 @@ -128,12 +128,10 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithManyReplacement() { .contains("cTest"); // added } - private static List doUpdate(long parentId, Predicate filter) { COOne fetchedParent = DB.find(COOne.class, parentId); assert fetchedParent != null; - List filtered = fetchedParent.getChildren().stream().filter(r -> filter.test(r.getName())).collect(Collectors.toList()); List updatedRoles = new ArrayList<>(); diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java index cecbdd6170..e60462ab20 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -370,7 +370,7 @@ public void testFilterManyUsingExpression() { assertThat(sql).hasSize(1); if (isSqlServer()) { - assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? ) order by t0.id; --bind(rob%)"); + assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ?) order by t0.id; --bind(rob%)"); } else { assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.first_name is not null and lower(t1.email) like ? escape'|') order by t0.id; --bind(rob%)"); } diff --git a/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java b/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java index 2c3c5f30b0..84cc105e22 100644 --- a/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java +++ b/ebean-test/src/test/java/org/tests/sets/TestO2MMap.java @@ -2,6 +2,7 @@ import io.ebean.DB; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.util.List; @@ -9,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class TestO2MMap { +class TestO2MMap extends BaseTestCase { @Test void lazyLoadO2M_when_setWithHashCode_expect_selectProperties() { @@ -72,7 +73,11 @@ void beanMap_when_clear_thenAddSave() { assertThat(sql.get(0)).contains("delete from map_emp where id=?"); assertThat(sql.get(1)).contains(" -- bind"); assertThat(sql.get(2)).contains(" -- bind"); - assertThat(sql.get(4)).contains("insert into map_emp (code, name, department_id) values (?,?,?)"); + if (isSqlServer()) { + assertThat(sql.get(4)).contains("insert into map_emp (id, code, name, department_id) values (?,?,?,?)"); + } else { + assertThat(sql.get(4)).contains("insert into map_emp (code, name, department_id) values (?,?,?)"); + } assertThat(sql.get(5)).contains(" -- bind"); } } diff --git a/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java b/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java index da585f7930..bc09914191 100644 --- a/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java +++ b/ebean-test/src/test/java/org/tests/sets/TestO2MMap2.java @@ -2,6 +2,7 @@ import io.ebean.DB; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.util.List; @@ -9,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class TestO2MMap2 { +class TestO2MMap2 extends BaseTestCase { @Test void lazyLoadO2M_when_setWithHashCode_expect_selectProperties() { @@ -68,7 +69,11 @@ void beanMap_when_clear_thenAddSave() { sql = LoggedSql.collect(); assertThat(sql).hasSize(3); - assertThat(sql.get(0)).contains("insert into map_emp2 (code, name, department_id) values (?,?,?)"); + if (isSqlServer()) { + assertThat(sql.get(0)).contains("insert into map_emp2 (id, code, name, department_id) values (?,?,?,?)"); + } else { + assertThat(sql.get(0)).contains("insert into map_emp2 (code, name, department_id) values (?,?,?)"); + } assertThat(sql.get(1)).contains(" -- bind"); } } From da76b422c8ad4ce4d32537771387d325d7127363 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 22:26:25 +1300 Subject: [PATCH 131/240] Fix test with sql logging including executeBatch() for sqlserver --- .../cascade/TestOrphanCollectionReplacement.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java index 9cf89ece24..eec999b304 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrphanCollectionReplacement.java @@ -111,11 +111,15 @@ void replaceCollection_whenOrphan_expect_forcedInsertWithManyReplacement() { assertThat(sql).hasSize(11); assertThat(sql.get(0)).contains("select t0.id from coone_many t0 where coone_id=? and t0.deleted = 0 and t0.deleted = 0; --bind"); // find all Ids assertThat(sql.get(1)).contains("update coone_many set deleted=1 where id in (?,?,?"); - assertThat(sql.get(2)).contains(" -- bind(Array[2000]="); // update first 2000 - assertThat(sql.get(3)).contains("update coone_many set deleted=1 where id in (?,?,?"); - assertThat(sql.get(4)).contains(" -- bind(Array[500]="); // update next 500 - assertThat(sql.get(6)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); - assertThat(sql.get(7)).contains(" -- bind("); + assertThat(sql.get(2)).contains(" -- bind(Array[1000]="); // update first 2000 + assertThat(sql.get(3)).contains(" -- bind(Array[1000]="); // update first 2000 + assertThat(sql.get(4)).contains("update coone_many set deleted=1 where id in (?,?,?"); + assertThat(sql.get(5)).contains(" -- bind(Array[500]="); // update next 500 + assertThat(sql.get(6)).contains(" -- executeBatch() size:2"); + assertThat(sql.get(7)).contains(" -- executeBatch() size:1"); + assertThat(sql.get(8)).contains("insert into coone_many (id, coone_id, name, deleted) values (?,?,?,?)"); + assertThat(sql.get(9)).contains(" -- bind("); + assertThat(sql.get(10)).contains(" -- executeBatch()"); // update next 500 } COOne fetchedUser2 = DB.find(COOne.class, parentId); From 29d946ec598b171bbeb53bcf06d867929844525e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 22:33:35 +1300 Subject: [PATCH 132/240] Bump ebean-agent --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d849afb32..d8b6ed8ef8 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ 13.9.0 7.1 8.7 - 13.22.1 - 13.22.1 + 13.23.0 + 13.23.0 false From 0b2c016af23402abd614468d5a981c6ae76a6887 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 10 Oct 2023 22:46:30 +1300 Subject: [PATCH 133/240] Version 13.23.0 --- composites/ebean-clickhouse/pom.xml | 10 +++--- composites/ebean-cockroach/pom.xml | 10 +++--- composites/ebean-db2/pom.xml | 10 +++--- composites/ebean-h2/pom.xml | 10 +++--- composites/ebean-hana/pom.xml | 10 +++--- composites/ebean-mariadb/pom.xml | 10 +++--- composites/ebean-mysql/pom.xml | 10 +++--- composites/ebean-nuodb/pom.xml | 10 +++--- composites/ebean-oracle/pom.xml | 10 +++--- composites/ebean-postgis/pom.xml | 10 +++--- composites/ebean-postgres/pom.xml | 10 +++--- composites/ebean-sqlite/pom.xml | 10 +++--- composites/ebean-sqlserver/pom.xml | 10 +++--- composites/ebean-yugabyte/pom.xml | 10 +++--- composites/ebean/pom.xml | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 52 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis-types/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++--- ebean-redis/pom.xml | 12 +++---- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- platforms/all/pom.xml | 28 ++++++++-------- platforms/clickhouse/pom.xml | 4 +-- platforms/db2/pom.xml | 4 +-- platforms/h2/pom.xml | 4 +-- platforms/hana/pom.xml | 4 +-- platforms/hsqldb/pom.xml | 4 +-- platforms/mariadb/pom.xml | 6 ++-- platforms/mysql/pom.xml | 4 +-- platforms/nuodb/pom.xml | 4 +-- platforms/oracle/pom.xml | 4 +-- platforms/pom.xml | 2 +- platforms/postgres/pom.xml | 4 +-- platforms/sqlanywhere/pom.xml | 4 +-- platforms/sqlite/pom.xml | 4 +-- platforms/sqlserver/pom.xml | 4 +-- pom.xml | 2 +- querybean-generator/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 6 ++-- 48 files changed, 198 insertions(+), 198 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index f6256dbbc3..f62bfde9fc 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-clickhouse - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index 206e9fb196..af3fbd44c9 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-postgres - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index b95d23f079..72b1c3dfcb 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-db2 - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index d718cb2b20..8ae948a5c7 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-h2 - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index 3783c69c5a..9667695655 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-hana - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 39fa689724..a390aec314 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-mariadb - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index 1474b3e5cc..ddec9818cb 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-mysql - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index e1e1cec780..6b1f17214c 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-nuodb - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 615e0becdf..e17f2fee5b 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-oracle - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml index c726e09bf7..6a293cb83f 100644 --- a/composites/ebean-postgis/pom.xml +++ b/composites/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -22,13 +22,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -47,13 +47,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-postgres - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index 0dd3b2fd54..cef7d19e7b 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-postgres - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index 67f411b748..c60aac19b1 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-sqlite - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 78cf0349f4..71621f0479 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-sqlserver - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index 4bea00c480..ae3835e214 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-postgres - 13.22.0 + 13.23.0-jakarta diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 8ec3ae8c18..1435955161 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta @@ -41,7 +41,7 @@ io.ebean ebean-jackson-mapper - 13.22.0 + 13.23.0-jakarta @@ -60,13 +60,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-all - 13.22.0 + 13.23.0-jakarta diff --git a/composites/pom.xml b/composites/pom.xml index d5e0a79fbb..0d5bffd1e7 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 5f3870054d..95517ee219 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 079790130b..6ea68247a7 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.22.0 + 13.23.0-jakarta io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core-type - 13.22.0 + 13.23.0-jakarta @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.22.0 + 13.23.0-jakarta io.ebean ebean-ddl-generator - 13.22.0 + 13.23.0-jakarta @@ -155,40 +155,40 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta io.ebean querybean-generator - 13.22.0 + 13.23.0-jakarta provided io.ebean kotlin-querybean-generator - 13.22.0 + 13.23.0-jakarta provided io.ebean ebean-test - 13.22.0 + 13.23.0-jakarta test io.ebean ebean-redis - 13.22.0 + 13.23.0-jakarta io.ebean ebean-spring-txn - 13.22.0 + 13.23.0-jakarta @@ -196,79 +196,79 @@ io.ebean ebean-clickhouse - 13.22.0 + 13.23.0-jakarta io.ebean ebean-db2 - 13.22.0 + 13.23.0-jakarta io.ebean ebean-h2 - 13.22.0 + 13.23.0-jakarta io.ebean ebean-hana - 13.22.0 + 13.23.0-jakarta io.ebean ebean-mariadb - 13.22.0 + 13.23.0-jakarta io.ebean ebean-mysql - 13.22.0 + 13.23.0-jakarta io.ebean ebean-nuodb - 13.22.0 + 13.23.0-jakarta io.ebean ebean-oracle - 13.22.0 + 13.23.0-jakarta io.ebean ebean-postgres - 13.22.0 + 13.23.0-jakarta io.ebean ebean-postgis - 13.22.0 + 13.23.0-jakarta io.ebean ebean-postgis-types - 13.22.0 + 13.23.0-jakarta io.ebean ebean-sqlite - 13.22.0 + 13.23.0-jakarta io.ebean ebean-sqlserver - 13.22.0 + 13.23.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index f5e8239612..fce314ce81 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 48a4c1467e..4ad05af19b 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.22.0 + 13.23.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.23.0-jakarta test io.ebean ebean-platform-postgres - 13.22.0 + 13.23.0-jakarta test io.ebean ebean-platform-sqlserver - 13.22.0 + 13.23.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index a6158b8c66..c9c6253164 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.22.0 + 13.23.0-jakarta provided io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.22.0 + 13.23.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index c18b8b038d..916f34041e 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.22.0 + 13.23.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index d8826e9fc1..eeefac37c6 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.22.0 + 13.23.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 58de13e2bf..f5bd276ca6 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.22.0 + 13.23.0-jakarta test io.ebean querybean-generator - 13.22.0 + 13.23.0-jakarta test io.ebean ebean-test - 13.22.0 + 13.23.0-jakarta test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 7f4f3b2e10..f69a4206f7 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta provided io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta provided io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta test io.ebean querybean-generator - 13.22.0 + 13.23.0-jakarta test io.ebean ebean-test - 13.22.0 + 13.23.0-jakarta test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index cce70abdaa..820a3a75c4 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.22.0 + 13.23.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 014f9e5a2d..7ff16c6c10 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta provided io.ebean ebean-ddl-generator - 13.22.0 + 13.23.0-jakarta @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.22.0 + 13.23.0-jakarta test io.ebean ebean-platform-all - 13.22.0 + 13.23.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index f9bd803fbb..c626c8f4d8 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.22.0 + 13.23.0-jakarta test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.22.0 + 13.23.0-jakarta test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.23.0-jakarta test io.ebean ebean-ddl-generator - 13.22.0 + 13.23.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index ec2f015d3f..a5f5bfa09c 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-clickhouse - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-db2 - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-hana - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-hsqldb - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-mysql - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-mariadb - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-nuodb - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-oracle - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-postgres - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-sqlite - 13.22.0 + 13.23.0-jakarta io.ebean ebean-platform-sqlserver - 13.22.0 + 13.23.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 1429168c5a..6cde78d817 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 66b776c6c1..853a536efd 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index f478dedb2c..b83a835c38 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.23.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0 + 13.23.0-jakarta io.repaint.maven From 169d170247bea88c773da0155fe526925a7af971 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 16 Oct 2023 21:54:32 +1300 Subject: [PATCH 139/240] Explicit annotation processors required with JDK 22 JDK 22 changes such that annotation processors are not found by default on the classpath. As such they either need to be explicitly registered with the compiler (e.g. maven-compiler-plugin) or use -proc:full --- ebean-querybean/pom.xml | 15 +++++++-------- ebean-redis/pom.xml | 21 +++++++++++++-------- tests/test-java16/pom.xml | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5d82e9d671..621957cd16 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -67,13 +67,6 @@ test - - io.ebean - querybean-generator - 13.23.0-jakarta - test - - io.ebean ebean-test @@ -103,7 +96,13 @@ org.apache.maven.plugins maven-compiler-plugin - -proc:full + + + io.ebean + querybean-generator + 13.23.0-jakarta + + diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index f69a4206f7..302d9b62d4 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -40,13 +40,6 @@ test - - io.ebean - querybean-generator - 13.23.0-jakarta - test - - io.ebean ebean-test @@ -72,7 +65,19 @@ - + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.ebean + querybean-generator + 13.23.0-jakarta + + + + io.repaint.maven tiles-maven-plugin diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 2b5dec8147..b49550510e 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -52,7 +52,7 @@ io.ebean querybean-generator - 13.22.0 + 13.22.0-jakarta From aa298235f3146c451a24ca7126983ac066014156 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 16 Oct 2023 23:15:32 +1300 Subject: [PATCH 140/240] For testing java 16+ include JDK 21 and 22 --- tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pom.xml b/tests/pom.xml index 336d7e0f02..e0b1945094 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ jdk16plus - [16,20] + [16,22] test-java16 From cd70c178f1130fb361612649ef30b0e004b90471 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 16 Oct 2023 23:17:25 +1300 Subject: [PATCH 141/240] For testing java 16+ include JDK 17 and 21 only --- tests/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pom.xml b/tests/pom.xml index e0b1945094..2e3262bbf3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ jdk16plus - [16,22] + [17,21] test-java16 @@ -30,7 +30,7 @@ jdk15less - [8,15] + [11] test-kotlin From 73416ed65a85ed367cbee7cd21d14e8008b44d30 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 16 Oct 2023 23:19:48 +1300 Subject: [PATCH 142/240] For testing java 16+ include JDK 17 and 21 only --- tests/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pom.xml b/tests/pom.xml index 2e3262bbf3..9b25b74f44 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -28,9 +28,9 @@ - jdk15less + jdk11 - [11] + 11 test-kotlin From c7241ba3dc73482f7d00b89a7b30d8384d9c73b8 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 16 Oct 2023 23:30:45 +1300 Subject: [PATCH 143/240] Fix test for java 16+ annotation processor version --- tests/test-java16/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index b49550510e..1d67166226 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -52,7 +52,7 @@ io.ebean querybean-generator - 13.22.0-jakarta + 13.23.0-jakarta From e1972ac54442dc94f7e6fdc600912235c790ed32 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 17 Oct 2023 22:37:20 +1300 Subject: [PATCH 144/240] Bump parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57bb2785d9..c2ef96d910 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.avaje java11-oss - 3.10 + 3.12 io.ebean From dd498409e02d171244b333ce47bbec6ddc6d24a0 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 17 Oct 2023 22:38:33 +1300 Subject: [PATCH 145/240] Bump dependency for avaje-config to 3.9 --- ebean-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 95517ee219..2fd2771881 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -39,7 +39,7 @@ io.avaje avaje-config - 3.8 + 3.9 From 3ef715ef64b57179b4d68679134aa2760fa8cb51 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 17 Oct 2023 23:09:18 +1300 Subject: [PATCH 146/240] Support native-image via querybean-generator --- .../server/deploy/BeanDescriptor.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 24 +++++----- .../deploy/meta/DeployBeanDescriptor.java | 48 +++++++++---------- .../deploy/parse/AnnotationAssocManys.java | 4 +- .../properties/BeanPropertiesReader.java | 26 +--------- .../deploy/parse/AnnotationClassTest.java | 3 +- kotlin-querybean-generator/pom.xml | 2 +- querybean-generator/pom.xml | 2 +- .../generator/ProcessingContext.java | 5 ++ .../generator/SimpleModuleInfoWriter.java | 42 +++++++++++++--- 10 files changed, 83 insertions(+), 75 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index f6f927a645..23f05b2e99 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -237,7 +237,7 @@ public BeanDescriptor(BeanDescriptorMap owner, DeployBeanDescriptor deploy) { this.owner = owner; this.multiValueSupported = owner.isMultiValueSupported(); this.entityType = deploy.getEntityType(); - this.properties = deploy.getProperties(); + this.properties = deploy.propertyNames(); this.name = InternString.intern(deploy.getName()); this.baseTableAlias = "t0"; this.fullName = InternString.intern(deploy.getFullName()); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index c6f50d9dde..c362ed5220 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -443,11 +443,10 @@ private void readTableToDescriptor() { // build map of tables to view entities dependent on those tables // for the purpose of invalidating appropriate query caches String[] dependentTables = desc.dependentTables(); - if (dependentTables != null && dependentTables.length > 0) { + if (dependentTables != null) { for (String depTable : dependentTables) { depTable = depTable.toLowerCase(); - List> list = tableToViewDescMap.computeIfAbsent(depTable, k -> new ArrayList<>(1)); - list.add(desc); + tableToViewDescMap.computeIfAbsent(depTable, k -> new ArrayList<>(1)).add(desc); } } } @@ -578,7 +577,7 @@ private void errorBeanNotRegistered(Class entityType) { } } - private String errNothingRegistered() { + private String errNothingRegistered() { return "There are no registered entities. If using query beans, that generates EbeanEntityRegister.java into " + "generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause."; } @@ -1186,7 +1185,7 @@ private void readDeployAssociations(DeployBeanInfo info) { setConcurrencyMode(desc); } // generate the byte code - createByteCode(desc); + setAccessors(desc); } /** @@ -1255,13 +1254,13 @@ private PlatformIdGenerator createSequenceIdGenerator(String seqName, int stepSi return databasePlatform.createSequenceIdGenerator(backgroundExecutor, dataSource, stepSize, seqName); } - private void createByteCode(DeployBeanDescriptor deploy) { + private void setAccessors(DeployBeanDescriptor deploy) { // check to see if the bean supports EntityBean interface // generate a subclass if required - setEntityBeanClass(deploy); + confirmEnhanced(deploy); // use Code generation or Standard reflection to support // getter and setter methods - setBeanReflect(deploy); + setPropertyAccessors(deploy); } /** @@ -1288,15 +1287,14 @@ private void setScalarType(DeployBeanDescriptor deployDesc) { * and getting of properties. It is generally faster to use code generation * rather than reflection to do this. */ - private void setBeanReflect(DeployBeanDescriptor desc) { + private void setPropertyAccessors(DeployBeanDescriptor desc) { // Set the BeanReflectGetter and BeanReflectSetter that typically // use generated code. NB: Due to Bug 166 so now doing this for // abstract classes as well. - BeanPropertiesReader reflectProps = new BeanPropertiesReader(desc.getBeanType()); - desc.setProperties(reflectProps.getProperties()); + BeanPropertiesReader reflectProps = new BeanPropertiesReader(desc.propertyNames()); for (DeployBeanProperty prop : desc.propertiesAll()) { String propName = prop.getName(); - Integer pos = reflectProps.getPropertyIndex(propName); + Integer pos = reflectProps.propertyIndex(propName); if (pos == null) { if (isPersistentField(prop)) { throw new IllegalStateException( @@ -1368,7 +1366,7 @@ private boolean hasEntityBeanInterface(Class beanClass) { /** * Test the bean type to see if it implements EntityBean interface already. */ - private void setEntityBeanClass(DeployBeanDescriptor desc) { + private void confirmEnhanced(DeployBeanDescriptor desc) { Class beanClass = desc.getBeanType(); if (!hasEntityBeanInterface(beanClass)) { String msg = "Bean " + beanClass + " is not enhanced? Check packages specified in ebean.mf. If you are running in IDEA or " + diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 6aa5186b7b..f9715f2aab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -24,6 +24,8 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; + +import java.lang.reflect.Field; import java.util.*; /** @@ -45,8 +47,6 @@ public int compare(DeployBeanProperty o1, DeployBeanProperty o2) { private static final PropOrder PROP_ORDER = new PropOrder(); - private static final String I_SCALAOBJECT = "scala.ScalaObject"; - private final DatabaseConfig config; private final BeanDescriptorManager manager; /** @@ -139,10 +139,30 @@ public DeployBeanDescriptor(BeanDescriptorManager manager, Class beanType, Da this.beanType = beanType; } + private String[] readPropertyNames() { + try { + Field field = beanType.getField("_ebean_props"); + return (String[]) field.get(null); + } catch (Exception e) { + throw new IllegalStateException("Error getting _ebean_props field on type " + beanType, e); + } + } + + public void setPropertyNames(String[] properties) { + this.properties = properties; + } + + public String[] propertyNames() { + if (properties == null) { + properties = readPropertyNames(); + } + return properties; + } + /** * Set the IdClass to use. */ - public void setIdClass(Class idClass) { + public void setIdClass(Class idClass) { this.idClass = idClass; } @@ -260,7 +280,6 @@ public boolean isDraftableElement() { * Read the top level doc store deployment information. */ public void readDocStore(DocStore docStore) { - this.docStore = docStore; docStoreMapped = true; docStoreQueueId = docStore.queueId(); @@ -276,23 +295,10 @@ public void readDocStore(DocStore docStore) { } } - public boolean isScalaObject() { - Class[] interfaces = beanType.getInterfaces(); - for (Class anInterface : interfaces) { - String iname = anInterface.getName(); - if (I_SCALAOBJECT.equals(iname)) { - return true; - } - } - return false; - } - public DeployBeanTable createDeployBeanTable() { - DeployBeanTable beanTable = new DeployBeanTable(getBeanType()); beanTable.setBaseTable(baseTable); beanTable.setIdProperty(idProperty()); - return beanTable; } @@ -360,14 +366,6 @@ public void setIdentityType(IdType type) { this.identityMode.setIdType(type); } - public String[] getProperties() { - return properties; - } - - public void setProperties(String[] props) { - this.properties = props; - } - /** * Return the class type this BeanDescriptor describes. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index e1a065a2ec..fc15c0f503 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -213,9 +213,9 @@ private void readElementCollection(DeployBeanPropertyAssocMany prop, ElementC int sortOrder = 0; if (!prop.getManyType().isMap()) { - elementDescriptor.setProperties(new String[]{"value"}); + elementDescriptor.setPropertyNames(new String[]{"value"}); } else { - elementDescriptor.setProperties(new String[]{"key", "value"}); + elementDescriptor.setPropertyNames(new String[]{"key", "value"}); String dbKeyColumn = "mkey"; MapKeyColumn mapKeyColumn = get(prop, MapKeyColumn.class); if (mapKeyColumn != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java index ec56da19de..d72d2a1028 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java @@ -1,7 +1,5 @@ package io.ebeaninternal.server.properties; -import java.lang.reflect.Field; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -11,34 +9,14 @@ public final class BeanPropertiesReader { private final Map propertyIndexMap = new HashMap<>(); - private final String[] props; - public BeanPropertiesReader(Class clazz) { - this.props = getProperties(clazz); + public BeanPropertiesReader(String[] props) { for (int i = 0; i < props.length; i++) { propertyIndexMap.put(props[i], i); } } - public String[] getProperties() { - return props; - } - - @Override - public String toString() { - return Arrays.toString(props); - } - - public Integer getPropertyIndex(String property) { + public Integer propertyIndex(String property) { return propertyIndexMap.get(property); } - - private String[] getProperties(Class clazz) { - try { - Field field = clazz.getField("_ebean_props"); - return (String[]) field.get(null); - } catch (Exception e) { - throw new IllegalStateException("Error getting _ebean_props field on type " + clazz, e); - } - } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java index 72e88a0135..516081d3f3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java @@ -7,6 +7,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeaninternal.server.type.DefaultTypeManager; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import java.util.Collections; @@ -47,7 +48,7 @@ public void convertColumnNames_when_AllQuotedIdentifiersIsFalse() { private AnnotationClass createAnnotationClass(DatabaseConfig config) { DeployUtil deployUtil = new DeployUtil(new DefaultTypeManager(config, new BootupClasses()), config); - DeployBeanInfo deployBeanInfo = new DeployBeanInfo(deployUtil, new DeployBeanDescriptor<>(null, null, null)); + DeployBeanInfo deployBeanInfo = new DeployBeanInfo(deployUtil, new DeployBeanDescriptor<>(null, Customer.class, null)); ReadAnnotationConfig readAnnotationConfig = new ReadAnnotationConfig(new GeneratedPropertyFactory(true, new DatabaseConfig(), Collections.emptyList()), "","", new DatabaseConfig()); return new AnnotationClass(deployBeanInfo, readAnnotationConfig); } diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index c626c8f4d8..1c0dca3422 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -144,7 +144,7 @@ 11 11 - -proc:none + -proc:none diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 4154d4d68d..325413e51a 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -31,7 +31,7 @@ 11 11 - -proc:none + -proc:none diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 149fe62ecc..250323f5e3 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -475,6 +475,11 @@ FileObject createManifestWriter() throws IOException { return createMetaInfWriter(METAINF_MANIFEST); } + FileObject createNativeImageWriter(String name) throws IOException { + String nm = "META-INF/native-image/" + name + "/reflect-config.json"; + return createMetaInfWriter(nm); + } + FileObject createMetaInfWriter(String target) throws IOException { return filer.createResource(StandardLocation.CLASS_OUTPUT, "", target); } diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java index d609939b57..c238541785 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java @@ -4,6 +4,7 @@ import javax.tools.JavaFileObject; import java.io.IOException; import java.io.Writer; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.StringJoiner; @@ -38,6 +39,7 @@ void write() throws IOException { writer.close(); writeServicesFile(); writeManifestFile(); + writeNativeImageFile(); } private void writeServicesFile() { @@ -48,9 +50,7 @@ private void writeServicesFile() { writer.write(factoryFullName); writer.close(); } - } catch (IOException e) { - e.printStackTrace(); processingContext.logError(null, "Failed to write services file " + e.getMessage()); } } @@ -68,9 +68,7 @@ private void writeManifestFile() { writer.close(); } } - } catch (IOException e) { - e.printStackTrace(); processingContext.logError(null, "Failed to write services file " + e.getMessage()); } } @@ -84,10 +82,41 @@ private String manifestEntityPackages(Set allEntityPackages) { return builder.delete(builder.lastIndexOf("\n"), builder.length()).append('\n').toString(); } - private void writePackage() { + private void writeNativeImageFile() { + try { + Set allEntities = new LinkedHashSet<>(processingContext.getDbEntities()); + for (Set value : processingContext.getOtherDbEntities().values()) { + allEntities.addAll(value); + } - writer.append("package %s;", factoryPackage).eol().eol(); + if (!allEntities.isEmpty()) { + FileObject jfo = processingContext.createNativeImageWriter(factoryPackage + ".ebean-entity"); + if (jfo != null) { + boolean first = true; + Writer writer = jfo.openWriter(); + writer.write("["); + for (String entity : allEntities) { + if (first) { + first = false; + } else { + writer.write(","); + } + writer.write("\n {\"name\": \""); + writer.write(entity); + writer.write("\", \"allDeclaredConstructors\": true, \"allDeclaredFields\": true}"); + } + writer.write("\n]\n"); + writer.write("\n"); + writer.close(); + } + } + } catch (IOException e) { + processingContext.logError(null, "Failed to write services file " + e.getMessage()); + } + } + private void writePackage() { + writer.append("package %s;", factoryPackage).eol().eol(); writer.append("import java.util.ArrayList;").eol(); writer.append("import java.util.Collections;").eol(); writer.append("import java.util.List;").eol(); @@ -125,7 +154,6 @@ private String quoteTypes(Set otherClasses) { } private void writeStartClass() { - buildAtContextModule(writer); writer.append("public class %s implements EntityClassRegister {", factoryShortName).eol().eol(); From 4238a951ca08e61599d979eb0401262dcbf60dbf Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 17 Oct 2023 23:25:09 +1300 Subject: [PATCH 147/240] Make Jackson a transitive dependency of ebean-jackson-mapper So jackson-core and jackson-databind are both transitive dependencies of ebean-jackson-mapper. --- ebean-jackson-mapper/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 916f34041e..9572d941fc 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -22,14 +22,12 @@ com.fasterxml.jackson.core jackson-core ${jackson.version} - provided com.fasterxml.jackson.core jackson-databind ${jackson.version} - provided From 31c106f60464b29e37776fa1ecb72106b67f85f2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 18 Oct 2023 15:16:20 +1300 Subject: [PATCH 148/240] Bump ebean-agent to 13.23.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c2ef96d910..a451f3d2f1 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ 13.9.0 7.1 8.7 - 13.23.0 - 13.23.0 + 13.23.1 + 13.23.1 false From 0171c1afef3cbb4d603a478a3411006fe3ba28c8 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 18 Oct 2023 15:47:04 +1300 Subject: [PATCH 149/240] Version 13.23.1 --- composites/ebean-clickhouse/pom.xml | 10 +++--- composites/ebean-cockroach/pom.xml | 10 +++--- composites/ebean-db2/pom.xml | 10 +++--- composites/ebean-h2/pom.xml | 10 +++--- composites/ebean-hana/pom.xml | 10 +++--- composites/ebean-mariadb/pom.xml | 10 +++--- composites/ebean-mysql/pom.xml | 10 +++--- composites/ebean-nuodb/pom.xml | 10 +++--- composites/ebean-oracle/pom.xml | 10 +++--- composites/ebean-postgis/pom.xml | 12 +++---- composites/ebean-postgres/pom.xml | 10 +++--- composites/ebean-sqlite/pom.xml | 10 +++--- composites/ebean-sqlserver/pom.xml | 10 +++--- composites/ebean-yugabyte/pom.xml | 10 +++--- composites/ebean/pom.xml | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 52 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis-types/pom.xml | 8 ++--- ebean-querybean/pom.xml | 8 ++--- ebean-redis/pom.xml | 10 +++--- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- platforms/all/pom.xml | 28 ++++++++-------- platforms/clickhouse/pom.xml | 4 +-- platforms/db2/pom.xml | 4 +-- platforms/h2/pom.xml | 4 +-- platforms/hana/pom.xml | 4 +-- platforms/hsqldb/pom.xml | 4 +-- platforms/mariadb/pom.xml | 6 ++-- platforms/mysql/pom.xml | 4 +-- platforms/nuodb/pom.xml | 4 +-- platforms/oracle/pom.xml | 4 +-- platforms/pom.xml | 2 +- platforms/postgres/pom.xml | 4 +-- platforms/sqlanywhere/pom.xml | 4 +-- platforms/sqlite/pom.xml | 4 +-- platforms/sqlserver/pom.xml | 4 +-- pom.xml | 2 +- querybean-generator/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 6 ++-- 48 files changed, 197 insertions(+), 197 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index f62bfde9fc..3789fd2d29 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-clickhouse - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index af3fbd44c9..648b889dfb 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 72b1c3dfcb..9e19d46aa1 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-db2 - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 8ae948a5c7..96b640e3f2 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index 9667695655..0011620557 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-hana - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index a390aec314..3b85df13db 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-mariadb - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index ddec9818cb..0a9503991c 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-mysql - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index 6b1f17214c..130919da86 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-nuodb - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index e17f2fee5b..c49121f984 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-oracle - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml index b894627dd9..32b80cd7fe 100644 --- a/composites/ebean-postgis/pom.xml +++ b/composites/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -22,13 +22,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -47,19 +47,19 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-postgis-types - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index cef7d19e7b..aeb4031805 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index c60aac19b1..4dd5212332 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-sqlite - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 71621f0479..59d41214b2 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-sqlserver - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index ae3835e214..723be5ce10 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 1435955161..04c4018d2a 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta @@ -41,7 +41,7 @@ io.ebean ebean-jackson-mapper - 13.23.0-jakarta + 13.23.1-jakarta @@ -60,13 +60,13 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-all - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/composites/pom.xml b/composites/pom.xml index 0d5bffd1e7..90a287da3f 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 2fd2771881..356b1504c8 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 2e351ec216..d0c4712198 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core-type - 13.23.0-jakarta + 13.23.1-jakarta @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-ddl-generator - 13.23.0-jakarta + 13.23.1-jakarta @@ -155,37 +155,37 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta io.ebean querybean-generator - 13.23.0-jakarta + 13.23.1-jakarta io.ebean kotlin-querybean-generator - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-test - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-redis - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-spring-txn - 13.23.0-jakarta + 13.23.1-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-db2 - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-h2 - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-hana - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-mariadb - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-mysql - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-nuodb - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-oracle - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-postgres - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-postgis - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-postgis-types - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-sqlite - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-sqlserver - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index fce314ce81..6c40e493b6 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 4ad05af19b..c6d7d2ad15 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.23.0-jakarta + 13.23.1-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.1-jakarta test io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.1-jakarta test io.ebean ebean-platform-sqlserver - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index c9c6253164..f910b13799 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.23.0-jakarta + 13.23.1-jakarta provided io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 9572d941fc..10547f1027 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.23.0-jakarta + 13.23.1-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index eeefac37c6..47f23c8444 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 621957cd16..b9e5ab0025 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.23.0-jakarta + 13.23.1-jakarta test io.ebean ebean-test - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 302d9b62d4..12765d4d23 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta provided io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta provided io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta test io.ebean ebean-test - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 820a3a75c4..4eecae420c 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7ff16c6c10..79e48ba2b9 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta provided io.ebean ebean-ddl-generator - 13.23.0-jakarta + 13.23.1-jakarta @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.23.0-jakarta + 13.23.1-jakarta test io.ebean ebean-platform-all - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 1c0dca3422..7750c2ef55 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.1-jakarta test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.23.0-jakarta + 13.23.1-jakarta test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.1-jakarta test io.ebean ebean-ddl-generator - 13.23.0-jakarta + 13.23.1-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index a5f5bfa09c..2e3cbeeeec 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-clickhouse - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-db2 - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-hana - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-hsqldb - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-mysql - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-mariadb - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-nuodb - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-oracle - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-sqlanywhere - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-sqlite - 13.23.0-jakarta + 13.23.1-jakarta io.ebean ebean-platform-sqlserver - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 6cde78d817..6582265b30 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 853a536efd..218e50f943 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index b83a835c38..8319c8fdae 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.1-jakarta io.repaint.maven diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 12765d4d23..3295617b60 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -61,23 +61,17 @@ test + + io.ebean + querybean-generator + 13.23.0-jakarta + provided + + - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.ebean - querybean-generator - 13.23.0-jakarta - - - - io.repaint.maven tiles-maven-plugin diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 79b1c6d3cb..2007861e0d 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -41,22 +41,16 @@ test + + io.ebean + querybean-generator + 13.23.0-jakarta + provided + + - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.ebean - querybean-generator - 13.23.0-jakarta - - - - io.repaint.maven From 84f0ef9fce24161c258fbe87127f9b7cf32dbfbc Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 24 Oct 2023 23:07:14 +1300 Subject: [PATCH 151/240] Use querybean-generator via provided scope rather than maven compiler plugin This is because when releasing both jakarta and javax versions these need to have their versions adjusted --- ebean-querybean/pom.xml | 2 +- ebean-redis/pom.xml | 2 +- tests/test-java16/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 8c144a9d68..291d1720af 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -91,7 +91,7 @@ io.ebean querybean-generator - 13.23.0-jakarta + 13.23.1-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 3295617b60..d6cb99eacd 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -64,7 +64,7 @@ io.ebean querybean-generator - 13.23.0-jakarta + 13.23.1-jakarta provided diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 2007861e0d..958fcb2713 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -44,7 +44,7 @@ io.ebean querybean-generator - 13.23.0-jakarta + 13.23.1-jakarta provided From acd538207f12098d0ef610e95a8b43a4afc0f8a8 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 24 Oct 2023 23:08:30 +1300 Subject: [PATCH 152/240] #3251 - QueryBeans: Entities can not have same name as some Ebean API classes --- .../ebean/querybean/generator/Constants.java | 10 ++------ .../generator/SimpleQueryBeanWriter.java | 23 ++++++------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index 58412960a0..dec49693d9 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -2,9 +2,8 @@ interface Constants { - String AT_GENERATED = "@Generated(\"io.ebean.querybean.generator\")"; - - String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")"; + String AT_GENERATED = "@io.ebean.typequery.Generated(\"io.ebean.querybean.generator\")"; + String AT_TYPEQUERYBEAN = "@io.ebean.typequery.TypeQueryBean(\"v1\")"; String GENERATED = "io.ebean.typequery.Generated"; String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; @@ -23,12 +22,7 @@ interface Constants { String TQROOTBEAN = "io.ebean.typequery.TQRootBean"; String TQASSOCBEAN = "io.ebean.typequery.TQAssocBean"; String TQASSOC = "io.ebean.typequery.TQAssoc"; - String TYPEQUERYBEAN = "io.ebean.typequery.TypeQueryBean"; - String DATABASE = "io.ebean.Database"; String DB = "io.ebean.DB"; - String FETCHGROUP = "io.ebean.FetchGroup"; - String QUERY = "io.ebean.Query"; - String TRANSACTION = "io.ebean.Transaction"; String MODULEINFO = "io.ebean.config.ModuleInfo"; String METAINF_MANIFEST = "META-INF/ebean-generated-info.mf"; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java index e5de04a568..fb46813385 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java @@ -75,21 +75,12 @@ private boolean isEmbeddable() { } private void gatherPropertyDetails() { - importTypes.add(Constants.GENERATED); importTypes.add(beanFullName); - importTypes.add(Constants.TYPEQUERYBEAN); if (embeddable) { importTypes.add(Constants.TQASSOC); } else { importTypes.add(Constants.TQASSOCBEAN); importTypes.add(Constants.TQROOTBEAN); - importTypes.add(Constants.DATABASE); - importTypes.add(Constants.FETCHGROUP); - importTypes.add(Constants.QUERY); - importTypes.add(Constants.TRANSACTION); - importTypes.add(Constants.CONSUMER); - importTypes.add(Constants.EXPR); - importTypes.add(Constants.EXPRESSIONLIST); } if (implementsInterface != null) { @@ -170,7 +161,7 @@ private void writeConstructors() { writer.append(" * }").eol(); writer.append(" */").eol(); writer.append(" public static Q%s forFetchGroup() {", shortName).eol(); - writer.append(" return new Q%s(FetchGroup.queryFor(%s.class));", shortName, shortName).eol(); + writer.append(" return new Q%s(io.ebean.FetchGroup.queryFor(%s.class));", shortName, shortName).eol(); writer.append(" }").eol(); writer.eol(); @@ -186,7 +177,7 @@ private void writeConstructors() { writer.eol(); writer.append(" /** Construct with a given transaction */").eol(); - writer.append(" public Q%s(Transaction transaction) {", shortName).eol(); + writer.append(" public Q%s(io.ebean.Transaction transaction) {", shortName).eol(); if (dbName == null) { writer.append(" super(%s.class, transaction);", shortName).eol(); } else { @@ -196,7 +187,7 @@ private void writeConstructors() { writer.eol(); writer.append(" /** Construct with a given Database */").eol(); - writer.append(" public Q%s(Database database) {", shortName).eol(); + writer.append(" public Q%s(io.ebean.Database database) {", shortName).eol(); writer.append(" super(%s.class, database);", shortName).eol(); writer.append(" }").eol(); writer.eol(); @@ -209,13 +200,13 @@ private void writeConstructors() { writer.eol(); writer.append(" /** Private constructor for FetchGroup building */").eol(); - writer.append(" private Q%s(Query<%s> fetchGroupQuery) {", shortName, shortName).eol(); + writer.append(" private Q%s(io.ebean.Query<%s> fetchGroupQuery) {", shortName, shortName).eol(); writer.append(" super(fetchGroupQuery);").eol(); writer.append(" }").eol(); writer.eol(); writer.append(" /** Private constructor for filterMany */").eol(); - writer.append(" private Q%s(ExpressionList<%s> filter) {", shortName, shortName).eol(); + writer.append(" private Q%s(io.ebean.ExpressionList<%s> filter) {", shortName, shortName).eol(); writer.append(" super(filter);").eol(); writer.append(" }").eol(); } @@ -301,8 +292,8 @@ private void writeAssocClass() { private void writeAssocFilterMany() { writer.eol(); - writer.append(" public final R filterMany(Consumer apply) {", shortName).eol(); - writer.append(" final ExpressionList list = Expr.factory().expressionList();", shortName).eol(); + writer.append(" public final R filterMany(java.util.function.Consumer apply) {", shortName).eol(); + writer.append(" final io.ebean.ExpressionList list = io.ebean.Expr.factory().expressionList();", shortName).eol(); writer.append(" final var qb = new Q%s(list);", shortName).eol(); writer.append(" apply.accept(qb);").eol(); writer.append(" expr().filterMany(_name).addAll(list);").eol(); From faffda831816865b2067dd56f36ddc44e318845a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 25 Oct 2023 08:22:25 +1300 Subject: [PATCH 153/240] Use DIST with query plan capture for Yugabyte plus simplify Change QueryPlanLoggerExplain to take the options for PG, Yugabyte and others --- .../server/core/InternalConfiguration.java | 8 +++-- .../server/query/QueryPlanLoggerExplain.java | 9 ++++- .../server/query/QueryPlanLoggerPostgres.java | 33 ------------------- 3 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 080d95560c..f214e3fd8f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -590,14 +590,16 @@ public QueryPlanManager initQueryPlanManager(TransactionManager transactionManag */ QueryPlanLogger queryPlanLogger(Platform platform) { switch (platform.base()) { - case POSTGRES: - return new QueryPlanLoggerPostgres(); case SQLSERVER: return new QueryPlanLoggerSqlServer(); case ORACLE: return new QueryPlanLoggerOracle(); + case POSTGRES: + return new QueryPlanLoggerExplain("explain (analyze, buffers) "); + case YUGABYTE: + return new QueryPlanLoggerExplain("explain (analyze, buffers, dist) "); default: - return new QueryPlanLoggerExplain(); + return new QueryPlanLoggerExplain("explain "); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java index 3af04a56c6..a782543bde 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java @@ -17,9 +17,16 @@ */ public final class QueryPlanLoggerExplain extends QueryPlanLogger { + private final String prefix; + + public QueryPlanLoggerExplain(String prefix) { + this.prefix = prefix; + } + + @SuppressWarnings("all") @Override public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) { - try (PreparedStatement explainStmt = conn.prepareStatement("EXPLAIN " + plan.sql())) { + try (PreparedStatement explainStmt = conn.prepareStatement(prefix + plan.sql())) { bind.prepare(explainStmt, conn); try (ResultSet rset = explainStmt.executeQuery()) { return readQueryPlan(plan, bind, rset); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java deleted file mode 100644 index bc49120749..0000000000 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.ebeaninternal.server.query; - -import io.ebeaninternal.api.CoreLog; -import io.ebeaninternal.api.SpiDbQueryPlan; -import io.ebeaninternal.api.SpiQueryPlan; -import io.ebeaninternal.server.bind.capture.BindCapture; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import static java.lang.System.Logger.Level.WARNING; - -/** - * A QueryPlanLogger for Postgres that prefixes "EXPLAIN ANALYZE" to the query. - */ -public final class QueryPlanLoggerPostgres extends QueryPlanLogger { - - @Override - public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) { - String explain = "explain (analyze, buffers) " + plan.sql(); - try (PreparedStatement explainStmt = conn.prepareStatement(explain)) { - bind.prepare(explainStmt, conn); - try (ResultSet rset = explainStmt.executeQuery()) { - return readQueryPlanBasic(plan, bind, rset); - } - } catch (SQLException e) { - CoreLog.log.log(WARNING, "Could not log query plan: " + explain, e); - return null; - } - } -} From 8f6a3c59d11e45fbdec1bc406806a04ac942f4c3 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 25 Oct 2023 21:58:19 +1300 Subject: [PATCH 154/240] Bump io.avaje:junit and bytebuddy version to support JDK 22+ --- ebean-api/pom.xml | 7 ----- ebean-core-type/pom.xml | 7 ----- ebean-core/pom.xml | 7 ----- .../profile/BasicProfileLocationTest.java | 2 +- ebean-ddl-generator/pom.xml | 7 ----- ebean-jackson-mapper/pom.xml | 7 ----- ebean-postgis-types/pom.xml | 7 ----- ebean-querybean/pom.xml | 7 ----- ebean-redis/pom.xml | 7 ----- ebean-spring-txn/pom.xml | 7 ----- ebean-test/pom.xml | 28 +++++++++++++------ kotlin-querybean-generator/pom.xml | 8 ------ platforms/h2/pom.xml | 7 ----- platforms/hana/pom.xml | 7 ----- platforms/mysql/pom.xml | 7 ----- platforms/oracle/pom.xml | 7 ----- platforms/postgres/pom.xml | 7 ----- platforms/sqlserver/pom.xml | 7 ----- pom.xml | 7 +++++ querybean-generator/pom.xml | 11 -------- tests/test-java16/pom.xml | 7 ----- tests/test-kotlin/pom.xml | 2 +- 22 files changed, 28 insertions(+), 142 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 356b1504c8..979a566c3f 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -107,13 +107,6 @@ - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 6c40e493b6..d245cc00cb 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -34,13 +34,6 @@ true - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index c6d7d2ad15..deb3369d50 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -184,13 +184,6 @@ test - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index c7ab830345..71171930d3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -55,7 +55,7 @@ void obtain() { DProfileLocation loc = new DTimedProfileLocation("foo", MetricFactory.get().createTimedMetric("junk")); assertThat(loc.obtain()).isTrue(); - assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:725)"); + assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:728)"); assertThat(loc.location()).isEqualTo("org.junit.platform.commons.util.ReflectionUtils.invokeMethod"); assertThat(loc.label()).isEqualTo("ReflectionUtils.invokeMethod"); } diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index f910b13799..85a4ab92f8 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -62,13 +62,6 @@ - - io.avaje - junit - 1.1 - test - - io.ebean ebean-platform-all diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 10547f1027..7006d7d03a 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -30,13 +30,6 @@ ${jackson.version} - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 47f23c8444..494025787c 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -73,13 +73,6 @@ test - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 291d1720af..2c3d817d9c 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -74,13 +74,6 @@ test - - io.avaje - junit - 1.1 - test - - org.avaje.composite logback diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d6cb99eacd..d64e0cb004 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -47,13 +47,6 @@ test - - io.avaje - junit - 1.1 - test - - org.avaje.composite logback diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 4eecae420c..17b8a22066 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -81,13 +81,6 @@ test - - io.avaje - junit - 1.1 - test - - org.slf4j jcl-over-slf4j diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 79e48ba2b9..a3c3f133e4 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -11,6 +11,11 @@ Testing support for Ebean ebean-test + + 1.14.9 + 3.24.2 + + @@ -64,10 +69,22 @@ ${ebean-test-containers.version} + + + net.bytebuddy + byte-buddy + ${bytebuddy.version} + + + net.bytebuddy + byte-buddy-agent + ${bytebuddy.version} + + org.assertj assertj-core - 3.23.1 + ${assertj.version} @@ -272,18 +289,11 @@ test - - ch.qos.logback - logback-classic - 1.2.11 - test - - io.avaje junit - 1.1 + 1.3 provided diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 7750c2ef55..19f150c3e6 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -18,14 +18,6 @@ - - - io.avaje - junit - 1.1 - test - - io.ebean ebean-querybean diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 8319c8fdae..46159bf54f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -27,12 +27,5 @@ true - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml index 2a90a4aa23..90b4966c8b 100644 --- a/platforms/hana/pom.xml +++ b/platforms/hana/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml index 311804361a..77dd69f82d 100644 --- a/platforms/mysql/pom.xml +++ b/platforms/mysql/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml index 12718c9f03..a8fce75846 100644 --- a/platforms/oracle/pom.xml +++ b/platforms/oracle/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml index 38152d2693..8e5f03373e 100644 --- a/platforms/postgres/pom.xml +++ b/platforms/postgres/pom.xml @@ -32,12 +32,5 @@ test - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml index 868c1a26d6..966566425f 100644 --- a/platforms/sqlserver/pom.xml +++ b/platforms/sqlserver/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/pom.xml b/pom.xml index 797647640f..6763efd9db 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,13 @@ + + io.avaje + junit + 1.3 + test + + ch.qos.logback logback-classic diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index eacc565570..6cc2547055 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -11,17 +11,6 @@ Querybean generator querybean-generator - - - - io.avaje - junit - 1.1 - test - - - - diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 958fcb2713..b0bf37dd8e 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -34,13 +34,6 @@ test - - io.avaje - junit - 1.1 - test - - io.ebean querybean-generator diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 4f1f196809..f681173ed0 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -46,7 +46,7 @@ io.avaje junit - 1.1 + 1.3 test From a0748f8139d18fc3fd58bfda1a4a0e1c356de307 Mon Sep 17 00:00:00 2001 From: "robin.bygrave" Date: Thu, 26 Oct 2023 13:52:44 +1300 Subject: [PATCH 155/240] Upgrade ANTLR4 from version 4.8-1 to 4.13.1 --- ebean-core/pom.xml | 2 +- .../server/grammer/antlr/EQL.interp | 2 +- .../server/grammer/antlr/EQLBaseListener.java | 3 +- .../server/grammer/antlr/EQLBaseVisitor.java | 3 +- .../server/grammer/antlr/EQLLexer.interp | 2 +- .../server/grammer/antlr/EQLLexer.java | 715 +++++++++++------- .../server/grammer/antlr/EQLListener.java | 2 +- .../server/grammer/antlr/EQLParser.java | 524 ++++++++----- .../server/grammer/antlr/EQLVisitor.java | 2 +- 9 files changed, 782 insertions(+), 473 deletions(-) diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index deb3369d50..037eec6874 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -58,7 +58,7 @@ org.antlr antlr4-runtime - 4.8-1 + 4.13.1 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-db2 - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-h2 - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-hana - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-mariadb - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-mysql - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-nuodb - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-oracle - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-postgres - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-postgis - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-postgis-types - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-sqlite - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-sqlserver - 13.23.1-jakarta + 13.23.2-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index d245cc00cb..f10ea58a95 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.23.1-jakarta + 13.23.2-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 037eec6874..32c5d4c3b1 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.23.1-jakarta + 13.23.2-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.23.1-jakarta + 13.23.2-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.23.1-jakarta + 13.23.2-jakarta test io.ebean ebean-platform-postgres - 13.23.1-jakarta + 13.23.2-jakarta test io.ebean ebean-platform-sqlserver - 13.23.1-jakarta + 13.23.2-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 85a4ab92f8..a779907174 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.23.1-jakarta + 13.23.2-jakarta provided io.ebean ebean-core - 13.23.1-jakarta + 13.23.2-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.23.1-jakarta + 13.23.2-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 7006d7d03a..e4a4ae39c9 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.23.1-jakarta + 13.23.2-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 494025787c..7e52513474 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-core - 13.23.1-jakarta + 13.23.2-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.23.1-jakarta + 13.23.2-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 2c3d817d9c..fd61874512 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.23.1-jakarta + 13.23.2-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.23.1-jakarta + 13.23.2-jakarta test io.ebean ebean-test - 13.23.1-jakarta + 13.23.2-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.23.1-jakarta + 13.23.2-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d64e0cb004..42c9a61307 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.23.1-jakarta + 13.23.2-jakarta provided io.ebean ebean-core - 13.23.1-jakarta + 13.23.2-jakarta provided io.ebean ebean-querybean - 13.23.1-jakarta + 13.23.2-jakarta test io.ebean ebean-test - 13.23.1-jakarta + 13.23.2-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.23.1-jakarta + 13.23.2-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 17b8a22066..9b1a23cbc9 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.23.1-jakarta + 13.23.2-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.23.1-jakarta + 13.23.2-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index a3c3f133e4..492a1f2f46 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-core - 13.23.1-jakarta + 13.23.2-jakarta provided io.ebean ebean-ddl-generator - 13.23.1-jakarta + 13.23.2-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.23.1-jakarta + 13.23.2-jakarta test io.ebean ebean-platform-all - 13.23.1-jakarta + 13.23.2-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 19f150c3e6..31ba176530 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.23.1-jakarta + 13.23.2-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.23.1-jakarta + 13.23.2-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.23.1-jakarta + 13.23.2-jakarta test io.ebean ebean-ddl-generator - 13.23.1-jakarta + 13.23.2-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 2e3cbeeeec..2177e1d668 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-clickhouse - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-db2 - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-hana - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-hsqldb - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-mysql - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-mariadb - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-nuodb - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-oracle - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-postgres - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-sqlanywhere - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-sqlite - 13.23.1-jakarta + 13.23.2-jakarta io.ebean ebean-platform-sqlserver - 13.23.1-jakarta + 13.23.2-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 6582265b30..91fdb35f26 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.1-jakarta + 13.23.2-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 218e50f943..20b4015029 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.1-jakarta + 13.23.2-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 46159bf54f..41f2823d3a 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.1-jakarta + 13.23.2-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.1-jakarta + 13.23.2-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-db2 - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-h2 - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-hana - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-mariadb - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-mysql - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-nuodb - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-oracle - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-postgres - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-postgis - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-postgis-types - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-sqlite - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-sqlserver - 13.23.2-jakarta + 13.24.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index f10ea58a95..64fa40277e 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.23.2-jakarta + 13.24.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 32c5d4c3b1..f59c481b68 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.23.2-jakarta + 13.24.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.23.2-jakarta + 13.24.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.23.2-jakarta + 13.24.0-jakarta test io.ebean ebean-platform-postgres - 13.23.2-jakarta + 13.24.0-jakarta test io.ebean ebean-platform-sqlserver - 13.23.2-jakarta + 13.24.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index a779907174..b84e7496c5 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.23.2-jakarta + 13.24.0-jakarta provided io.ebean ebean-core - 13.23.2-jakarta + 13.24.0-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.23.2-jakarta + 13.24.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index e4a4ae39c9..1b040b2d6d 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.23.2-jakarta + 13.24.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 7e52513474..0b8429492b 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-core - 13.23.2-jakarta + 13.24.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.23.2-jakarta + 13.24.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index fd61874512..adcbc83d79 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.23.2-jakarta + 13.24.0-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.23.2-jakarta + 13.24.0-jakarta test io.ebean ebean-test - 13.23.2-jakarta + 13.24.0-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.23.2-jakarta + 13.24.0-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 42c9a61307..cd8b302082 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.23.2-jakarta + 13.24.0-jakarta provided io.ebean ebean-core - 13.23.2-jakarta + 13.24.0-jakarta provided io.ebean ebean-querybean - 13.23.2-jakarta + 13.24.0-jakarta test io.ebean ebean-test - 13.23.2-jakarta + 13.24.0-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.23.2-jakarta + 13.24.0-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 9b1a23cbc9..609c186720 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.23.2-jakarta + 13.24.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.23.2-jakarta + 13.24.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index b5b3ab1ef8..e86c6c595f 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-core - 13.23.2-jakarta + 13.24.0-jakarta provided io.ebean ebean-ddl-generator - 13.23.2-jakarta + 13.24.0-jakarta @@ -135,28 +135,28 @@ io.ebean ebean-joda-time - 13.24.0-RC2 + 13.24.0 test io.ebean ebean-jackson-jsonnode - 13.24.0-RC2 + 13.24.0 test io.ebean ebean-jackson-mapper - 13.23.2-jakarta + 13.24.0-jakarta test io.ebean ebean-platform-all - 13.23.2-jakarta + 13.24.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 31ba176530..dbc69d6d3f 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.23.2-jakarta + 13.24.0-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.23.2-jakarta + 13.24.0-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.23.2-jakarta + 13.24.0-jakarta test io.ebean ebean-ddl-generator - 13.23.2-jakarta + 13.24.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 2177e1d668..c6d17965c4 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-clickhouse - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-db2 - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-hana - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-hsqldb - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-mysql - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-mariadb - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-nuodb - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-oracle - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-postgres - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-sqlite - 13.23.2-jakarta + 13.24.0-jakarta io.ebean ebean-platform-sqlserver - 13.23.2-jakarta + 13.24.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 91fdb35f26..dfb23c9886 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.2-jakarta + 13.24.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 20b4015029..7a9425fe63 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.2-jakarta + 13.24.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 41f2823d3a..36949749f6 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.2-jakarta + 13.24.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.2-jakarta + 13.24.0-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-db2 - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-h2 - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-hana - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-mariadb - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-mysql - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-nuodb - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-oracle - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-postgres - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-postgis - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-postgis-types - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-sqlite - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-sqlserver - 13.24.0-jakarta + 13.25.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 64fa40277e..15c4ace589 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.24.0-jakarta + 13.25.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index f59c481b68..0d29ffc4a2 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.24.0-jakarta + 13.25.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.24.0-jakarta + 13.25.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.24.0-jakarta + 13.25.0-jakarta test io.ebean ebean-platform-postgres - 13.24.0-jakarta + 13.25.0-jakarta test io.ebean ebean-platform-sqlserver - 13.24.0-jakarta + 13.25.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index b84e7496c5..dbaabcc4fb 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.24.0-jakarta + 13.25.0-jakarta provided io.ebean ebean-core - 13.24.0-jakarta + 13.25.0-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.24.0-jakarta + 13.25.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 1b040b2d6d..a1a68c50ad 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.24.0-jakarta + 13.25.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 0b8429492b..17546dcb53 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-core - 13.24.0-jakarta + 13.25.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.24.0-jakarta + 13.25.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index adcbc83d79..b6872d8464 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.24.0-jakarta + 13.25.0-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.24.0-jakarta + 13.25.0-jakarta test io.ebean ebean-test - 13.24.0-jakarta + 13.25.0-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.24.0-jakarta + 13.25.0-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index cd8b302082..7b54f41171 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.24.0-jakarta + 13.25.0-jakarta provided io.ebean ebean-core - 13.24.0-jakarta + 13.25.0-jakarta provided io.ebean ebean-querybean - 13.24.0-jakarta + 13.25.0-jakarta test io.ebean ebean-test - 13.24.0-jakarta + 13.25.0-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.24.0-jakarta + 13.25.0-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 609c186720..03694ce61b 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.24.0-jakarta + 13.25.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.24.0-jakarta + 13.25.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index e86c6c595f..e7d5841204 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-core - 13.24.0-jakarta + 13.25.0-jakarta provided io.ebean ebean-ddl-generator - 13.24.0-jakarta + 13.25.0-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.24.0-jakarta + 13.25.0-jakarta test io.ebean ebean-platform-all - 13.24.0-jakarta + 13.25.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index dbc69d6d3f..91192b956f 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.24.0-jakarta + 13.25.0-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.24.0-jakarta + 13.25.0-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.24.0-jakarta + 13.25.0-jakarta test io.ebean ebean-ddl-generator - 13.24.0-jakarta + 13.25.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index c6d17965c4..c114a9112a 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-clickhouse - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-db2 - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-hana - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-hsqldb - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-mysql - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-mariadb - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-nuodb - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-oracle - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-postgres - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-sqlite - 13.24.0-jakarta + 13.25.0-jakarta io.ebean ebean-platform-sqlserver - 13.24.0-jakarta + 13.25.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index dfb23c9886..561d3a4b52 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.24.0-jakarta + 13.25.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 7a9425fe63..457b8ee258 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.24.0-jakarta + 13.25.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 36949749f6..4db043b17f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.24.0-jakarta + 13.25.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.24.0-jakarta + 13.25.0-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-db2 - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-h2 - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-hana - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-mariadb - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-mysql - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-nuodb - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-oracle - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-postgres - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-postgis - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-postgis-types - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-sqlite - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-sqlserver - 13.25.0-jakarta + 13.25.1-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 15c4ace589..8383fec706 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.1-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 0d29ffc4a2..69b346f45a 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.1-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-jakarta + 13.25.1-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.1-jakarta test io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.1-jakarta test io.ebean ebean-platform-sqlserver - 13.25.0-jakarta + 13.25.1-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index dbaabcc4fb..40e1d24f05 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-jakarta + 13.25.1-jakarta provided io.ebean ebean-core - 13.25.0-jakarta + 13.25.1-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-jakarta + 13.25.1-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index a1a68c50ad..ccea4099c8 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-jakarta + 13.25.1-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 17546dcb53..c65375d8f5 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-core - 13.25.0-jakarta + 13.25.1-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-jakarta + 13.25.1-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index b6872d8464..2a7da70efb 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-jakarta + 13.25.1-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-jakarta + 13.25.1-jakarta test io.ebean ebean-test - 13.25.0-jakarta + 13.25.1-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-jakarta + 13.25.1-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 7b54f41171..c61f587c3a 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.1-jakarta provided io.ebean ebean-core - 13.25.0-jakarta + 13.25.1-jakarta provided io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.1-jakarta test io.ebean ebean-test - 13.25.0-jakarta + 13.25.1-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-jakarta + 13.25.1-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 03694ce61b..221931a083 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-jakarta + 13.25.1-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-jakarta + 13.25.1-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index e7d5841204..9fe23c96a4 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-core - 13.25.0-jakarta + 13.25.1-jakarta provided io.ebean ebean-ddl-generator - 13.25.0-jakarta + 13.25.1-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-jakarta + 13.25.1-jakarta test io.ebean ebean-platform-all - 13.25.0-jakarta + 13.25.1-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 91192b956f..5473a0e442 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.1-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-jakarta + 13.25.1-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.1-jakarta test io.ebean ebean-ddl-generator - 13.25.0-jakarta + 13.25.1-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index c114a9112a..179598c851 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-clickhouse - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-db2 - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-hana - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-hsqldb - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-mysql - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-mariadb - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-nuodb - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-oracle - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-sqlanywhere - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-sqlite - 13.25.0-jakarta + 13.25.1-jakarta io.ebean ebean-platform-sqlserver - 13.25.0-jakarta + 13.25.1-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 561d3a4b52..aa7a82b8bc 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.1-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 457b8ee258..ee44d0d868 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.1-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 4db043b17f..1f83cdda6f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.1-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-db2 - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-h2 - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-hana - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-mariadb - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-mysql - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-nuodb - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-oracle - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-postgres - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-postgis - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-postgis-types - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-sqlite - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-sqlserver - 13.25.1-jakarta + 13.25.2-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 8383fec706..57367b50b0 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.1-jakarta + 13.25.2-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 69b346f45a..0834be8974 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.25.1-jakarta + 13.25.2-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.1-jakarta + 13.25.2-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.1-jakarta + 13.25.2-jakarta test io.ebean ebean-platform-postgres - 13.25.1-jakarta + 13.25.2-jakarta test io.ebean ebean-platform-sqlserver - 13.25.1-jakarta + 13.25.2-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 40e1d24f05..2fbcb1ef83 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.1-jakarta + 13.25.2-jakarta provided io.ebean ebean-core - 13.25.1-jakarta + 13.25.2-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.1-jakarta + 13.25.2-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index ccea4099c8..1e2373eee5 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.1-jakarta + 13.25.2-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index c65375d8f5..1770101dd7 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-core - 13.25.1-jakarta + 13.25.2-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.1-jakarta + 13.25.2-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 2a7da70efb..80581f1dc5 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.1-jakarta + 13.25.2-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.1-jakarta + 13.25.2-jakarta test io.ebean ebean-test - 13.25.1-jakarta + 13.25.2-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.1-jakarta + 13.25.2-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index c61f587c3a..cef3e1f38e 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.1-jakarta + 13.25.2-jakarta provided io.ebean ebean-core - 13.25.1-jakarta + 13.25.2-jakarta provided io.ebean ebean-querybean - 13.25.1-jakarta + 13.25.2-jakarta test io.ebean ebean-test - 13.25.1-jakarta + 13.25.2-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.1-jakarta + 13.25.2-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 221931a083..55055649da 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.1-jakarta + 13.25.2-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.1-jakarta + 13.25.2-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 9fe23c96a4..37e0ac0a88 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-core - 13.25.1-jakarta + 13.25.2-jakarta provided io.ebean ebean-ddl-generator - 13.25.1-jakarta + 13.25.2-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.1-jakarta + 13.25.2-jakarta test io.ebean ebean-platform-all - 13.25.1-jakarta + 13.25.2-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 5473a0e442..8c29f76ba7 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.1-jakarta + 13.25.2-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.1-jakarta + 13.25.2-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.1-jakarta + 13.25.2-jakarta test io.ebean ebean-ddl-generator - 13.25.1-jakarta + 13.25.2-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 179598c851..558e367c75 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-clickhouse - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-db2 - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-hana - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-hsqldb - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-mysql - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-mariadb - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-nuodb - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-oracle - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-postgres - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-sqlanywhere - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-sqlite - 13.25.1-jakarta + 13.25.2-jakarta io.ebean ebean-platform-sqlserver - 13.25.1-jakarta + 13.25.2-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index aa7a82b8bc..2a11ddae19 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.1-jakarta + 13.25.2-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index ee44d0d868..a8bf5a7686 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.1-jakarta + 13.25.2-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1f83cdda6f..1bd41bb82c 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.1-jakarta + 13.25.2-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.1-jakarta + 13.25.2-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-db2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-h2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-hana - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-mariadb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-mysql - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-nuodb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-oracle - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-postgres - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-postgis - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-postgis-types - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-sqlite - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-sqlserver - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 57367b50b0..310407dc66 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 0834be8974..570f2b858a 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.2-jakarta + 13.26.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-platform-sqlserver - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 2fbcb1ef83..e5605da7ec 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 1e2373eee5..9da641e602 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.2-jakarta + 13.26.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 1770101dd7..b1bcbb10b8 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 80581f1dc5..84ca3462f4 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.2-jakarta + 13.26.0-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index cef3e1f38e..fab10c2ba9 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.2-jakarta + 13.26.0-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 55055649da..25a1b13aa3 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 37e0ac0a88..c75d23f0e1 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta provided io.ebean ebean-ddl-generator - 13.25.2-jakarta + 13.26.0-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-platform-all - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 8c29f76ba7..99e3d369a4 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.2-jakarta + 13.26.0-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.2-jakarta + 13.26.0-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta test io.ebean ebean-ddl-generator - 13.25.2-jakarta + 13.26.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 558e367c75..0207c04f40 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-clickhouse - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-db2 - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-hana - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-hsqldb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-mysql - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-mariadb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-nuodb - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-oracle - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-postgres - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlite - 13.25.2-jakarta + 13.26.0-jakarta io.ebean ebean-platform-sqlserver - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 2a11ddae19..a4be18943e 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index a8bf5a7686..0c1264df71 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1bd41bb82c..943a8984e2 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.2-jakarta + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.2-jakarta + 13.26.0-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-db2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-h2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-hana - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-mariadb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-mysql - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-nuodb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-oracle - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-postgres - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-postgis - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-postgis-types - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-sqlite - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-sqlserver - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 310407dc66..4cc1904cf1 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 570f2b858a..3fa2644bd7 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.1-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-platform-sqlserver - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e5605da7ec..0f0bdaa308 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 9da641e602..736987ba9a 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.1-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index b1bcbb10b8..2ea91e5b5d 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 84ca3462f4..91350fadc1 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-jakarta + 13.26.1-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index fab10c2ba9..0c5f5def6a 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-querybean - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-jakarta + 13.26.1-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 25a1b13aa3..f9e9e5eec1 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c75d23f0e1..cc8f2e3ab1 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta provided io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.1-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-platform-all - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 99e3d369a4..e87afd3430 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-jakarta + 13.26.1-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.1-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta test io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.1-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 0207c04f40..15db1ec5e7 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-clickhouse - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-db2 - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-hana - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-hsqldb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-mysql - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-mariadb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-nuodb - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-oracle - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-sqlanywhere - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-sqlite - 13.26.0-jakarta + 13.26.1-jakarta io.ebean ebean-platform-sqlserver - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index a4be18943e..54c354d030 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 0c1264df71..026a355e83 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 943a8984e2..62e68bbf15 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.1-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.1-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.1-jakarta + 14.0.0 io.ebean ebean-db2 - 13.26.1-jakarta + 14.0.0 io.ebean ebean-h2 - 13.26.1-jakarta + 14.0.0 io.ebean ebean-hana - 13.26.1-jakarta + 14.0.0 io.ebean ebean-mariadb - 13.26.1-jakarta + 14.0.0 io.ebean ebean-mysql - 13.26.1-jakarta + 14.0.0 io.ebean ebean-nuodb - 13.26.1-jakarta + 14.0.0 io.ebean ebean-oracle - 13.26.1-jakarta + 14.0.0 io.ebean ebean-postgres - 13.26.1-jakarta + 14.0.0 io.ebean ebean-postgis - 13.26.1-jakarta + 14.0.0 io.ebean ebean-postgis-types - 13.26.1-jakarta + 14.0.0 io.ebean ebean-sqlite - 13.26.1-jakarta + 14.0.0 io.ebean ebean-sqlserver - 13.26.1-jakarta + 14.0.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 4cc1904cf1..d239a9c261 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.1-jakarta + 14.0.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 3fa2644bd7..882d126b37 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.26.1-jakarta + 14.0.0 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.1-jakarta + 14.0.0 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.1-jakarta + 14.0.0 test io.ebean ebean-platform-postgres - 13.26.1-jakarta + 14.0.0 test io.ebean ebean-platform-sqlserver - 13.26.1-jakarta + 14.0.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 0f0bdaa308..bfd4d95e2c 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.1-jakarta + 14.0.0 provided io.ebean ebean-core - 13.26.1-jakarta + 14.0.0 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.1-jakarta + 14.0.0 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 736987ba9a..40726807b6 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.1-jakarta + 14.0.0 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 2ea91e5b5d..25cb90a4f7 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.1-jakarta + 14.0.0 io.ebean ebean-core - 13.26.1-jakarta + 14.0.0 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.1-jakarta + 14.0.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 91350fadc1..9e3c194028 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.1-jakarta + 14.0.0 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.1-jakarta + 14.0.0 test io.ebean ebean-test - 13.26.1-jakarta + 14.0.0 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.1-jakarta + 14.0.0 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 0c5f5def6a..350068c70e 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.1-jakarta + 14.0.0 provided io.ebean ebean-core - 13.26.1-jakarta + 14.0.0 provided io.ebean ebean-querybean - 13.26.1-jakarta + 14.0.0 test io.ebean ebean-test - 13.26.1-jakarta + 14.0.0 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.1-jakarta + 14.0.0 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index f9e9e5eec1..6d2d9a2c80 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.1-jakarta + 14.0.0 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.1-jakarta + 14.0.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index cc8f2e3ab1..70b05264d5 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.1-jakarta + 14.0.0 io.ebean ebean-core - 13.26.1-jakarta + 14.0.0 provided io.ebean ebean-ddl-generator - 13.26.1-jakarta + 14.0.0 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.1-jakarta + 14.0.0 test io.ebean ebean-platform-all - 13.26.1-jakarta + 14.0.0 test diff --git a/ebean-test/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties index 9dec823eed..3ae286305a 100644 --- a/ebean-test/src/test/resources/ebean.properties +++ b/ebean-test/src/test/resources/ebean.properties @@ -71,18 +71,18 @@ datasource.db.password= datasource.db.databaseUrl=jdbc:h2:file:~/tests datasource.db.databaseDriver=org.h2.Driver -datasource.h2.username=sa -datasource.h2.password= -datasource.h2.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE;NON_KEYWORDS=KEY,VALUE -datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener -#datasource.h2.minConnections=1 -#datasource.h2.maxConnections=25 -#datasource.h2.capturestacktrace=true -#datasource.h2.maxStackTraceSize=20 -#datasource.h2.driver=org.h2.Driver -#datasource.h2.heartbeatsql=select 1 -#datasource.h2.isolationlevel=read_committed -#datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle; +datasource.db.username=sa +datasource.db.password= +datasource.db.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE;NON_KEYWORDS=KEY,VALUE +datasource.db.poolListener=org.tests.basic.MyTestDataSourcePoolListener +#datasource.db.minConnections=1 +#datasource.db.maxConnections=25 +#datasource.db.capturestacktrace=true +#datasource.db.maxStackTraceSize=20 +#datasource.db.driver=org.h2.Driver +#datasource.db.heartbeatsql=select 1 +#datasource.db.isolationlevel=read_committed +#datasource.db.customProperties=IGNORECASE=TRUE;MODE=Oracle; datasource.h2multitenant.username=sa diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index e87afd3430..5e74ad518a 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.1-jakarta + 14.0.0 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.1-jakarta + 14.0.0 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.1-jakarta + 14.0.0 test io.ebean ebean-ddl-generator - 13.26.1-jakarta + 14.0.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 15db1ec5e7..4b78c275dd 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-clickhouse - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-db2 - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-hana - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-hsqldb - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-mysql - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-mariadb - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-nuodb - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-oracle - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-postgres - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-sqlanywhere - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-sqlite - 13.26.1-jakarta + 14.0.0 io.ebean ebean-platform-sqlserver - 13.26.1-jakarta + 14.0.0 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 54c354d030..ea6471eceb 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.1-jakarta + 14.0.0 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 026a355e83..195b5dc400 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.1-jakarta + 14.0.0 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 62e68bbf15..da4ce9fb5e 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.1-jakarta + 14.0.0 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.1-jakarta + 14.0.0