From 1807fc201e294b661dc5abe722a1f9d7e200e660 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 30 Mar 2023 22:56:55 +1300 Subject: [PATCH 001/161] 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/161] 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 7ee0610db1a27db00acbc88c34a7400d37805428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20P=C3=B6hler?= Date: Thu, 4 May 2023 10:51:41 +0200 Subject: [PATCH 003/161] ADD: Test for reproducing NPE with lazyloaing in findEach under HeapPressure (cherry picked from commit 96f071e08bf1ba64aee93b333d1ef80427c90522) --- .../query/TestQueryFindEachHeapPressure.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 ebean-test/src/test/java/org/tests/query/TestQueryFindEachHeapPressure.java diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachHeapPressure.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachHeapPressure.java new file mode 100644 index 0000000000..f164d2dde0 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachHeapPressure.java @@ -0,0 +1,67 @@ +package org.tests.query; + +import io.ebean.DB; +import io.ebean.Transaction; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.tests.m2m.softdelete.MsManyA; +import org.tests.m2m.softdelete.MsManyB; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class TestQueryFindEachHeapPressure extends BaseTestCase { + + private byte[] buffer; + + @BeforeEach + public void before() { + DB.find(MsManyB.class).delete(); + DB.find(MsManyA.class).delete(); + + List children = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + children.add(new MsManyB("child_" + i)); + } + DB.saveAll(children); + + try (Transaction txn = DB.beginTransaction()) { + for (int i = 0; i < 100; i++) { + MsManyA parent = new MsManyA("parent_" + i); + + Collections.shuffle(children); + + parent.getManybs().add(children.get(0)); + + DB.save(parent); + } + txn.commit(); + } + } + + /** + * Reproduce quickly, by manually adding System.gc at the beginning of CQuery#setLazyLoadedChildBean. + */ + @Test + @Disabled("Run manually with -Xmx128M") + public void test() throws Exception { + for (int j = 0; j < 1000; j++) { + System.out.println("Iteration " + j); + DB.find(MsManyA.class) + .findEach(parent -> { + if (Math.random() > 0.9) { + buffer = new byte[1_000_000]; + List children = parent.getManybs(); + assertThat(children.size()).isEqualTo(1); + assertThat(buffer.length).isEqualTo(1_000_000); + } + }); + } + } + +} From edb3759b3dca3bad9759c2f2388c151c6861a531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20P=C3=B6hler?= Date: Thu, 4 May 2023 11:14:33 +0200 Subject: [PATCH 004/161] Potential fix for NPE in lazyLoad under HeapPressure (cherry picked from commit 5aa163bb75a0eeb4000ed664bc6adbd5dd4f418c) --- .../src/main/java/io/ebeaninternal/server/query/CQuery.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 283bc032d6..2a20d595a7 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 @@ -385,7 +385,10 @@ public void setLazyLoadedChildBean(EntityBean bean, Object lazyLoadParentId) { this.lazyLoadParentId = lazyLoadParentId; } // add the loadedBean to the appropriate collection of lazyLoadParentBean - lazyLoadManyProperty.addBeanToCollectionWithCreate(lazyLoadParentBean, bean, true); + if (lazyLoadParentBean != null) { + // Note: parentBean can be null, when GC ran between construction of query and building the retrieved bean + lazyLoadManyProperty.addBeanToCollectionWithCreate(lazyLoadParentBean, bean, true); + } } } From 7efef027c07ea7c198f5df2ff652738780cd145f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 08:24:14 +1200 Subject: [PATCH 005/161] Fix javax-to-jakarta support for jakarta.transaction --- ebean-core/pom.xml | 16 ++++++++++++++++ javax-to-jakarta.sh | 1 + 2 files changed, 17 insertions(+) diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index d4a0079341..4a9de2da0d 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -81,12 +81,28 @@ provided + javax.transaction javax.transaction-api 1.3 true + + diff --git a/javax-to-jakarta.sh b/javax-to-jakarta.sh index c775326e04..99c0badf7c 100755 --- a/javax-to-jakarta.sh +++ b/javax-to-jakarta.sh @@ -11,6 +11,7 @@ sed -i '' -e 's|artifactId>persistence-api|artifactId>jakarta-persistence-api|g' ## adjust module-info sed -i '' -e 's| persistence\.api| jakarta\.persistence\.api|g' ebean-api/src/main/java/module-info.java sed -i '' -e 's| javax\.servlet\.api| jakarta\.servlet|g' ebean-api/src/main/java/module-info.java +sed -i '' -e 's| java\.transaction| jakarta\.transaction|g' ebean-core/src/main/java/module-info.java find . -type f -name 'module-info.java' -exec sed -i '' -e 's|java\.xml\.bind|jakarta\.xml\.bind|g' {} + From f25a20ff90f92ae7962cd1a36d7526d05a361684 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 19:17:14 +1200 Subject: [PATCH 006/161] Moved - ebean-autotune, ebean-csv-reader, ebean-joda-time, ebean-jackson-jsonnode, ebean-externalmapping-xml These modules have all been moved to ebean-component git repo. These are all optional modules and will be released at a slower cadence. --- ebean-autotune/pom.xml | 101 ------ .../server/autotune/model/Autotune.java | 133 -------- .../server/autotune/model/ObjectFactory.java | 64 ---- .../server/autotune/model/Origin.java | 148 --------- .../server/autotune/model/ProfileDiff.java | 64 ---- .../server/autotune/model/ProfileEmpty.java | 64 ---- .../server/autotune/model/ProfileNew.java | 64 ---- .../server/autotune/model/package-info.java | 2 - .../service/AutoTuneAllCollection.java | 61 ---- .../autotune/service/AutoTuneCollection.java | 115 ------- .../service/AutoTuneDiffCollection.java | 161 ---------- .../service/AutoTuneServiceFactory.java | 15 - .../autotune/service/AutoTuneXmlReader.java | 52 --- .../autotune/service/AutoTuneXmlWriter.java | 57 ---- .../autotune/service/BaseQueryTuner.java | 204 ------------ .../service/DefaultAutoTuneService.java | 295 ------------------ .../autotune/service/ProfileManager.java | 122 -------- .../autotune/service/ProfileOrigin.java | 176 ----------- .../service/ProfileOriginNodeUsage.java | 128 -------- .../autotune/service/ProfileOriginQuery.java | 41 --- .../service/SortAutoTuneDocument.java | 70 ----- .../autotune/service/TunedQueryInfo.java | 71 ----- ebean-autotune/src/main/java/module-info.java | 15 - ...al.server.autotune.AutoTuneServiceProvider | 1 - .../src/main/resources/ebean-autotune-1.0.xsd | 55 ---- .../service/AutoTuneXmlReaderTest.java | 31 -- .../autotune/service/ProfileOriginTest.java | 149 --------- .../org/tests/autofetch/BaseTestCase.java | 16 - .../MainAutoFetchExcludeLazyLobs.java | 32 -- .../tests/autofetch/MainAutoQueryTune1.java | 37 --- .../java/org/tests/autofetch/TestData.java | 25 -- .../tests/autofetch/TunedQueryInfoTest.java | 172 ---------- .../TunedQueryWithNullFetchedBeanTest.java | 69 ---- .../java/org/tests/model/basic/Address.java | 42 --- .../java/org/tests/model/basic/BaseModel.java | 58 ---- .../java/org/tests/model/basic/Customer.java | 48 --- .../java/org/tests/model/basic/Order.java | 50 --- .../resources/application-test.properties | 17 - .../test/resources/autotune/my-autotune.xml | 15 - .../test/resources/autotune/test-autotune.xml | 35 --- .../src/test/resources/logback-test.xml | 22 -- ebean-csv-reader/pom.xml | 63 ---- .../java/io/ebean/csv/reader/CsvCallback.java | 78 ----- .../java/io/ebean/csv/reader/CsvReader.java | 214 ------------- .../io/ebean/csv/reader/CsvUtilReader.java | 249 --------------- .../ebean/csv/reader/DefaultCsvCallback.java | 197 ------------ .../io/ebean/csv/reader/TimeStringParser.java | 57 ---- .../src/main/java/module-info.java | 6 - .../io/ebean/csv/reader/CsvReaderTest.java | 55 ---- .../csv/reader/TestCsvReaderWithCallback.java | 47 --- .../csv/reader/TimeStringParserTest.java | 36 --- .../src/test/java/org/example/BaseEntity.java | 48 --- .../src/test/java/org/example/Country.java | 31 -- .../src/test/java/org/example/Customer.java | 63 ---- .../src/test/java/org/example/DAddress.java | 54 ---- .../src/test/resources/application-test.yml | 4 - ebean-csv-reader/src/test/resources/test1.csv | 9 - ebean-externalmapping-api/pom.xml | 14 - .../ebeaninternal/xmapping/api/XmapDto.java | 26 -- .../ebeaninternal/xmapping/api/XmapEbean.java | 22 -- .../xmapping/api/XmapEntity.java | 39 --- .../xmapping/api/XmapNamedQuery.java | 29 -- .../xmapping/api/XmapRawSql.java | 57 ---- .../xmapping/api/XmapService.java | 15 - .../src/main/java/module-info.java | 4 - ebean-externalmapping-xml/pom.xml | 115 ------- .../xmlmapping/InternalConfigXmlRead.java | 59 ---- .../xmlmapping/JaxbXmapService.java | 14 - .../ebeaninternal/xmlmapping/ToXmapEbean.java | 85 ----- .../xmlmapping/XmlMappingReader.java | 76 ----- .../xmlmapping/model/ObjectFactory.java | 78 ----- .../xmlmapping/model/XmAliasMapping.java | 76 ----- .../xmlmapping/model/XmColumnMapping.java | 76 ----- .../ebeaninternal/xmlmapping/model/XmDto.java | 121 ------- .../xmlmapping/model/XmEbean.java | 80 ----- .../xmlmapping/model/XmEntity.java | 121 ------- .../xmlmapping/model/XmNamedQuery.java | 81 ----- .../xmlmapping/model/XmQuery.java | 54 ---- .../xmlmapping/model/XmRawSql.java | 145 --------- .../xmlmapping/model/package-info.java | 2 - .../src/main/java/module-info.java | 21 -- .../io.ebeaninternal.xmapping.api.XmapService | 1 - .../src/main/resources/ebean-1.0.xsd | 80 ----- .../model/XmlMappingReaderTest.java | 21 -- .../java/org/tests/model/basic/Address.java | 14 - .../org/tests/model/basic/BasicDomain.java | 60 ---- .../java/org/tests/model/basic/Contact.java | 24 -- .../java/org/tests/model/basic/CustDto.java | 36 --- .../java/org/tests/model/basic/Customer.java | 103 ------ .../java/org/tests/model/basic/Order.java | 37 --- .../org/tests/model/basic/OrderAggregate.java | 25 -- .../org/tests/model/basic/OrderDetail.java | 28 -- .../java/org/tests/model/basic/Product.java | 11 - .../tests/model/basic/test/BaseTestCase.java | 21 -- .../model/basic/test/NamedDtoQueryTest.java | 28 -- .../basic/test/NamedLocalAndExternalTest.java | 68 ---- .../test/OrderAggregateNamedRawSqlTest.java | 59 ---- .../model/basic/test/RawSqlOrmQueryTest.java | 77 ----- .../test/resources/META-INF/ebean-version.mf | 1 - .../resources/application-test.properties | 17 - .../ebean-xml-mappings/CustomerMapping.xml | 22 -- .../ebean-xml-mappings/OrderMapping.xml | 30 -- .../src/test/resources/ebean.mf | 1 - .../src/test/resources/ebean.xml | 59 ---- .../src/test/resources/logback-test.xml | 21 -- .../src/test/resources/test-ebean.xml | 23 -- ebean-jackson-jsonnode/pom.xml | 43 --- .../ebean/jackson/jsonnode/JsonNodeSet.java | 51 --- .../jackson/jsonnode/JsonNodeTypeFactory.java | 31 -- .../jackson/jsonnode/ScalarTypeJsonNode.java | 201 ------------ .../jsonnode/ScalarTypeJsonNodePostgres.java | 50 --- .../src/main/java/module-info.java | 10 - .../io.ebean.core.type.ScalarTypeSetFactory | 1 - ebean-joda-time/pom.xml | 42 --- .../ebean/joda/time/JodaExtraTypeFactory.java | 40 --- .../joda/time/ScalarTypeJodaDateMidnight.java | 59 ---- .../joda/time/ScalarTypeJodaDateTime.java | 72 ----- .../joda/time/ScalarTypeJodaLocalDate.java | 63 ---- .../time/ScalarTypeJodaLocalDateNative.java | 35 --- .../time/ScalarTypeJodaLocalDateTime.java | 77 ----- .../joda/time/ScalarTypeJodaLocalTime.java | 118 ------- .../joda/time/ScalarTypeJodaLocalTimeUTC.java | 63 ---- .../ebean/joda/time/ScalarTypeJodaPeriod.java | 40 --- .../src/main/java/module-info.java | 9 - .../io.ebean.core.type.ExtraTypeFactory | 1 - .../time/ScalarTypeJodaDateMidnightTest.java | 30 -- .../time/ScalarTypeJodaLocalDateTest.java | 82 ----- .../time/ScalarTypeJodaLocalDateTimeTest.java | 57 ---- .../time/ScalarTypeJodaLocalTimeTest.java | 48 --- .../joda/time/ScalarTypeJodaPeriodTest.java | 43 --- pom.xml | 6 - 131 files changed, 7857 deletions(-) delete mode 100644 ebean-autotune/pom.xml delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneCollection.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginQuery.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java delete mode 100644 ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java delete mode 100644 ebean-autotune/src/main/java/module-info.java delete mode 100644 ebean-autotune/src/main/resources/META-INF/services/io.ebeaninternal.server.autotune.AutoTuneServiceProvider delete mode 100644 ebean-autotune/src/main/resources/ebean-autotune-1.0.xsd delete mode 100644 ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java delete mode 100644 ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java delete mode 100644 ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java delete mode 100644 ebean-autotune/src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java delete mode 100644 ebean-autotune/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java delete mode 100644 ebean-autotune/src/test/java/org/tests/autofetch/TestData.java delete mode 100644 ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java delete mode 100644 ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java delete mode 100644 ebean-autotune/src/test/java/org/tests/model/basic/Address.java delete mode 100644 ebean-autotune/src/test/java/org/tests/model/basic/BaseModel.java delete mode 100644 ebean-autotune/src/test/java/org/tests/model/basic/Customer.java delete mode 100644 ebean-autotune/src/test/java/org/tests/model/basic/Order.java delete mode 100644 ebean-autotune/src/test/resources/application-test.properties delete mode 100644 ebean-autotune/src/test/resources/autotune/my-autotune.xml delete mode 100644 ebean-autotune/src/test/resources/autotune/test-autotune.xml delete mode 100644 ebean-autotune/src/test/resources/logback-test.xml delete mode 100644 ebean-csv-reader/pom.xml delete mode 100644 ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvCallback.java delete mode 100644 ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java delete mode 100644 ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvUtilReader.java delete mode 100644 ebean-csv-reader/src/main/java/io/ebean/csv/reader/DefaultCsvCallback.java delete mode 100644 ebean-csv-reader/src/main/java/io/ebean/csv/reader/TimeStringParser.java delete mode 100644 ebean-csv-reader/src/main/java/module-info.java delete mode 100644 ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java delete mode 100644 ebean-csv-reader/src/test/java/io/ebean/csv/reader/TestCsvReaderWithCallback.java delete mode 100644 ebean-csv-reader/src/test/java/io/ebean/csv/reader/TimeStringParserTest.java delete mode 100644 ebean-csv-reader/src/test/java/org/example/BaseEntity.java delete mode 100644 ebean-csv-reader/src/test/java/org/example/Country.java delete mode 100644 ebean-csv-reader/src/test/java/org/example/Customer.java delete mode 100644 ebean-csv-reader/src/test/java/org/example/DAddress.java delete mode 100644 ebean-csv-reader/src/test/resources/application-test.yml delete mode 100644 ebean-csv-reader/src/test/resources/test1.csv delete mode 100644 ebean-externalmapping-api/pom.xml delete mode 100644 ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapDto.java delete mode 100644 ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEbean.java delete mode 100644 ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEntity.java delete mode 100644 ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapNamedQuery.java delete mode 100644 ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapRawSql.java delete mode 100644 ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapService.java delete mode 100644 ebean-externalmapping-api/src/main/java/module-info.java delete mode 100644 ebean-externalmapping-xml/pom.xml delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/JaxbXmapService.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/ToXmapEbean.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java delete mode 100644 ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java delete mode 100644 ebean-externalmapping-xml/src/main/java/module-info.java delete mode 100644 ebean-externalmapping-xml/src/main/resources/META-INF/services/io.ebeaninternal.xmapping.api.XmapService delete mode 100644 ebean-externalmapping-xml/src/main/resources/ebean-1.0.xsd delete mode 100644 ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Address.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/BasicDomain.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Contact.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/CustDto.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Customer.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Order.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderAggregate.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderDetail.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Product.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java delete mode 100644 ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java delete mode 100644 ebean-externalmapping-xml/src/test/resources/META-INF/ebean-version.mf delete mode 100644 ebean-externalmapping-xml/src/test/resources/application-test.properties delete mode 100644 ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/CustomerMapping.xml delete mode 100644 ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/OrderMapping.xml delete mode 100644 ebean-externalmapping-xml/src/test/resources/ebean.mf delete mode 100644 ebean-externalmapping-xml/src/test/resources/ebean.xml delete mode 100644 ebean-externalmapping-xml/src/test/resources/logback-test.xml delete mode 100644 ebean-externalmapping-xml/src/test/resources/test-ebean.xml delete mode 100644 ebean-jackson-jsonnode/pom.xml delete mode 100644 ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java delete mode 100644 ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java delete mode 100644 ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java delete mode 100644 ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java delete mode 100644 ebean-jackson-jsonnode/src/main/java/module-info.java delete mode 100644 ebean-jackson-jsonnode/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory delete mode 100644 ebean-joda-time/pom.xml delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateTime.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDate.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateNative.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTime.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeUTC.java delete mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaPeriod.java delete mode 100644 ebean-joda-time/src/main/java/module-info.java delete mode 100644 ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory delete mode 100644 ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaDateMidnightTest.java delete mode 100644 ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTest.java delete mode 100644 ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTimeTest.java delete mode 100644 ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeTest.java delete mode 100644 ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaPeriodTest.java diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml deleted file mode 100644 index d68a6032f7..0000000000 --- a/ebean-autotune/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 13.18.0 - - - - - - - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - ebean autotune - ebean automatic query tuning module - ebean-autotune - - - - - io.ebean - ebean-core - 13.18.0 - provided - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.6 - provided - - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-ddl-generator - 13.18.0 - test - - - - io.avaje - junit - 1.1 - test - - - - io.ebean - ebean-platform-h2 - 13.18.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.34 - true - - - io.ebean.tile:enhancement:13.17.1 - - - - - - - diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java deleted file mode 100644 index f5b4954bb2..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java +++ /dev/null @@ -1,133 +0,0 @@ -package io.ebeaninternal.server.autotune.model; - -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 java.util.ArrayList; -import java.util.List; - - -/** - * Java class for anonymous complex type. - *

- * The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileDiff" minOccurs="0"/>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileNew" minOccurs="0"/>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileEmpty" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "origin", - "profileDiff", - "profileNew", - "profileEmpty" -}) -@XmlRootElement(name = "autotune") -public class Autotune { - - protected List origin; - protected ProfileDiff profileDiff; - protected ProfileNew profileNew; - protected ProfileEmpty profileEmpty; - - /** - * Gets the value of the origin property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getOrigin().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; - } - - /** - * Gets the value of the profileDiff property. - * - * @return possible object is - * {@link ProfileDiff } - */ - public ProfileDiff getProfileDiff() { - return profileDiff; - } - - /** - * Sets the value of the profileDiff property. - * - * @param value allowed object is - * {@link ProfileDiff } - */ - public void setProfileDiff(ProfileDiff value) { - this.profileDiff = value; - } - - /** - * Gets the value of the profileNew property. - * - * @return possible object is - * {@link ProfileNew } - */ - public ProfileNew getProfileNew() { - return profileNew; - } - - /** - * Sets the value of the profileNew property. - * - * @param value allowed object is - * {@link ProfileNew } - */ - public void setProfileNew(ProfileNew value) { - this.profileNew = value; - } - - /** - * Gets the value of the profileEmpty property. - * - * @return possible object is - * {@link ProfileEmpty } - */ - public ProfileEmpty getProfileEmpty() { - return profileEmpty; - } - - /** - * Sets the value of the profileEmpty property. - * - * @param value allowed object is - * {@link ProfileEmpty } - */ - public void setProfileEmpty(ProfileEmpty value) { - this.profileEmpty = value; - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java deleted file mode 100644 index 2e5d7eba35..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.ebeaninternal.server.autotune.model; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the io.ebeaninternal.server.autotune.model package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.server.autotune.model - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link ProfileNew } - */ - public ProfileNew createProfileNew() { - return new ProfileNew(); - } - - /** - * Create an instance of {@link Origin } - */ - public Origin createOrigin() { - return new Origin(); - } - - /** - * Create an instance of {@link ProfileEmpty } - */ - public ProfileEmpty createProfileEmpty() { - return new ProfileEmpty(); - } - - /** - * Create an instance of {@link Autotune } - */ - public Autotune createAutotune() { - return new Autotune(); - } - - /** - * Create an instance of {@link ProfileDiff } - */ - public ProfileDiff createProfileDiff() { - return new ProfileDiff(); - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java deleted file mode 100644 index 6471d3877c..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java +++ /dev/null @@ -1,148 +0,0 @@ -package io.ebeaninternal.server.autotune.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; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="callStack" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="beanType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="detail" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="original" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "callStack" -}) -@XmlRootElement(name = "origin") -public class Origin { - - protected String callStack; - @XmlAttribute(name = "key", required = true) - protected String key; - @XmlAttribute(name = "beanType") - protected String beanType; - @XmlAttribute(name = "detail") - protected String detail; - @XmlAttribute(name = "original") - protected String original; - - /** - * Gets the value of the callStack property. - * - * @return possible object is - * {@link String } - */ - public String getCallStack() { - return callStack; - } - - /** - * Sets the value of the callStack property. - * - * @param value allowed object is - * {@link String } - */ - public void setCallStack(String value) { - this.callStack = value; - } - - /** - * Gets the value of the key property. - * - * @return possible object is - * {@link String } - */ - public String getKey() { - return key; - } - - /** - * Sets the value of the key property. - * - * @param value allowed object is - * {@link String } - */ - public void setKey(String value) { - this.key = value; - } - - /** - * Gets the value of the beanType property. - * - * @return possible object is - * {@link String } - */ - public String getBeanType() { - return beanType; - } - - /** - * Sets the value of the beanType property. - * - * @param value allowed object is - * {@link String } - */ - public void setBeanType(String value) { - this.beanType = value; - } - - /** - * Gets the value of the detail property. - * - * @return possible object is - * {@link String } - */ - public String getDetail() { - return detail; - } - - /** - * Sets the value of the detail property. - * - * @param value allowed object is - * {@link String } - */ - public void setDetail(String value) { - this.detail = value; - } - - /** - * Gets the value of the original property. - * - * @return possible object is - * {@link String } - */ - public String getOriginal() { - return original; - } - - /** - * Sets the value of the original property. - * - * @param value allowed object is - * {@link String } - */ - public void setOriginal(String value) { - this.original = value; - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java deleted file mode 100644 index 1738fead91..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.ebeaninternal.server.autotune.model; - -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 java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "origin" -}) -@XmlRootElement(name = "profileDiff") -public class ProfileDiff { - - protected List origin; - - /** - * Gets the value of the origin property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getOrigin().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java deleted file mode 100644 index d22140aa80..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.ebeaninternal.server.autotune.model; - -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 java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "origin" -}) -@XmlRootElement(name = "profileEmpty") -public class ProfileEmpty { - - protected List origin; - - /** - * Gets the value of the origin property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getOrigin().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java deleted file mode 100644 index 7910acb84d..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.ebeaninternal.server.autotune.model; - -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 java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "origin" -}) -@XmlRootElement(name = "profileNew") -public class ProfileNew { - - protected List origin; - - /** - * Gets the value of the origin property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the origin property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getOrigin().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link Origin } - */ - public List getOrigin() { - if (origin == null) { - origin = new ArrayList<>(); - } - return this.origin; - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java deleted file mode 100644 index 78deec068d..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package io.ebeaninternal.server.autotune.model; diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java deleted file mode 100644 index 463b35b25d..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java +++ /dev/null @@ -1,61 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebeaninternal.server.autotune.model.Autotune; - -import java.util.Collection; - -/** - * Event where all tuned query information is collected. - *

- * This is for writing the "all" file on shutdown when using runtime tuning. - *

- */ -public class AutoTuneAllCollection { - - final Autotune document = new Autotune(); - - final BaseQueryTuner queryTuner; - - /** - * Construct to collect/report all tuned queries. - */ - public AutoTuneAllCollection(BaseQueryTuner queryTuner) { - this.queryTuner = queryTuner; - loadAllTuned(); - } - - /** - * Return the number of origin elements in the document. - */ - public int size() { - return document.getOrigin().size(); - } - - /** - * Return the Autotune document object. - */ - public Autotune getDocument() { - return document; - } - - /** - * Write the document as an xml file. - */ - public void writeFile(String filePrefix, boolean withNow) { - - AutoTuneXmlWriter writer = new AutoTuneXmlWriter(); - writer.write(document, filePrefix, withNow); - } - - /** - * Loads all the existing query tuning into the document. - */ - private void loadAllTuned() { - - Collection all = queryTuner.getAll(); - for (TunedQueryInfo tuned : all) { - document.getOrigin().add(tuned.getOrigin()); - } - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneCollection.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneCollection.java deleted file mode 100644 index 7c2a0dcf85..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneCollection.java +++ /dev/null @@ -1,115 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebean.bean.ObjectGraphOrigin; -import io.ebeaninternal.server.querydefn.OrmQueryDetail; - -import java.util.ArrayList; -import java.util.List; - -/** - * Profiling information collected. - */ -public class AutoTuneCollection { - - final List entries = new ArrayList<>(); - - public Entry add(ObjectGraphOrigin origin, OrmQueryDetail detail, String sourceQuery) { - Entry entry = new Entry(origin, detail, sourceQuery); - entries.add(entry); - return entry; - } - - public List getEntries() { - return entries; - } - - /** - * Profiling entry at a given origin point. - */ - public static class Entry { - - /** - * Profiling origin point. - */ - private final ObjectGraphOrigin origin; - - /** - * The tuned query detail. - */ - private final OrmQueryDetail detail; - - /** - * The original/existing query detail. - */ - private final String originalQuery; - - /** - * Summary execution statistics for queries related to this origin point. - */ - private final List queries = new ArrayList<>(); - - public Entry(ObjectGraphOrigin origin, OrmQueryDetail detail, String originalQuery) { - this.origin = origin; - this.detail = detail; - this.originalQuery = originalQuery; - } - - public void addQuery(EntryQuery entryQuery) { - queries.add(entryQuery); - } - - public ObjectGraphOrigin getOrigin() { - return origin; - } - - public OrmQueryDetail getDetail() { - return detail; - } - - public String getOriginalQuery() { - return originalQuery; - } - - public List getQueries() { - return queries; - } - - } - - /** - * Summary query execution statistics for the origin point. - */ - public static class EntryQuery { - - final String path; - final long exeCount; - final long totalBeanLoaded; - final long totalMicros; - - public EntryQuery(String path, long exeCount, long totalBeanLoaded, long totalMicros) { - this.path = path; - this.exeCount = exeCount; - this.totalBeanLoaded = totalBeanLoaded; - this.totalMicros = totalMicros; - } - - /** - * Return the relative path with empty string for the origin query. - */ - public String getPath() { - return path; - } - - public long getExeCount() { - return exeCount; - } - - public long getTotalBeanLoaded() { - return totalBeanLoaded; - } - - public long getTotalMicros() { - return totalMicros; - } - } -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java deleted file mode 100644 index f29962f677..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java +++ /dev/null @@ -1,161 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebean.bean.ObjectGraphOrigin; -import io.ebeaninternal.server.autotune.model.Autotune; -import io.ebeaninternal.server.autotune.model.Origin; -import io.ebeaninternal.server.autotune.model.ProfileDiff; -import io.ebeaninternal.server.autotune.model.ProfileNew; -import io.ebeaninternal.server.querydefn.OrmQueryDetail; - -/** - * Event where profiling information is collected and processed for differences - * relative to the current query tuning. - */ -public class AutoTuneDiffCollection { - - final Autotune document = new Autotune(); - - final AutoTuneCollection profiling; - - final BaseQueryTuner queryTuner; - - final boolean updateTuning; - - int newCount; - - int diffCount; - - /** - * Construct to collect/report the new/diff query tuning entries. - */ - public AutoTuneDiffCollection(AutoTuneCollection profiling, BaseQueryTuner queryTuner, boolean updateTuning) { - this.profiling = profiling; - this.queryTuner = queryTuner; - this.updateTuning = updateTuning; - } - - /** - * Return true if there are no new or diff entries. - */ - public boolean isEmpty() { - return newCount == 0 && diffCount == 0; - } - - /** - * Return the underlying Autotune document object. - */ - public Autotune getDocument() { - return document; - } - - /** - * Return the number of diff entries. - */ - public int getDiffCount() { - return diffCount; - } - - /** - * Return the number of new entries. - */ - public int getNewCount() { - return newCount; - } - - /** - * Return the total new and diff entries. - */ - public int getChangeCount() { - return newCount + diffCount; - } - - /** - * Write the underlying document as an xml file. - */ - public void writeFile(String filePrefix) { - - AutoTuneXmlWriter writer = new AutoTuneXmlWriter(); - writer.write(document, filePrefix, true); - } - - /** - * Process checking profiling entries against existing query tuning. - */ - public void process() { - - for (AutoTuneCollection.Entry entry : profiling.getEntries()) { - addToDocument(entry); - } - } - - /** - * Check if the entry is new or diff and add as necessary. - */ - private void addToDocument(AutoTuneCollection.Entry entry) { - - ObjectGraphOrigin point = entry.getOrigin(); - OrmQueryDetail profileDetail = entry.getDetail(); - - // compare with the existing query tuning entry - OrmQueryDetail tuneDetail = queryTuner.get(point.key()); - if (tuneDetail == null) { - addToDocumentNewEntry(entry, point); - - } else if (!tuneDetail.isAutoTuneEqual(profileDetail)) { - addToDocumentDiffEntry(entry, point, tuneDetail); - } - } - - /** - * Add as a diff entry. - */ - private void addToDocumentDiffEntry(AutoTuneCollection.Entry entry, ObjectGraphOrigin point, OrmQueryDetail tuneDetail) { - - diffCount++; - - Origin origin = createOrigin(entry, point, tuneDetail.asString()); - ProfileDiff diff = document.getProfileDiff(); - if (diff == null) { - diff = new ProfileDiff(); - document.setProfileDiff(diff); - } - diff.getOrigin().add(origin); - } - - /** - * Add as a "new" entry. - */ - private void addToDocumentNewEntry(AutoTuneCollection.Entry entry, ObjectGraphOrigin point) { - - newCount++; - - ProfileNew profileNew = document.getProfileNew(); - if (profileNew == null) { - profileNew = new ProfileNew(); - document.setProfileNew(profileNew); - } - Origin origin = createOrigin(entry, point, entry.getOriginalQuery()); - profileNew.getOrigin().add(origin); - } - - - /** - * Create the XML Origin bean for the given entry and ObjectGraphOrigin. - */ - private Origin createOrigin(AutoTuneCollection.Entry entry, ObjectGraphOrigin point, String query) { - - Origin origin = new Origin(); - origin.setKey(point.key()); - origin.setBeanType(point.beanType()); - origin.setDetail(entry.getDetail().asString()); - origin.setCallStack(point.callOrigin().description()); - origin.setOriginal(query); - - if (updateTuning) { - queryTuner.put(origin); - } - - return origin; - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java deleted file mode 100644 index e513bea820..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebean.config.DatabaseConfig; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.server.autotune.AutoTuneService; -import io.ebeaninternal.server.autotune.AutoTuneServiceProvider; - -public class AutoTuneServiceFactory implements AutoTuneServiceProvider { - - @Override - public AutoTuneService create(SpiEbeanServer server, DatabaseConfig config) { - return new DefaultAutoTuneService(server, config); - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java deleted file mode 100644 index 3b0dd797f6..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java +++ /dev/null @@ -1,52 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - - -import io.ebeaninternal.server.autotune.model.Autotune; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; - -/** - * Reads a profiling xml document. - */ -public class AutoTuneXmlReader { - - /** - * Read and return a Profiling from an xml file. - */ - public static Autotune read(File file) { - try { - return readFile(file); - } catch (IOException e) { - throw new IllegalStateException(e); - } - } - - protected static Autotune readFile(File file) throws IOException { - if (!file.exists()) { - return new Autotune(); - } - try (FileInputStream is = new FileInputStream(file)) { - return read(is); - } - } - - /** - * Read and return a Profiling from an xml document. - */ - public static Autotune read(InputStream is) { - try { - JAXBContext jaxbContext = JAXBContext.newInstance(Autotune.class); - Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); - return (Autotune) unmarshaller.unmarshal(is); - } catch (JAXBException e) { - throw new IllegalStateException(e); - } - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java deleted file mode 100644 index 3a9fd859e3..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - - -import io.ebeaninternal.server.autotune.model.Autotune; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * Simple writer for output of the AutoTune Profiling as an XML document. - */ -public class AutoTuneXmlWriter { - - /** - * Return 'now' as a string to second precision. - */ - public static String now() { - SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd-HHmmss"); - return df.format(new Date()); - } - - /** - * Write the document as xml file with the given prefix. - */ - public void write(Autotune document, String fileName, boolean withNow) { - - SortAutoTuneDocument.sort(document); - - if (withNow) { - fileName += "-" + now() + ".xml"; - } - - // write the file with serverName and now suffix as we can output the profiling many times - write(document, new File(fileName)); - } - - /** - * Write Profiling to a file as xml. - */ - public void write(Autotune profiling, File file) { - - try { - JAXBContext jaxbContext = JAXBContext.newInstance(Autotune.class); - Marshaller marshaller = jaxbContext.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); - marshaller.marshal(profiling, file); - - } catch (JAXBException e) { - throw new RuntimeException(e); - } - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java deleted file mode 100644 index dd51c7b577..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java +++ /dev/null @@ -1,204 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebean.bean.CallOrigin; -import io.ebean.bean.ObjectGraphNode; -import io.ebean.config.AutoTuneConfig; -import io.ebean.config.AutoTuneMode; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.api.SpiQuery; -import io.ebeaninternal.server.autotune.ProfilingListener; -import io.ebeaninternal.server.autotune.model.Origin; -import io.ebeaninternal.server.querydefn.OrmQueryDetail; - -import javax.persistence.PersistenceException; -import java.util.Collection; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - -/** - * - */ -public class BaseQueryTuner { - - private final boolean queryTuning; - - private final boolean profiling; - - private final AutoTuneMode mode; - - /** - * Map of the tuned query details per profile query point. - */ - private final Map tunedQueryInfoMap = new ConcurrentHashMap<>(); - - private final SpiEbeanServer server; - - private final ProfilingListener profilingListener; - - /** - * Flag set true when there is no profiling or query tuning. - */ - private final boolean skipAll; - - BaseQueryTuner(AutoTuneConfig config, SpiEbeanServer server, ProfilingListener profilingListener) { - this.server = server; - this.profilingListener = profilingListener; - this.mode = config.getMode(); - this.queryTuning = config.isQueryTuning(); - this.profiling = config.isProfiling(); - this.skipAll = !queryTuning && !profiling; - } - - /** - * Return all the current tuned query entries. - */ - public Collection getAll() { - return tunedQueryInfoMap.values(); - } - - /** - * Put a query tuning entry. - */ - public void put(Origin origin) { - - tunedQueryInfoMap.put(origin.getKey(), new TunedQueryInfo(origin)); - } - - /** - * Load the tuned query information. - */ - public void load(String key, TunedQueryInfo queryInfo) { - tunedQueryInfoMap.put(key, queryInfo); - } - - /** - * Return the detail currently used for tuning. - * This returns null if there is currently no matching tuning. - */ - public OrmQueryDetail get(String key) { - TunedQueryInfo info = tunedQueryInfoMap.get(key); - return (info == null) ? null : info.getTunedDetail(); - } - - /** - * Auto tune the query and enable profiling. - */ - boolean tuneQuery(SpiQuery query) { - - if (skipAll || !tunableQuery(query)) { - return false; - } - - if (query.getProfilingListener() != null) { - // profiling secondary query - return false; - } - - if (!useTuning(query)) { - if (profiling) { - profiling(query, server.createCallOrigin()); - } - return false; - } - - if (query.getParentNode() != null) { - // This is a +lazy/+query query with profiling on. - // We continue to collect the profiling information. - query.setProfilingListener(profilingListener); - return true; - } - - // create a query point to identify the query - CallOrigin callOrigin = server.createCallOrigin(); - ObjectGraphNode origin = query.setOrigin(callOrigin); - - if (profiling) { - if (profilingListener.isProfileRequest(origin, query)) { - // collect more profiling based on profiling rate etc - query.setProfilingListener(profilingListener); - } - } - - if (queryTuning) { - // get current "tuned fetch" for this query point - TunedQueryInfo tuneInfo = tunedQueryInfoMap.get(origin.origin().key()); - return tuneInfo != null && tuneInfo.tuneQuery(query); - } - return false; - } - - /** - * Return false for row count, find ids, subQuery, delete and Versions queries. - *

- * These queries are not applicable for autoTune in that they don't have a select/fetch (fetch group). - *

- *

- * We also exclude queries that are explicitly set to load the L2 bean cache as we want full beans - * in that case. - *

- */ - private boolean tunableQuery(SpiQuery query) { - SpiQuery.Type type = query.getType(); - switch (type) { - case COUNT: - case ATTRIBUTE: - case ATTRIBUTE_SET: - case ID_LIST: - case UPDATE: - case DELETE: - case SQ_EXISTS: - case SQ_EX: - return false; - default: - // not using autoTune when explicitly loading the l2 bean cache - // or when using Versions query - return !query.isForceHitDatabase() && SpiQuery.TemporalMode.VERSIONS != query.getTemporalMode(); - } - } - - private void profiling(SpiQuery query, CallOrigin call) { - - // create a query point to identify the query - ObjectGraphNode origin = query.setOrigin(call); - if (profilingListener.isProfileRequest(origin, query)) { - // collect more profiling based on profiling rate etc - query.setProfilingListener(profilingListener); - } - } - - /** - * Return true if we should try to tune this query. - */ - private boolean useTuning(SpiQuery query) { - - Boolean autoTune = query.isAutoTune(); - if (autoTune != null) { - // explicitly set... - return autoTune; - - } else { - // determine using implicit mode... - switch (mode) { - case DEFAULT_ON: - return true; - - case DEFAULT_OFF: - return false; - - case DEFAULT_ONIFEMPTY: - return query.isDetailEmpty(); - - default: - throw new PersistenceException("Invalid AutoTuneMode " + mode); - } - } - } - - /** - * Return the keys as a set. - */ - public Set keySet() { - return tunedQueryInfoMap.keySet(); - } -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java deleted file mode 100644 index a0031f9388..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java +++ /dev/null @@ -1,295 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.avaje.applog.AppLog; -import io.ebean.config.AutoTuneConfig; -import io.ebean.config.DatabaseConfig; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.api.SpiQuery; -import io.ebeaninternal.server.autotune.AutoTuneService; -import io.ebeaninternal.server.autotune.model.Autotune; -import io.ebeaninternal.server.autotune.model.Origin; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.ReentrantLock; - -import static java.lang.System.Logger.Level.*; - -/** - * Implementation of the AutoTuneService which is comprised of profiling and query tuning. - */ -public class DefaultAutoTuneService implements AutoTuneService { - - private static final System.Logger logger = AppLog.getLogger(DefaultAutoTuneService.class); - - private final ReentrantLock lock = new ReentrantLock(); - - private final SpiEbeanServer server; - - private final long defaultGarbageCollectionWait; - - private final boolean skipGarbageCollectionOnShutdown; - - private final boolean skipProfileReportingOnShutdown; - - private final BaseQueryTuner queryTuner; - - private final ProfileManager profileManager; - - private final boolean profiling; - - private final boolean queryTuning; - - private final String tuningFile; - - private final String profilingFile; - - private final String serverName; - - private final int profilingUpdateFrequency; - - private long runtimeChangeCount; - - public DefaultAutoTuneService(SpiEbeanServer server, DatabaseConfig databaseConfig) { - AutoTuneConfig config = databaseConfig.getAutoTuneConfig(); - this.server = server; - this.queryTuning = config.isQueryTuning(); - this.profiling = config.isProfiling(); - this.tuningFile = config.getQueryTuningFile(); - this.profilingFile = config.getProfilingFile(); - this.profilingUpdateFrequency = config.getProfilingUpdateFrequency(); - this.serverName = server.name(); - this.profileManager = new ProfileManager(config, server); - this.queryTuner = new BaseQueryTuner(config, server, profileManager); - this.skipGarbageCollectionOnShutdown = config.isSkipGarbageCollectionOnShutdown(); - this.skipProfileReportingOnShutdown = config.isSkipProfileReportingOnShutdown(); - this.defaultGarbageCollectionWait = config.getGarbageCollectionWait(); - } - - /** - * Load the query tuning information from it's data store. - */ - @Override - public void startup() { - - if (queryTuning) { - loadTuningFile(); - if (isRuntimeTuningUpdates()) { - // periodically gather and update query tuning - server.backgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS); - } - } - } - - - /** - * Return true if the tuning should update periodically at runtime. - */ - private boolean isRuntimeTuningUpdates() { - return profilingUpdateFrequency > 0; - } - - private class ProfilingUpdate implements Runnable { - - @Override - public void run() { - runtimeTuningUpdate(); - } - } - - /** - * Load tuning information from an existing tuning file. - */ - private void loadTuningFile() { - File file = new File(tuningFile); - if (file.exists()) { - loadAutoTuneProfiling(AutoTuneXmlReader.read(file)); - } else { - // look for autotune as a resource - try (InputStream stream = getClass().getResourceAsStream("/" + tuningFile)) { - if (stream != null) { - loadAutoTuneProfiling(AutoTuneXmlReader.read(stream)); - } else { - logger.log(WARNING, "AutoTune file {0} not found - no initial automatic query tuning", tuningFile); - } - } catch (IOException e) { - throw new IllegalStateException("Error on auto close of " + tuningFile, e); - } - } - } - - private void loadAutoTuneProfiling(Autotune profiling) { - logger.log(INFO, "AutoTune loading {0} tuning entries", profiling.getOrigin().size()); - for (Origin origin : profiling.getOrigin()) { - queryTuner.put(origin); - } - } - - /** - * Collect profiling, check for new/diff to existing tuning and apply changes. - */ - private void runtimeTuningUpdate() { - lock.lock(); - try { - try { - long start = System.currentTimeMillis(); - - AutoTuneCollection profiling = profileManager.profilingCollection(false); - - AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, true); - event.process(); - if (event.isEmpty()) { - long exeMillis = System.currentTimeMillis() - start; - logger.log(DEBUG, "No query tuning updates for server:{0} executionMillis:{1}", serverName, exeMillis); - - } else { - // report the query tuning changes that have been made - runtimeChangeCount += event.getChangeCount(); - event.writeFile(profilingFile + "-" + serverName + "-update"); - long exeMillis = System.currentTimeMillis() - start; - logger.log(INFO, "query tuning updates - new:{0} diff:{1} for server:{2} executionMillis:{3}", event.getNewCount(), event.getDiffCount(), serverName, exeMillis); - } - } catch (Throwable e) { - logger.log(ERROR, "Error collecting or applying automatic query tuning", e); - } - } finally { - lock.unlock(); - } - } - - private void saveProfilingOnShutdown(boolean reset) { - lock.lock(); - try { - if (isRuntimeTuningUpdates()) { - runtimeTuningUpdate(); - outputAllTuning(); - - } else { - - AutoTuneCollection profiling = profileManager.profilingCollection(reset); - - AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, false); - event.process(); - if (event.isEmpty()) { - logger.log(INFO, "No new or diff entries for profiling server:{0}", serverName); - - } else { - event.writeFile(profilingFile + "-" + serverName); - logger.log(INFO, "writing new:{0} diff:{1} profiling entries for server:{2}", event.getNewCount(), event.getDiffCount(), serverName); - } - } - } finally { - lock.unlock(); - } - } - - /** - * Output all the query tuning (the "all" file). - *

- * This is the originally loaded tuning plus any tuning changes picked up and applied at runtime. - *

- *

- * This "all" file can be used as the next "ebean-autotune.xml" file. - *

- */ - private void outputAllTuning() { - - if (runtimeChangeCount == 0) { - logger.log(INFO, "no runtime query tuning changes for server:{0}", serverName); - - } else { - AutoTuneAllCollection event = new AutoTuneAllCollection(queryTuner); - int size = event.size(); - File existingTuning = new File(tuningFile); - if (existingTuning.exists()) { - // rename the existing autotune.xml file (appending 'now') - if (!existingTuning.renameTo(new File(tuningFile + "." + AutoTuneXmlWriter.now()))) { - logger.log(WARNING, "Failed to rename autotune file [{0}]", tuningFile); - } - } - - event.writeFile(tuningFile, false); - logger.log(INFO, "query tuning detected [{0}] changes, writing all [{1}] tuning entries for server:{2}", runtimeChangeCount, size, serverName); - } - } - - /** - * Shutdown the listener. - *

- * We should try to collect the usage statistics by calling a System.gc(). - * This is necessary for use with short lived applications where garbage - * collection may not otherwise occur at all. - *

- */ - @Override - public void shutdown() { - if (profiling) { - if (!skipGarbageCollectionOnShutdown && !skipProfileReportingOnShutdown) { - // trigger GC to update profiling information on recently executed queries - collectProfiling(-1); - } - if (!skipProfileReportingOnShutdown) { - saveProfilingOnShutdown(false); - } - } - } - - /** - * Output the profiling. - *

- * When profiling updates are applied to tuning at runtime this reports all tuning and profiling combined. - * When profiling is not applied at runtime then this reports the diff report with new and diff entries relative - * to the existing tuning. - *

- */ - @Override - public void reportProfiling() { - saveProfilingOnShutdown(false); - } - - /** - * Ask for a System.gc() so that we gather node usage information. - *

- * Really only want to do this sparingly but useful just prior to shutdown - * for short run application where garbage collection may otherwise not - * occur at all. - *

- *

- * waitMillis will do a thread sleep to give the garbage collection a little - * time to do its thing assuming we are shutting down the VM. - *

- *

- * If waitMillis is -1 then the defaultGarbageCollectionWait is used which - * defaults to 100 milliseconds. - *

- */ - @Override - public void collectProfiling() { - collectProfiling(-1); - } - - public void collectProfiling(long waitMillis) { - System.gc(); - try { - if (waitMillis < 0) { - waitMillis = defaultGarbageCollectionWait; - } - Thread.sleep(waitMillis); - } catch (InterruptedException e) { - // restore the interrupted status - Thread.currentThread().interrupt(); - logger.log(WARNING, "Error while sleeping after System.gc() request.", e); - } - } - - /** - * Auto tune the query and enable profiling. - */ - @Override - public boolean tuneQuery(SpiQuery query) { - return queryTuner.tuneQuery(query); - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java deleted file mode 100644 index 058509571a..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java +++ /dev/null @@ -1,122 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebean.bean.NodeUsageCollector; -import io.ebean.bean.ObjectGraphNode; -import io.ebean.bean.ObjectGraphOrigin; -import io.ebean.config.AutoTuneConfig; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.api.SpiQuery; -import io.ebeaninternal.server.autotune.ProfilingListener; -import io.ebeaninternal.server.deploy.BeanDescriptor; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.ReentrantLock; - -/** - * Manages the collection of object graph usage profiling. - */ -public class ProfileManager implements ProfilingListener { - - private final ReentrantLock lock = new ReentrantLock(); - - private final boolean queryTuningAddVersion; - - /** - * Converted from a 0-100 int to a double. Effectively a percentage rate at - * which to collect profiling information. - */ - private final double profilingRate; - - private final int profilingBase; - - /** - * Map of the usage and query statistics gathered. - */ - private final Map profileMap = new ConcurrentHashMap<>(); - - private final SpiEbeanServer server; - - public ProfileManager(AutoTuneConfig config, SpiEbeanServer server) { - this.server = server; - this.profilingRate = config.getProfilingRate(); - this.profilingBase = config.getProfilingBase(); - this.queryTuningAddVersion = config.isQueryTuningAddVersion(); - } - - @Override - public boolean isProfileRequest(ObjectGraphNode origin, SpiQuery query) { - ProfileOrigin profileOrigin = profileMap.get(origin.origin().key()); - if (profileOrigin == null) { - profileMap.put(origin.origin().key(), createProfileOrigin(origin, query)); - return true; - } else { - return profileOrigin.isProfile(); - } - } - - /** - * Create the profile origin noting the query detail currently being used. - *

- * For new profiling entries it is useful to compare the profiling against the current - * query detail that is specified in the code (as the query might already be manually optimised). - */ - private ProfileOrigin createProfileOrigin(ObjectGraphNode origin, SpiQuery query) { - ProfileOrigin profileOrigin = new ProfileOrigin(origin.origin(), queryTuningAddVersion, profilingBase, profilingRate); - // set the current query detail (fetch group) so that we can compare against profiling for new entries - profileOrigin.setOriginalQuery(query.getDetail().asString()); - return profileOrigin; - } - - /** - * Gather query execution statistics. This could either be the originating - * query in which case the parentNode will be null, or a lazy loading query - * resulting from traversal of the object graph. - */ - @Override - public void collectQueryInfo(ObjectGraphNode node, long beans, long micros) { - if (node != null) { - ObjectGraphOrigin origin = node.origin(); - if (origin != null) { - ProfileOrigin stats = getProfileOrigin(origin); - stats.collectQueryInfo(node, beans, micros); - } - } - } - - /** - * Collect usage statistics from a node in the object graph. - *

- * This is sent to use from a EntityBeanIntercept when the finalise method - * is called on the bean. - */ - @Override - public void collectNodeUsage(NodeUsageCollector.State usageCollector) { - ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.node().origin()); - profileOrigin.collectUsageInfo(usageCollector); - } - - private ProfileOrigin getProfileOrigin(ObjectGraphOrigin originQueryPoint) { - lock.lock(); - try { - return profileMap.computeIfAbsent(originQueryPoint.key(), k -> new ProfileOrigin(originQueryPoint, queryTuningAddVersion, profilingBase, profilingRate)); - } finally { - lock.unlock(); - } - } - - /** - * Collect all the profiling information. - */ - public AutoTuneCollection profilingCollection(boolean reset) { - AutoTuneCollection req = new AutoTuneCollection(); - for (ProfileOrigin origin : profileMap.values()) { - BeanDescriptor desc = server.descriptorById(origin.getOrigin().beanType()); - if (desc != null) { - origin.profilingCollection(desc, req, reset); - } - } - return req; - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java deleted file mode 100644 index b4f69c66c4..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java +++ /dev/null @@ -1,176 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebean.bean.NodeUsageCollector; -import io.ebean.bean.ObjectGraphNode; -import io.ebean.bean.ObjectGraphOrigin; -import io.ebean.text.PathProperties; -import io.ebean.text.PathProperties.Props; -import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.querydefn.OrmQueryDetail; - -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.ReentrantLock; - -public class ProfileOrigin { - - private final ReentrantLock lock = new ReentrantLock(); - - private static final long RESET_COUNT = -1000000000L; - - private final ObjectGraphOrigin origin; - - private final boolean queryTuningAddVersion; - - private final int profilingBase; - - private final double profilingRate; - - private final Map queryStatsMap = new ConcurrentHashMap<>(); - - private final Map nodeUsageMap = new ConcurrentHashMap<>(); - - private final AtomicLong requestCount = new AtomicLong(); - - private final AtomicLong profileCount = new AtomicLong(); - - private String originalQuery; - - public ProfileOrigin(ObjectGraphOrigin origin, boolean queryTuningAddVersion, int profilingBase, double profilingRate) { - this.origin = origin; - this.queryTuningAddVersion = queryTuningAddVersion; - this.profilingBase = profilingBase; - this.profilingRate = profilingRate; - } - - public String getOriginalQuery() { - return originalQuery; - } - - public void setOriginalQuery(String originalQuery) { - this.originalQuery = originalQuery; - } - - /** - * Return true if this query should be profiled based on a percentage rate. - */ - public boolean isProfile() { - - long count = requestCount.incrementAndGet(); - if (count < profilingBase) { - return true; - } - long hits = profileCount.get(); - if (profilingRate > (double) hits / count) { - profileCount.incrementAndGet(); - return true; - } else { - return false; - } - } - - /** - * Collect profiling information with the option to reset the underlying profiling detail. - */ - public void profilingCollection(BeanDescriptor rootDesc, AutoTuneCollection req, boolean reset) { - lock.lock(); - try { - if (nodeUsageMap.isEmpty()) { - return; - } - - OrmQueryDetail detail = buildDetail(rootDesc); - AutoTuneCollection.Entry entry = req.add(origin, detail, originalQuery); - - Collection values = queryStatsMap.values(); - for (ProfileOriginQuery queryEntry : values) { - entry.addQuery(queryEntry.createEntryQuery(reset)); - } - if (reset) { - nodeUsageMap.clear(); - if (requestCount.get() > RESET_COUNT) { - requestCount.set(profilingBase); - profileCount.set(0); - } - } - } finally { - lock.unlock(); - } - } - - OrmQueryDetail buildDetail(BeanDescriptor rootDesc) { - - PathProperties pathProps = new PathProperties(); - for (ProfileOriginNodeUsage statsNode : nodeUsageMap.values()) { - statsNode.buildTunedFetch(pathProps, rootDesc, queryTuningAddVersion); - } - - OrmQueryDetail detail = new OrmQueryDetail(); - - for (Props props : pathProps.getPathProps()) { - if (!props.isEmpty()) { - detail.fetch(props.getPath(), props.getPropertiesAsString(), null); - } - } - - detail.sortFetchPaths(rootDesc); - return detail; - } - - /** - * Return the origin. - */ - public ObjectGraphOrigin getOrigin() { - return origin; - } - - /** - * Collect query execution summary statistics. - *

- * This can give us a quick overview into bad lazy loading areas etc. - *

- */ - public void collectQueryInfo(ObjectGraphNode node, long beansLoaded, long micros) { - - String key = node.path(); - if (key == null) { - key = ""; - } - - ProfileOriginQuery stats = queryStatsMap.get(key); - if (stats == null) { - // a race condition but we don't care - stats = new ProfileOriginQuery(key); - queryStatsMap.put(key, stats); - } - stats.add(beansLoaded, micros); - } - - /** - * Collect the usage information for from a instance for this node. - */ - public void collectUsageInfo(NodeUsageCollector.State profile) { - if (!profile.isEmpty()) { - getNodeStats(profile.node().path()).collectUsageInfo(profile); - } - } - - private ProfileOriginNodeUsage getNodeStats(String path) { - lock.lock(); - try { - // handle null paths as using ConcurrentHashMap - path = (path == null) ? "" : path; - ProfileOriginNodeUsage nodeStats = nodeUsageMap.get(path); - if (nodeStats == null) { - nodeStats = new ProfileOriginNodeUsage(path); - nodeUsageMap.put(path, nodeStats); - } - return nodeStats; - } finally { - lock.unlock(); - } - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java deleted file mode 100644 index 408d9c1ff7..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ /dev/null @@ -1,128 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.avaje.applog.AppLog; -import io.ebean.bean.NodeUsageCollector; -import io.ebean.text.PathProperties; -import io.ebean.util.SplitName; -import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.deploy.BeanPropertyAssoc; -import io.ebeaninternal.server.el.ElPropertyValue; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.concurrent.locks.ReentrantLock; - -import static java.lang.System.Logger.Level.WARNING; - -/** - * Collects usages statistics for a given node in the object graph. - */ -public class ProfileOriginNodeUsage { - - private static final System.Logger logger = AppLog.getLogger(ProfileOriginNodeUsage.class); - - private final ReentrantLock lock = new ReentrantLock(); - - private final String path; - - private int profileCount; - - private int profileUsedCount; - - private boolean modified; - - private final Set aggregateUsed = new LinkedHashSet<>(); - - public ProfileOriginNodeUsage(String path) { - // handle null paths as using ConcurrentHashMap - this.path = "".equals(path) ? null : path; - } - - protected void buildTunedFetch(PathProperties pathProps, BeanDescriptor rootDesc, boolean addVersionProperty) { - lock.lock(); - try { - BeanDescriptor desc = rootDesc; - if (path != null) { - ElPropertyValue elGetValue = rootDesc.elGetValue(path); - if (elGetValue == null) { - logger.log(WARNING, "AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name()); - return; - } else { - BeanProperty beanProperty = elGetValue.beanProperty(); - if (beanProperty instanceof BeanPropertyAssoc) { - desc = ((BeanPropertyAssoc) beanProperty).targetDescriptor(); - } - } - } - - BeanProperty toOneIdProperty = null; - boolean addedToPath = false; - - for (String propName : aggregateUsed) { - BeanProperty beanProp = desc.findPropertyFromPath(propName); - if (beanProp == null) { - logger.log(WARNING, "AutoTune: Can't find property[" + propName + "] for " + desc.name()); - - } else { - if (beanProp.isId()) { - // remember and maybe add ToOne property to parent path - toOneIdProperty = beanProp; - } else if (beanProp instanceof BeanPropertyAssoc) { - // intentionally skip - } else { - //noinspection StatementWithEmptyBody - if (beanProp.isLob() && !beanProp.isFetchEager()) { - // AutoTune will not include Lob's marked FetchLazy - // (which is the default for Lob's so typical). - } else { - addedToPath = true; - pathProps.addToPath(path, beanProp.name()); - } - } - } - } - - if ((modified || addVersionProperty) && desc != null) { - BeanProperty versionProp = desc.versionProperty(); - if (versionProp != null) { - addedToPath = true; - pathProps.addToPath(path, versionProp.name()); - } - } - - if (toOneIdProperty != null && !addedToPath) { - // add ToOne property to parent path - ElPropertyValue assocOne = rootDesc.elGetValue(path); - pathProps.addToPath(SplitName.parent(path), assocOne.name()); - } - } finally { - lock.unlock(); - } - } - - /** - * Collect usage from a node. - */ - protected void collectUsageInfo(NodeUsageCollector.State profile) { - lock.lock(); - try { - Set used = profile.used(); - profileCount++; - if (!used.isEmpty()) { - profileUsedCount++; - aggregateUsed.addAll(used); - } - if (profile.isModified()) { - modified = true; - } - } finally { - lock.unlock(); - } - } - - @Override - public String toString() { - return "path[" + path + "] profileCount[" + profileCount + "] used[" + profileUsedCount + "] props" + aggregateUsed; - } -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginQuery.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginQuery.java deleted file mode 100644 index 36efa3355b..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginQuery.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import java.io.Serializable; -import java.util.concurrent.atomic.LongAdder; - -/** - * Used to accumulate query execution statistics for paths relative to the origin query. - */ -public class ProfileOriginQuery implements Serializable { - - private static final long serialVersionUID = -1133958958072778811L; - - private final String path; - - private final LongAdder exeCount = new LongAdder(); - - private final LongAdder totalBeanLoaded = new LongAdder(); - - private final LongAdder totalMicros = new LongAdder(); - - public ProfileOriginQuery(String path) { - this.path = path; - } - - public void add(long beansLoaded, long micros) { - exeCount.increment(); - totalBeanLoaded.add(beansLoaded); - totalMicros.add(micros); - } - - public AutoTuneCollection.EntryQuery createEntryQuery(boolean reset) { - - if (reset) { - return new AutoTuneCollection.EntryQuery(path, exeCount.sumThenReset(), totalBeanLoaded.sumThenReset(), totalMicros.sumThenReset()); - - } else { - return new AutoTuneCollection.EntryQuery(path, exeCount.sum(), totalBeanLoaded.sum(), totalMicros.sum()); - } - } - -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java deleted file mode 100644 index df94aee868..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebeaninternal.server.autotune.model.Autotune; -import io.ebeaninternal.server.autotune.model.Origin; -import io.ebeaninternal.server.autotune.model.ProfileDiff; -import io.ebeaninternal.server.autotune.model.ProfileEmpty; -import io.ebeaninternal.server.autotune.model.ProfileNew; - -import java.util.Comparator; -import java.util.List; - -/** - * Sorts Autotune document by - */ -public class SortAutoTuneDocument { - - - /** - * Set the diff and new entries by bean type followed by key. - */ - public static void sort(Autotune document) { - - ProfileDiff profileDiff = document.getProfileDiff(); - if (profileDiff != null) { - profileDiff.getOrigin().sort(NAME_KEY_SORT); - } - ProfileNew profileNew = document.getProfileNew(); - if (profileNew != null) { - profileNew.getOrigin().sort(NAME_KEY_SORT); - } - ProfileEmpty profileEmpty = document.getProfileEmpty(); - if (profileEmpty != null) { - profileEmpty.getOrigin().sort(KEY_SORT); - } - List origins = document.getOrigin(); - if (!origins.isEmpty()) { - origins.sort(NAME_KEY_SORT); - } - } - - private static final OriginNameKeySort NAME_KEY_SORT = new OriginNameKeySort(); - - private static final OriginKeySort KEY_SORT = new OriginKeySort(); - - /** - * Comparator sort by bean type then key. - */ - private static class OriginNameKeySort implements Comparator { - - @Override - public int compare(Origin o1, Origin o2) { - int comp = o1.getBeanType().compareTo(o2.getBeanType()); - if (comp == 0) { - comp = o1.getKey().compareTo(o2.getKey()); - } - return comp; - } - } - - /** - * Comparator sort by bean type then key. - */ - private static class OriginKeySort implements Comparator { - - @Override - public int compare(Origin o1, Origin o2) { - return o1.getKey().compareTo(o2.getKey()); - } - } -} diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java deleted file mode 100644 index 43e66c5af6..0000000000 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebeaninternal.api.SpiQuery; -import io.ebeaninternal.server.autotune.model.Origin; -import io.ebeaninternal.server.querydefn.OrmQueryDetail; -import io.ebeaninternal.server.querydefn.OrmQueryDetailParser; - -import java.io.Serializable; - -/** - * Holds tuned query information. Is immutable so this represents the tuning at - * a given point in time. - */ -public class TunedQueryInfo implements Serializable { - - private static final long serialVersionUID = 8661702592481810396L; - - private final Origin origin; - - private final OrmQueryDetail tunedDetail; - - public TunedQueryInfo(Origin origin) { - this.origin = origin; - this.tunedDetail = new OrmQueryDetailParser(origin.getDetail()).parse(); - } - - /** - * Return the origin entry (includes call stack and bean type). - */ - public Origin getOrigin() { - return origin; - } - - /** - * Return the tuned detail (for comparison with profiling information). - */ - public OrmQueryDetail getTunedDetail() { - return tunedDetail; - } - - /** - * Tune the query by replacing its OrmQueryDetail with a tuned one. - * - * @return true if the query was tuned, otherwise false. - */ - public boolean tuneQuery(SpiQuery query) { - if (tunedDetail == null) { - return false; - } - - boolean tuned; - if (query.isDetailEmpty()) { - tuned = true; - // tune by 'replacement' - query.setDetail(tunedDetail.copy()); - } else { - // tune by 'addition' - tuned = query.tuneFetchProperties(tunedDetail); - } - if (tuned) { - query.setAutoTuned(true); - } - return tuned; - } - - @Override - public String toString() { - return tunedDetail.asString(); - } - -} diff --git a/ebean-autotune/src/main/java/module-info.java b/ebean-autotune/src/main/java/module-info.java deleted file mode 100644 index 6cb7d3a541..0000000000 --- a/ebean-autotune/src/main/java/module-info.java +++ /dev/null @@ -1,15 +0,0 @@ -import io.ebeaninternal.server.autotune.AutoTuneServiceProvider; -import io.ebeaninternal.server.autotune.service.AutoTuneServiceFactory; - -/** - * Provider of AutoTuneServiceProvider - */ -module io.ebean.autotune { - - provides AutoTuneServiceProvider with AutoTuneServiceFactory; - - requires io.ebean.api; - requires io.ebean.core; - requires java.xml; - requires java.xml.bind; -} diff --git a/ebean-autotune/src/main/resources/META-INF/services/io.ebeaninternal.server.autotune.AutoTuneServiceProvider b/ebean-autotune/src/main/resources/META-INF/services/io.ebeaninternal.server.autotune.AutoTuneServiceProvider deleted file mode 100644 index 09056468e9..0000000000 --- a/ebean-autotune/src/main/resources/META-INF/services/io.ebeaninternal.server.autotune.AutoTuneServiceProvider +++ /dev/null @@ -1 +0,0 @@ -io.ebeaninternal.server.autotune.service.AutoTuneServiceFactory diff --git a/ebean-autotune/src/main/resources/ebean-autotune-1.0.xsd b/ebean-autotune/src/main/resources/ebean-autotune-1.0.xsd deleted file mode 100644 index de6246cfa8..0000000000 --- a/ebean-autotune/src/main/resources/ebean-autotune-1.0.xsd +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java deleted file mode 100644 index d67f2ec648..0000000000 --- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebeaninternal.server.autotune.model.Autotune; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.io.InputStream; - -import static org.assertj.core.api.Assertions.assertThat; - -public class AutoTuneXmlReaderTest { - - @Test - public void read_file() { - - File testFile = new File("src/test/resources/autotune/test-autotune.xml"); - - Autotune tuneInfo = AutoTuneXmlReader.read(testFile); - assertThat(tuneInfo.getOrigin()).isNotEmpty(); - } - - @Test - public void read_inputStream() { - - InputStream is = getClass().getResourceAsStream("/autotune/test-autotune.xml"); - - Autotune tuneInfo = AutoTuneXmlReader.read(is); - assertThat(tuneInfo.getOrigin()).isNotEmpty(); - } - -} diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java deleted file mode 100644 index 371d1976b1..0000000000 --- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java +++ /dev/null @@ -1,149 +0,0 @@ -package io.ebeaninternal.server.autotune.service; - -import io.ebean.bean.NodeUsageCollector; -import io.ebean.bean.NodeUsageListener; -import io.ebean.bean.ObjectGraphNode; -import io.ebean.bean.ObjectGraphOrigin; -import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.querydefn.OrmQueryDetail; -import org.junit.jupiter.api.Test; -import org.tests.autofetch.BaseTestCase; -import org.tests.model.basic.Order; - -import static org.assertj.core.api.Assertions.assertThat; - -public class ProfileOriginTest extends BaseTestCase { - - static class Noop implements NodeUsageListener { - @Override - public void collectNodeUsage(NodeUsageCollector.State state) { - // do nothing - } - } - - private final NodeUsageListener listener = new Noop(); - - private final BeanDescriptor desc = getBeanDescriptor(Order.class); - - @Test - public void buildDetail() { - - NodeUsageCollector c = node("customer"); - c.addUsed("id"); - c.addUsed("name"); - - ProfileOrigin po = new ProfileOrigin(null, false, 1, 1); - po.collectUsageInfo(c.state()); - - OrmQueryDetail detail = po.buildDetail(desc); - - assertThat(detail.asString().trim()).isEqualTo("fetch customer (name)"); - } - - @Test - public void buildDetail_selectFetch() { - - NodeUsageCollector c = node("customer"); - c.addUsed("id"); - c.addUsed("name"); - - ProfileOrigin po = new ProfileOrigin(null, false, 1, 1); - po.collectUsageInfo(c.state()); - - c = node(null); - c.addUsed("orderDate"); - po.collectUsageInfo(c.state()); - - OrmQueryDetail detail = po.buildDetail(desc); - - assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)"); - } - - @Test - public void buildDetail_expect_mergeFetchToSelect() { - - NodeUsageCollector c = node("customer"); - c.addUsed("id"); - - ProfileOrigin po = new ProfileOrigin(null, false, 1, 1); - po.collectUsageInfo(c.state()); - - c = node(null); - c.addUsed("orderDate"); - po.collectUsageInfo(c.state()); - - OrmQueryDetail detail = po.buildDetail(desc); - - assertThat(detail.asString().trim()).isEqualTo("select (orderDate,customer)"); - } - - @Test - public void buildDetail_expect_mergeFetchToParentFetch() { - - ProfileOrigin po = new ProfileOrigin(null, false, 1, 1); - - NodeUsageCollector c = node(null); - c.addUsed("orderDate"); - c.addUsed("customer"); - po.collectUsageInfo(c.state()); - - c = node("customer"); - c.addUsed("billingAddress"); - po.collectUsageInfo(c.state()); - - c = node("customer.billingAddress"); - c.addUsed("id"); - po.collectUsageInfo(c.state()); - - OrmQueryDetail detail = po.buildDetail(desc); - - assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)"); - } - - - @Test - public void buildDetail_expect_mergeMulit() { - - ProfileOrigin po = new ProfileOrigin(null, false, 1, 1); - - //fetch details (id,orderQty,shipQty,unitPrice) - - NodeUsageCollector c = node(null); - c.addUsed("customer"); - po.collectUsageInfo(c.state()); - - c = node("customer"); - c.addUsed("id"); - c.addUsed("name"); - c.addUsed("note"); - c.addUsed("billingAddress"); - po.collectUsageInfo(c.state()); - - //fetch details.product (id,name) - c = node("customer.billingAddress"); - c.addUsed("id"); - c.addUsed("line1"); - po.collectUsageInfo(c.state()); - - OrmQueryDetail detail = po.buildDetail(desc); - assertThat(detail.asString()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)"); - } - - private NodeUsageCollector node(String path) { - ObjectGraphNode node = new ObjectGraphNode((ObjectGraphOrigin)null, path); - return new NodeUsageCollector(node, listener); - } - -// @Test -// public void testQueries() { -// -// ResetBasicData.reset(); -// -// //DB.createQuery(Order.class, "select (orderDate) fetch customer (billingAddress)").findList(); -// -// // we prefer this first query other the second one -// DB.createQuery(Order.class, "select (orderDate,customer)").findList(); -// DB.createQuery(Order.class, "select (orderDate) fetch customer (id)").findList(); -// -// } -} diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java b/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java deleted file mode 100644 index 102affc90b..0000000000 --- a/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.tests.autofetch; - -import io.ebean.DB; -import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.server.deploy.BeanDescriptor; - -public class BaseTestCase { - - protected SpiEbeanServer spiEbeanServer() { - return (SpiEbeanServer) DB.getDefault(); - } - - protected BeanDescriptor getBeanDescriptor(Class cls) { - return spiEbeanServer().descriptor(cls); - } -} diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java b/ebean-autotune/src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java deleted file mode 100644 index 75debc1445..0000000000 --- a/ebean-autotune/src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.tests.autofetch; - -//import io.ebean.Ebean; -//import org.tests.model.basic.EBasicClob; - -//import java.util.List; - -public class MainAutoFetchExcludeLazyLobs { - -// public static void main(String[] args) { -// -// EBasicClob a = new EBasicClob(); -// a.setName("name 1"); -// a.setTitle("a title"); -// a.setDescription("not that meaningful"); -// -// Ebean.save(a); -// -// List list = Ebean.find(EBasicClob.class) -// .setAutoTune(true) -// .findList(); -// -// for (EBasicClob bean : list) { -// bean.getName(); -// // although we read the description -// // autofetch will not include it later -// bean.getDescription(); -// } -// -// -// } -} diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java b/ebean-autotune/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java deleted file mode 100644 index 014302e2c9..0000000000 --- a/ebean-autotune/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.tests.autofetch; - -import io.ebean.DB; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.Order; - -import java.util.List; - -public class MainAutoQueryTune1 { - - public static void main(String[] args) { - MainAutoQueryTune1 me = new MainAutoQueryTune1(); - me.tuneJoin(); - } - - @Test - void tuneJoin() { - TestData.load(); - - List list = DB.find(Order.class) - .setAutoTune(true) - //.fetch("customer") - .where() - .eq("status", Order.Status.NEW) - .eq("customer.name", "Rob") - .order().asc("id") - .findList(); - - for (Order order : list) { - order.getId(); - order.getOrderDate(); - order.getCustomer().getName(); - order.getCustomer().getNote(); - } - } - -} diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/TestData.java b/ebean-autotune/src/test/java/org/tests/autofetch/TestData.java deleted file mode 100644 index 33621262f3..0000000000 --- a/ebean-autotune/src/test/java/org/tests/autofetch/TestData.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.tests.autofetch; - -import io.ebean.DB; -import org.tests.model.basic.Address; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; - -import java.time.LocalDate; - -public class TestData { - - static void load() { - if (DB.find(Order.class).findCount() > 0) { - return; - } - - var customer = new Customer("Rob"); - customer.setBillingAddress(new Address("l0", "city0")); - DB.save(customer); - - var order = new Order(customer); - order.setOrderDate(LocalDate.now()); - DB.save(order); - } -} diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java b/ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java deleted file mode 100644 index f9c099d110..0000000000 --- a/ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java +++ /dev/null @@ -1,172 +0,0 @@ -package org.tests.autofetch; - -//import io.ebean.BaseTestCase; -//import io.ebean.Ebean; -//import io.ebean.EbeanServer; -//import io.ebean.Query; -//import io.ebean.bean.EntityBean; -//import io.ebean.bean.EntityBeanIntercept; -//import io.ebean.cache.ServerCacheManager; -//import io.ebeaninternal.api.SpiQuery; -//import io.ebeaninternal.server.autotune.model.Origin; -//import io.ebeaninternal.server.autotune.service.TunedQueryInfo; -//import io.ebeaninternal.server.querydefn.OrmQueryDetail; -//import org.ebeantest.LoggedSqlCollector; -//import org.junit.Assert; -//import org.junit.Test; -//import org.tests.model.basic.Order; -//import org.tests.model.basic.ResetBasicData; -// -//import java.util.List; -//import java.util.Set; - -public class TunedQueryInfoTest extends BaseTestCase { - -// private void init() { -// -// ResetBasicData.reset(); -// -// ServerCacheManager serverCacheManager = Ebean.getServer(null).getServerCacheManager(); -// serverCacheManager.clearAll(); -// } -// -// @Test -// public void withSelectEmpty() { -// -// init(); -// -// OrmQueryDetail tunedDetail = new OrmQueryDetail(); -// tunedDetail.select(""); -// -// TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); -// -// Query query = server.find(Order.class).setId(1); -// -// tunedInfo.tuneQuery((SpiQuery) query); -// -// Order order = query.findOne(); -// EntityBean eb = (EntityBean) order; -// EntityBeanIntercept ebi = eb._ebean_getIntercept(); -// -// Assert.assertTrue(ebi.isFullyLoadedBean()); -// -// Set loadedPropertyNames = ebi.getLoadedPropertyNames(); -// Assert.assertNull(loadedPropertyNames); -// -// // invoke lazy loading -// order.getCustomer(); -// } -// -// @Test -// public void withSelectSomethingThatDoesNotExist() { -// -// init(); -// -// OrmQueryDetail tunedDetail = new OrmQueryDetail(); -// tunedDetail.select("somethingThatDoesNotExist"); -// -// TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); -// -// Query query = server.find(Order.class).setId(1); -// -// tunedInfo.tuneQuery((SpiQuery) query); -// -// LoggedSqlCollector.start(); -// -// Order order = query.findOne(); -// EntityBean eb = (EntityBean) order; -// EntityBeanIntercept ebi = eb._ebean_getIntercept(); -// -// Assert.assertFalse(ebi.isFullyLoadedBean()); -// -// // id and any ToMany relationships -// Set loadedPropertyNames = ebi.getLoadedPropertyNames(); -// Assert.assertNotNull(loadedPropertyNames); -// -// // invoke lazy loading -// order.getCustomer(); -// -// List loggedSql = LoggedSqlCollector.stop(); -// Assert.assertEquals(2, loggedSql.size()); -// -// Assert.assertTrue(trimSql(loggedSql.get(0), 1).contains("select t0.id, t0.id from o_order t0 where t0.id = ?")); -// Assert.assertTrue(trimSql(loggedSql.get(1), 1).contains("select t0.id, t0.status,")); -// } -// -// private TunedQueryInfo createTunedQueryInfo(OrmQueryDetail tunedDetail) { -// Origin origin = new Origin(); -// origin.setDetail(tunedDetail.asString()); -// return new TunedQueryInfo(origin); -// } -// -// @Test -// public void withSelectSomeIncludeLazyLoaded() { -// -// init(); -// -// OrmQueryDetail tunedDetail = new OrmQueryDetail(); -// tunedDetail.select("status, customer"); -// -// TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); -// -// Query query = server.find(Order.class).setId(1); -// -// tunedInfo.tuneQuery((SpiQuery) query); -// -// LoggedSqlCollector.start(); -// -// Order order = query.findOne(); -// EntityBean eb = (EntityBean) order; -// EntityBeanIntercept ebi = eb._ebean_getIntercept(); -// -// Assert.assertFalse(ebi.isFullyLoadedBean()); -// -// Set loadedPropertyNames = ebi.getLoadedPropertyNames(); -// Assert.assertNotNull(loadedPropertyNames); -// -// Assert.assertTrue(loadedPropertyNames.contains("status")); -// Assert.assertTrue(loadedPropertyNames.contains("customer")); -// -// // no lazy loading expected here -// order.getCustomer(); -// -// List loggedSql = LoggedSqlCollector.stop(); -// Assert.assertEquals(1, loggedSql.size()); -// } -// -// @Test -// public void withSelectSome() { -// -// init(); -// -// OrmQueryDetail tunedDetail = new OrmQueryDetail(); -// tunedDetail.select("status"); -// -// TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); -// -// Query query = server.find(Order.class).setId(1); -// -// tunedInfo.tuneQuery((SpiQuery) query); -// -// LoggedSqlCollector.start(); -// -// Order order = query.findOne(); -// EntityBean eb = (EntityBean) order; -// EntityBeanIntercept ebi = eb._ebean_getIntercept(); -// -// Assert.assertFalse(ebi.isFullyLoadedBean()); -// -// Set loadedPropertyNames = ebi.getLoadedPropertyNames(); -// Assert.assertNotNull(loadedPropertyNames); -// -// Assert.assertTrue(loadedPropertyNames.contains("status")); -// Assert.assertFalse(loadedPropertyNames.contains("customer")); -// -// // no lazy loading expected here -// order.getCustomer(); -// -// List loggedSql = LoggedSqlCollector.stop(); -// Assert.assertEquals(2, loggedSql.size()); -// } - -} diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java b/ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java deleted file mode 100644 index 3ff5e61e0d..0000000000 --- a/ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.tests.autofetch; - -//import io.ebean.BaseTestCase; -//import io.ebean.Ebean; -//import io.ebean.EbeanServer; -//import io.ebean.Query; -//import io.ebean.bean.EntityBean; -//import io.ebean.bean.EntityBeanIntercept; -//import org.ebeantest.LoggedSqlCollector; -//import org.junit.Assert; -//import org.junit.Test; -//import org.tests.model.basic.Address; -//import org.tests.model.basic.Customer; -//import org.tests.model.basic.ResetBasicData; - -import java.util.List; -import java.util.Set; - -public class TunedQueryWithNullFetchedBeanTest extends BaseTestCase { - -// EbeanServer server = Ebean.getServer(null); -// -// @Test -// public void withFetchOfNullBeanJoin() { -// -// ResetBasicData.reset(); -// -// Customer newCustomer = new Customer(); -// newCustomer.setName("TestFetchBillingAddress"); -// server.save(newCustomer); -// -// Query query = server.find(Customer.class) -// .setId(newCustomer.getId()) -// .fetch("billingAddress", "id"); -// -// LoggedSqlCollector.start(); -// -// Customer customer = query.findOne(); -// EntityBean eb = (EntityBean) customer; -// EntityBeanIntercept ebi = eb._ebean_getIntercept(); -// -// Assert.assertTrue(ebi.isFullyLoadedBean()); -// -// // find the internal property index for "billingAddress" -// String[] propNames = eb._ebean_getPropertyNames(); -// int pos = 0; -// for (int i = 0; i < propNames.length; i++) { -// if (propNames[i].equals("billingAddress")) { -// pos = i; -// } -// } -// -// // The billing address is loaded (but value null) -// Assert.assertTrue(ebi.isLoadedProperty(pos)); -// -// Set loadedPropertyNames = ebi.getLoadedPropertyNames(); -// Assert.assertNull(loadedPropertyNames); -// -// // no lazy loading expected here, value is null -// Address billingAddress = customer.getBillingAddress(); -// Assert.assertNull(billingAddress); -// -// // assert only one query executed -// List loggedSql = LoggedSqlCollector.stop(); -// Assert.assertEquals(1, loggedSql.size()); -// -// Ebean.delete(newCustomer); -// } -} diff --git a/ebean-autotune/src/test/java/org/tests/model/basic/Address.java b/ebean-autotune/src/test/java/org/tests/model/basic/Address.java deleted file mode 100644 index 5c289c3ad5..0000000000 --- a/ebean-autotune/src/test/java/org/tests/model/basic/Address.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.tests.model.basic; - -import javax.persistence.Entity; -import javax.persistence.Table; - -@Entity -@Table(name = "o_address") -public class Address extends BaseModel { - - String line1; - String line2; - String city; - - public Address(String line1, String city) { - this.line1 = line1; - this.city = city; - } - - public String getLine1() { - return line1; - } - - public void setLine1(String line1) { - this.line1 = line1; - } - - public String getLine2() { - return line2; - } - - public void setLine2(String line2) { - this.line2 = line2; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } -} diff --git a/ebean-autotune/src/test/java/org/tests/model/basic/BaseModel.java b/ebean-autotune/src/test/java/org/tests/model/basic/BaseModel.java deleted file mode 100644 index 73eeb7b243..0000000000 --- a/ebean-autotune/src/test/java/org/tests/model/basic/BaseModel.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.tests.model.basic; - -import io.ebean.Model; -import io.ebean.annotation.WhenCreated; -import io.ebean.annotation.WhenModified; - -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; -import java.time.Instant; - -@MappedSuperclass -public class BaseModel extends Model { - - @Id - long id; - - @WhenCreated - Instant whenCreated; - - @WhenModified - Instant whenModified; - - @Version - long version; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public Instant getWhenCreated() { - return whenCreated; - } - - public void setWhenCreated(Instant whenCreated) { - this.whenCreated = whenCreated; - } - - public Instant getWhenModified() { - return whenModified; - } - - public void setWhenModified(Instant whenModified) { - this.whenModified = whenModified; - } - - public long getVersion() { - return version; - } - - public void setVersion(long version) { - this.version = version; - } -} diff --git a/ebean-autotune/src/test/java/org/tests/model/basic/Customer.java b/ebean-autotune/src/test/java/org/tests/model/basic/Customer.java deleted file mode 100644 index cff0e3c01e..0000000000 --- a/ebean-autotune/src/test/java/org/tests/model/basic/Customer.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.tests.model.basic; - -import io.ebean.annotation.NotNull; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "o_customer") -public class Customer extends BaseModel { - - @NotNull String name; - - String note; - - @ManyToOne(cascade = CascadeType.PERSIST) - Address billingAddress; - - public Customer(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getNote() { - return note; - } - - public void setNote(String note) { - this.note = note; - } - - public Address getBillingAddress() { - return billingAddress; - } - - public void setBillingAddress(Address billingAddress) { - this.billingAddress = billingAddress; - } -} diff --git a/ebean-autotune/src/test/java/org/tests/model/basic/Order.java b/ebean-autotune/src/test/java/org/tests/model/basic/Order.java deleted file mode 100644 index ddb5f03308..0000000000 --- a/ebean-autotune/src/test/java/org/tests/model/basic/Order.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.tests.model.basic; - -import javax.persistence.*; -import java.time.LocalDate; - -@Entity -@Table(name = "o_order") -public class Order extends BaseModel { - - public enum Status { - NEW, - APPROVED, - SHIPPED, - COMPLETE - } - - - @Enumerated(EnumType.STRING) - Status status = Status.NEW; - - LocalDate orderDate; - - @ManyToOne(cascade = CascadeType.PERSIST) - final Customer customer; - - public Order(Customer customer) { - this.customer = customer; - } - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public LocalDate getOrderDate() { - return orderDate; - } - - public void setOrderDate(LocalDate orderDate) { - this.orderDate = orderDate; - } - - public Customer getCustomer() { - return customer; - } - -} diff --git a/ebean-autotune/src/test/resources/application-test.properties b/ebean-autotune/src/test/resources/application-test.properties deleted file mode 100644 index 055b734295..0000000000 --- a/ebean-autotune/src/test/resources/application-test.properties +++ /dev/null @@ -1,17 +0,0 @@ -ebean.ddl.generate=true -ebean.ddl.run=true -datasource.default=h2 - -datasource.h2.username=sa -datasource.h2.password= -datasource.h2.url=jdbc:h2:mem:h2AutoTune - -datasource.pg.username=sa -datasource.pg.password= -datasource.pg.url=jdbc:h2:mem:h2AutoTune - -ebean.autoTune.profiling=true -ebean.maxCallStack=10 - -ebean.autoTune.queryTuning=true -ebean.autoTune.queryTuningFile=autotune/my-autotune.xml diff --git a/ebean-autotune/src/test/resources/autotune/my-autotune.xml b/ebean-autotune/src/test/resources/autotune/my-autotune.xml deleted file mode 100644 index d1085bb801..0000000000 --- a/ebean-autotune/src/test/resources/autotune/my-autotune.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - org.tests.autofetch.MainAutoQueryTune1.tuneJoin(MainAutoQueryTune1.java:27) - org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:725) - org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60) - org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131) - org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:149) - org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:140) - org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:84) - org.junit.jupiter.engine.execution.ExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(ExecutableInvoker.java:115) - org.junit.jupiter.engine.execution.ExecutableInvoker.lambda$invoke$0(ExecutableInvoker.java:105) - org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106) - - diff --git a/ebean-autotune/src/test/resources/autotune/test-autotune.xml b/ebean-autotune/src/test/resources/autotune/test-autotune.xml deleted file mode 100644 index 78b795cd49..0000000000 --- a/ebean-autotune/src/test/resources/autotune/test-autotune.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - org.tests.query.autotune.TestAutoTuneProfiling.findById(TestAutoTuneProfiling.java:62) - org.tests.query.autotune.TestAutoTuneProfiling.useOrderDate(TestAutoTuneProfiling.java:66) - org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:52) - org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) - sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - - - - org.tests.query.autotune.TestAutoTuneProfiling.useLotUntuned(TestAutoTuneProfiling.java:95) - org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:55) - org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) - sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - - - - org.tests.model.basic.Order._ebean_get_customer(Order.java:6) - org.tests.model.basic.Order.getCustomer(Order.java:228) - org.tests.query.autotune.TestAutoTuneProfiling.useOrderDateCustomerName(TestAutoTuneProfiling.java:74) - org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:53) - org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) - - - - org.tests.model.basic.OrderDetail._ebean_get_product(OrderDetail.java:6) - org.tests.model.basic.OrderDetail.getProduct(OrderDetail.java:150) - org.tests.query.autotune.TestAutoTuneProfiling.useLotUntuned(TestAutoTuneProfiling.java:96) - org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:55) - org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:32) - - - diff --git a/ebean-autotune/src/test/resources/logback-test.xml b/ebean-autotune/src/test/resources/logback-test.xml deleted file mode 100644 index ee68548bad..0000000000 --- a/ebean-autotune/src/test/resources/logback-test.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - TRACE - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - - diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml deleted file mode 100644 index 4cbae4ef6d..0000000000 --- a/ebean-csv-reader/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 13.18.0 - - - ebean-csv-reader - - - - - io.ebean - ebean-api - 13.18.0 - provided - - - - io.ebean - ebean-core - 13.18.0 - provided - - - - io.ebean - ebean-test - 13.18.0 - test - - - - io.avaje - junit - 1.1 - test - - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.34 - true - - - io.ebean.tile:enhancement:13.17.1 - - - - - - - - diff --git a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvCallback.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvCallback.java deleted file mode 100644 index 999e0fc754..0000000000 --- a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvCallback.java +++ /dev/null @@ -1,78 +0,0 @@ -package io.ebean.csv.reader; - -import io.ebean.Database; - -/** - * Provides callback methods for customisation of CSV processing. - *

- * You can provide your own CsvCallback implementation to customise the CSV - * processing. It is expected that the DefaultCsvCallback provides a good base - * class that you can extend. - */ -public interface CsvCallback { - - /** - * The processing is about to begin. - *

- * Typically the callback will create a transaction, set batch mode, batch - * size etc. - *

- */ - void begin(Database database); - - /** - * Read the header row. - *

- * This is only called if {@link CsvReader#setHasHeader(boolean, boolean)} has - * been set to true. - *

- * - * @param line the header line content. - */ - void readHeader(String[] line); - - /** - * Check that the row should be processed - return true to process the row or - * false to ignore the row. Gives ability to handle bad data... empty rows etc - * and ignore it rather than fail. - */ - boolean processLine(int row, String[] line); - - /** - * Called for each bean after it has been loaded from the CSV content. - *

- * This allows you to process the bean however you like. - *

- *

- * When you use a CsvCallback the CsvReader *WILL NOT* create a transaction - * and will not save the bean for you. You have complete control and must do - * these things yourself (if that is want you want). - *

- * - * @param row the index of the content being processed - * @param line the content that has been used to load the bean - * @param bean the entity bean after it has been loaded from the csv content - */ - void processBean(int row, String[] line, T bean); - - /** - * The processing has ended successfully. - *

- * Typically the callback will commit the transaction. - *

- */ - void end(int row); - - /** - * The processing has ended due to an error. - *

- * This gives the callback the opportunity to rollback the transaction if one - * was created. - *

- * - * @param row the row that the error has occurred on - * @param e the error that occurred - */ - void endWithError(int row, Exception e); - -} diff --git a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java deleted file mode 100644 index 98193e1975..0000000000 --- a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java +++ /dev/null @@ -1,214 +0,0 @@ -package io.ebean.csv.reader; - -import io.ebean.Database; -import io.ebean.bean.EntityBean; -import io.ebean.plugin.BeanType; -import io.ebean.plugin.ExpressionPath; -import io.ebean.text.StringParser; -import io.ebean.text.TextException; - -import java.io.Reader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Implementation of the CsvReader - */ -public class CsvReader { - - private final Database server; - - private final BeanType descriptor; - - private final List columnList = new ArrayList<>(); - - private final CsvColumn ignoreColumn = new CsvColumn(); - - private boolean hasHeader; - - private int logInfoFrequency = 1000; - - /** - * The batch size used for JDBC statement batching. - */ - protected int persistBatchSize = 30; - - private boolean addPropertiesFromHeader; - - public CsvReader(Database server, Class type) { - this.server = server; - this.descriptor = server.pluginApi().beanType(type); - } - - public void setPersistBatchSize(int persistBatchSize) { - this.persistBatchSize = persistBatchSize; - } - - public void setIgnoreHeader() { - setHasHeader(true, false); - } - - public void setAddPropertiesFromHeader() { - setHasHeader(true, true); - } - - public void setHasHeader(boolean hasHeader, boolean addPropertiesFromHeader) { - this.hasHeader = hasHeader; - this.addPropertiesFromHeader = addPropertiesFromHeader; - } - - public void setLogInfoFrequency(int logInfoFrequency) { - this.logInfoFrequency = logInfoFrequency; - } - - public void addIgnore() { - columnList.add(ignoreColumn); - } - - public void addProperty(String propertyName) { - addProperty(propertyName, null); - } - - - public void addProperty(String propertyName, StringParser parser) { - ExpressionPath elProp = descriptor.expressionPath(propertyName); - if (parser == null) { - parser = elProp.stringParser(); - } - CsvColumn column = new CsvColumn(elProp, parser); - columnList.add(column); - } - - public void process(Reader reader) throws Exception { - DefaultCsvCallback callback = new DefaultCsvCallback<>(persistBatchSize, logInfoFrequency); - process(reader, callback); - } - - public void process(Reader reader, CsvCallback callback) throws Exception { - if (reader == null) { - throw new NullPointerException("reader is null?"); - } - if (callback == null) { - throw new NullPointerException("callback is null?"); - } - - CsvUtilReader utilReader = new CsvUtilReader(reader); - - callback.begin(server); - - int row = 0; - - if (hasHeader) { - String[] line = utilReader.readNext(); - if (addPropertiesFromHeader) { - addPropertiesFromHeader(line); - } - callback.readHeader(line); - } - - try { - do { - ++row; - String[] line = utilReader.readNext(); - if (line == null) { - --row; - break; - } - - if (callback.processLine(row, line)) { - // the line content is expected to be ok for processing - if (line.length != columnList.size()) { - // we have not got the expected number of columns - String msg = "Error at line " + row + ". Expected [" + columnList.size() + "] columns " - + "but instead we have [" + line.length + "]. Line[" + Arrays.toString(line) + "]"; - throw new TextException(msg); - } - - T bean = buildBeanFromLineContent(row, line); - - callback.processBean(row, line, bean); - - } - } while (true); - - callback.end(row); - - } catch (Exception e) { - // notify that an error occurred so that any - // transaction can be rolled back if required - callback.endWithError(row, e); - throw e; - } - } - - private void addPropertiesFromHeader(String[] line) { - for (String headerElement : line) { - ExpressionPath elProp = descriptor.expressionPath(headerElement); - if (elProp == null) { - throw new TextException("Property [" + headerElement + "] not found"); - } - addProperty(headerElement); - } - } - - protected T buildBeanFromLineContent(int row, String[] line) { - try { - T bean = descriptor.createBean(); - EntityBean entityBean = (EntityBean) bean; - for (int columnPos = 0; columnPos < line.length; columnPos++) { - convertAndSetColumn(columnPos, line[columnPos], entityBean); - } - return bean; - - } catch (RuntimeException e) { - String msg = "Error at line: " + row + " line[" + Arrays.toString(line) + "]"; - throw new RuntimeException(msg, e); - } - } - - protected void convertAndSetColumn(int columnPos, String strValue, EntityBean bean) { - strValue = strValue.trim(); - if (strValue.isEmpty()) { - return; - } - CsvColumn c = columnList.get(columnPos); - c.convertAndSet(strValue, bean); - } - - /** - * Processes a column in the csv content. - */ - public static class CsvColumn { - - private final ExpressionPath path; - private final StringParser parser; - - /** - * Constructor for the IGNORE column. - */ - private CsvColumn() { - this.path = null; - this.parser = null; - } - - /** - * Construct with a property and parser. - */ - public CsvColumn(ExpressionPath path, StringParser parser) { - this.path = path; - this.parser = parser; - } - - /** - * Convert the string to the appropriate value and set it to the bean. - */ - public void convertAndSet(String strValue, EntityBean bean) { - if (parser != null && path != null) { - Object value = parser.parse(strValue); - path.pathSet(bean, value); - } - } - } - -} diff --git a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvUtilReader.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvUtilReader.java deleted file mode 100644 index 999b239089..0000000000 --- a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvUtilReader.java +++ /dev/null @@ -1,249 +0,0 @@ -package io.ebean.csv.reader; - -// Original name: au.com.bytecode.opencsv.CSVReader -// rbygrave: Made some Java Generics tweaks to remove warnings - -/** - * Copyright 2005 Bytecode Pty Ltd. - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.Reader; -import java.util.ArrayList; -import java.util.List; - -/** - * Glen Smith's CSV reader released under Apache License version 2. - * - * @author Glen Smith - * - */ -public class CsvUtilReader { - - private final BufferedReader br; - - private boolean hasNext = true; - - private final char separator; - - private final char quotechar; - - private final int skipLines; - - private boolean linesSkiped; - - /** The default separator to use if none is supplied to the constructor. */ - public static final char DEFAULT_SEPARATOR = ','; - - /** - * The default quote character to use if none is supplied to the - * constructor. - */ - public static final char DEFAULT_QUOTE_CHARACTER = '"'; - - /** - * The default line to start reading. - */ - public static final int DEFAULT_SKIP_LINES = 0; - - /** - * Constructs CSVReader using a comma for the separator. - * - * @param reader - * the reader to an underlying CSV source. - */ - public CsvUtilReader(Reader reader) { - this(reader, DEFAULT_SEPARATOR); - } - - /** - * Constructs CSVReader with supplied separator. - * - * @param reader - * the reader to an underlying CSV source. - * @param separator - * the delimiter to use for separating entries. - */ - public CsvUtilReader(Reader reader, char separator) { - this(reader, separator, DEFAULT_QUOTE_CHARACTER); - } - - - /** - * Constructs CSVReader with supplied separator and quote char. - * - * @param reader - * the reader to an underlying CSV source. - * @param separator - * the delimiter to use for separating entries - * @param quotechar - * the character to use for quoted elements - */ - public CsvUtilReader(Reader reader, char separator, char quotechar) { - this(reader, separator, quotechar, DEFAULT_SKIP_LINES); - } - - /** - * Constructs CSVReader with supplied separator and quote char. - * - * @param reader - * the reader to an underlying CSV source. - * @param separator - * the delimiter to use for separating entries - * @param quotechar - * the character to use for quoted elements - * @param line - * the line number to skip for start reading - */ - public CsvUtilReader(Reader reader, char separator, char quotechar, int line) { - this.br = new BufferedReader(reader); - this.separator = separator; - this.quotechar = quotechar; - this.skipLines = line; - } - - /** - * Reads the entire file into a List with each element being a String[] of - * tokens. - * - * @return a List of String[], with each String[] representing a line of the - * file. - * - * @throws IOException - * if bad things happen during the read - */ - public List readAll() throws IOException { - - List allElements = new ArrayList<>(); - while (hasNext) { - String[] nextLineAsTokens = readNext(); - if (nextLineAsTokens != null) { - allElements.add(nextLineAsTokens); - } - } - return allElements; - - } - - /** - * Reads the next line from the buffer and converts to a string array. - * - * @return a string array with each comma-separated element as a separate - * entry. - * - * @throws IOException - * if bad things happen during the read - */ - public String[] readNext() throws IOException { - - String nextLine = getNextLine(); - return hasNext ? parseLine(nextLine) : null; - } - - /** - * Reads the next line from the file. - * - * @return the next line from the file without trailing newline - * @throws IOException - * if bad things happen during the read - */ - private String getNextLine() throws IOException { - if (!this.linesSkiped) { - for (int i = 0; i < skipLines; i++) { - br.readLine(); - } - this.linesSkiped = true; - } - String nextLine = br.readLine(); - if (nextLine == null) { - hasNext = false; - } - return hasNext ? nextLine : null; - } - - /** - * Parses an incoming String and returns an array of elements. - * - * @param nextLine - * the string to parse - * @return the comma-tokenized list of elements, or null if nextLine is null - * @throws IOException if bad things happen during the read - */ - private String[] parseLine(String nextLine) throws IOException { - - if (nextLine == null) { - return null; - } - - List tokensOnThisLine = new ArrayList<>(); - - StringBuilder sb = new StringBuilder(); - boolean inQuotes = false; - do { - if (inQuotes) { - // continuing a quoted section, reappend newline - sb.append("\n"); - nextLine = getNextLine(); - if (nextLine == null) - break; - } - for (int i = 0; i < nextLine.length(); i++) { - - char c = nextLine.charAt(i); - if (c == quotechar) { - // this gets complex... the quote may end a quoted block, or escape another quote. - // do a 1-char lookahead: - if (inQuotes // we are in quotes, therefore there can be escaped quotes in here. - && nextLine.length() > (i + 1) // there is indeed another character to check. - && nextLine.charAt(i + 1) == quotechar) { // ..and that char. is a quote also. - // we have two quote chars in a row == one quote char, so consume them both and - // put one on the token. we do *not* exit the quoted text. - sb.append(nextLine.charAt(i + 1)); - i++; - } else { - inQuotes = !inQuotes; - // the tricky case of an embedded quote in the middle: a,bc"d"ef,g - if (i > 2 //not on the begining of the line - && nextLine.charAt(i - 1) != this.separator //not at the begining of an escape sequence - && nextLine.length() > (i + 1) && - nextLine.charAt(i + 1) != this.separator //not at the end of an escape sequence - ) { - sb.append(c); - } - } - } else if (c == separator && !inQuotes) { - tokensOnThisLine.add(sb.toString().trim()); - sb = new StringBuilder(); // start work on next token - } else { - sb.append(c); - } - } - } while (inQuotes); - tokensOnThisLine.add(sb.toString().trim()); - return tokensOnThisLine.toArray(new String[0]); - } - - /** - * Closes the underlying reader. - * - * @throws IOException if the close fails - */ - public void close() throws IOException { - br.close(); - } - -} - diff --git a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/DefaultCsvCallback.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/DefaultCsvCallback.java deleted file mode 100644 index 5bbba8dfdc..0000000000 --- a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/DefaultCsvCallback.java +++ /dev/null @@ -1,197 +0,0 @@ -package io.ebean.csv.reader; - -import io.ebean.Database; -import io.ebean.EbeanVersion; -import io.ebean.Transaction; - -import static java.lang.System.Logger.Level.DEBUG; -import static java.lang.System.Logger.Level.INFO; - -/** - * Provides the default implementation of CsvCallback. - *

- * This handles transaction creation (if no current transaction existed) and - * transaction commit or rollback on error. - *

- *

- * For customising the processing you can extend this object and override the - * appropriate methods. - *

- * - * @param - */ -public class DefaultCsvCallback implements CsvCallback { - - private static final System.Logger log = EbeanVersion.log; - - /** - * The transaction to use (if not using CsvCallback). - */ - protected Transaction transaction; - - /** - * Flag set when we created the transaction. - */ - protected boolean createdTransaction; - - /** - * The EbeanServer used to save the beans. - */ - protected Database server; - - /** - * Used to log a message to indicate progress through large files. - */ - protected final int logInfoFrequency; - - /** - * The batch size used when saving the beans. - */ - protected final int persistBatchSize; - - protected boolean getGeneratedKeys = true; - /** - * The time the process started. - */ - protected long startTime; - - /** - * The execution time of the process. - */ - protected long exeTime; - - /** - * Construct with a default batch size of 30 and logging info messages every - * 1000 rows. - */ - public DefaultCsvCallback() { - this(30, 1000); - } - - /** - * Construct with explicit batch size and logging info frequency. - */ - public DefaultCsvCallback(int persistBatchSize, int logInfoFrequency) { - this.persistBatchSize = persistBatchSize; - this.logInfoFrequency = logInfoFrequency; - } - - /** - * Create a transaction if required. - */ - @Override - public void begin(Database server) { - this.server = server; - this.startTime = System.currentTimeMillis(); - initTransactionIfRequired(); - } - - /** - * Override to read the heading line. - *

- * This is only called if {@link CsvReader#setHasHeader(boolean, boolean)} is - * set to true. - *

- * By default this does nothing (effectively ignoring the heading). - */ - @Override - public void readHeader(String[] line) { - - } - - /** - * Validate that the content is valid and return false if the row should be - * ignored. - *

- * By default this just returns true. - *

- *

- * Override this to add custom validation logic returning false if you want - * the row to be ignored. For example, if all the content is empty return - * false to ignore the row (rather than having the processing fail with some - * error). - *

- */ - @Override - public boolean processLine(int row, String[] line) { - return true; - } - - /** - * Will save the bean. - *

- * Override this method to customise the bean (set additional properties etc) - * or to control the saving of other related beans (when you can't/don't want - * to use Cascade.PERSIST etc). - *

- */ - @Override - public void processBean(int row, String[] line, T bean) { - // assumes single bean or Cascade.PERSIST will save any - // related beans (e.g. customer -> customer.billingAddress - server.save(bean, transaction); - if (logInfoFrequency > 0 && (row % logInfoFrequency == 0)) { - log.log(DEBUG, "processed {0} rows", row); - } - } - - /** - * Commit the transaction if one was created. - */ - @Override - public void end(int row) { - commitTransactionIfCreated(); - exeTime = System.currentTimeMillis() - startTime; - log.log(INFO, "Csv finished, rows[{0}] exeMillis[{1}]", row, exeTime); - } - - /** - * Rollback the transaction if one was created. - */ - @Override - public void endWithError(int row, Exception e) { - rollbackTransactionIfCreated(e); - } - - /** - * Create a transaction if one is not already active and set its batch mode - * and batch size. - */ - protected void initTransactionIfRequired() { - transaction = server.currentTransaction(); - if (transaction == null || !transaction.isActive()) { - transaction = server.beginTransaction(); - createdTransaction = true; - if (persistBatchSize > 1) { - transaction.setBatchMode(true); - transaction.setBatchSize(persistBatchSize); - transaction.setGetGeneratedKeys(getGeneratedKeys); - } else { - // explicitly turn off JDBC batching in case - // is has been turned on globally - transaction.setBatchMode(false); - } - } - } - - /** - * If we created a transaction commit it. We have successfully processed all - * the rows. - */ - protected void commitTransactionIfCreated() { - if (createdTransaction) { - transaction.commit(); - } - } - - /** - * Rollback the transaction if we where not successful in processing all the - * rows. - */ - protected void rollbackTransactionIfCreated(Throwable e) { - if (createdTransaction) { - transaction.rollback(e); - } - } - -} diff --git a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/TimeStringParser.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/TimeStringParser.java deleted file mode 100644 index ed2dc7964d..0000000000 --- a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/TimeStringParser.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.ebean.csv.reader; - -import io.ebean.text.StringParser; - -import java.sql.Time; - -/** - * Parser for TIME types that supports both HH:mm:ss and HH:mm. - */ -public final class TimeStringParser implements StringParser { - - private static final TimeStringParser SHARED = new TimeStringParser(); - - /** - * Return a shared instance as this is thread safe. - */ - public static TimeStringParser get() { - return SHARED; - } - - /** - * Parse the String supporting both HH:mm:ss and HH:mm formats. - */ - @Override - @SuppressWarnings("deprecation") - public Object parse(String value) { - if (value == null || value.trim().isEmpty()) { - return null; - } - - String s = value.trim(); - int firstColon = s.indexOf(':'); - - if (firstColon == -1) { - throw new java.lang.IllegalArgumentException("No ':' in value [" + s + "]"); - } - try { - int second; - int minute; - int hour = Integer.parseInt(s.substring(0, firstColon)); - int secondColon = s.indexOf(':', firstColon + 1); - - if (secondColon == -1) { - minute = Integer.parseInt(s.substring(firstColon + 1, s.length())); - second = 0; - } else { - minute = Integer.parseInt(s.substring(firstColon + 1, secondColon)); - second = Integer.parseInt(s.substring(secondColon + 1)); - } - - return new Time(hour, minute, second); - - } catch (NumberFormatException e) { - throw new java.lang.IllegalArgumentException("Number format Error parsing time [" + s + "] " + e.getMessage(), e); - } - } -} diff --git a/ebean-csv-reader/src/main/java/module-info.java b/ebean-csv-reader/src/main/java/module-info.java deleted file mode 100644 index 51ea421957..0000000000 --- a/ebean-csv-reader/src/main/java/module-info.java +++ /dev/null @@ -1,6 +0,0 @@ -module io.ebean.csv.reader { - - requires io.ebean.api; - - exports io.ebean.csv.reader; -} diff --git a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java deleted file mode 100644 index 6504c219e5..0000000000 --- a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.ebean.csv.reader; - -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.util.IOUtils; -import org.example.Country; -import org.example.Customer; -import org.junit.jupiter.api.Test; - -import java.io.Reader; -import java.net.URL; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.Locale; - -class CsvReaderTest { - - final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd-MMM-yyyy", Locale.ENGLISH); - - @Test - void test() throws Exception { - - Country country = new Country(); - country.code("NZ"); - DB.save(country); - - Country au = new Country(); - au.code("AU"); - DB.save(au); - - URL resource = TestCsvReaderWithCallback.class.getResource("/test1.csv"); - try (Reader reader = IOUtils.newReader(resource.openStream())) { - - Database database = DB.getDefault(); - CsvReader csvReader = new CsvReader<>(database, Customer.class); - - csvReader.setPersistBatchSize(2); - - csvReader.addIgnore(); - csvReader.addProperty("status"); - csvReader.addProperty("name"); - - // supplier a StringParser for custom date, time, dateTime formats - csvReader.addProperty("anniversary", (String content) -> LocalDate.parse(content, dateFormatter)); - // OLD WAY: csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH); - csvReader.addProperty("billingAddress.line1"); - csvReader.addProperty("billingAddress.city"); - csvReader.addProperty("billingAddress.country.code"); - - csvReader.process(reader); - - } - } - -} diff --git a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TestCsvReaderWithCallback.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TestCsvReaderWithCallback.java deleted file mode 100644 index 6066a62e34..0000000000 --- a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TestCsvReaderWithCallback.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.ebean.csv.reader; - -import org.junit.jupiter.api.Test; - -public class TestCsvReaderWithCallback { - - @Test - public void test() throws Throwable { - -// URL resource = TestCsvReaderWithCallback.class.getResource("/test1.csv"); -// try (Reader reader = IOUtils.newReader(resource.openStream())) { -// -// CsvReader csvReader = DB.getDefault().createCsvReader(Customer.class); -// -// csvReader.setPersistBatchSize(2); -// csvReader.setLogInfoFrequency(3); -// -// csvReader.addIgnore(); -// // csvReader.addProperty("id"); -// csvReader.addProperty("status"); -// csvReader.addProperty("name"); -// csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH); -// csvReader.addProperty("billingAddress.line1"); -// csvReader.addProperty("billingAddress.city"); -// // processor.addReference("billingAddress.country.code"); -// csvReader.addProperty("billingAddress.country.code"); -// -// int before = DB.find(Customer.class).findCount(); -// -// csvReader.process(reader, new DefaultCsvCallback() { -// -// @Override -// public void processBean(int row, String[] lineContent, Customer cust) { -// -// server.save(cust.getBillingAddress(), transaction); -// server.save(cust, transaction); -// -// } -// -// }); -// -// int after = DB.find(Customer.class).findCount(); -// Assertions.assertThat(after).isEqualTo(before + 9); -// } - } - -} diff --git a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TimeStringParserTest.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TimeStringParserTest.java deleted file mode 100644 index bff00c0b48..0000000000 --- a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TimeStringParserTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.ebean.csv.reader; - -import org.junit.jupiter.api.Test; - -import java.sql.Time; - -import static org.junit.jupiter.api.Assertions.*; - -public class TimeStringParserTest { - - @Test - public void testSimple() { - - Time t = (Time) TimeStringParser.get().parse("12:00"); - assertNotNull(t); - - t = (Time) TimeStringParser.get().parse("12:00:12"); - assertNotNull(t); - - expectError("12"); - expectError("12:"); - expectError("12:00:"); - expectError("12:00::"); - expectError("12:00:00:"); - - } - - private void expectError(String value) { - try { - TimeStringParser.get().parse(value); - fail(); - } catch (IllegalArgumentException e) { - assertTrue(true); - } - } -} diff --git a/ebean-csv-reader/src/test/java/org/example/BaseEntity.java b/ebean-csv-reader/src/test/java/org/example/BaseEntity.java deleted file mode 100644 index d2be50575a..0000000000 --- a/ebean-csv-reader/src/test/java/org/example/BaseEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.example; - -import io.ebean.annotation.WhenCreated; - -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; -import java.time.Instant; - -@MappedSuperclass -public abstract class BaseEntity { - - @Id - long id; - - @Version - long version; - - @WhenCreated - Instant whenCreated; - - public long id() { - return id; - } - - public BaseEntity id(long id) { - this.id = id; - return this; - } - - public long version() { - return version; - } - - public BaseEntity version(long version) { - this.version = version; - return this; - } - - public Instant whenCreated() { - return whenCreated; - } - - public BaseEntity whenCreated(Instant whenCreated) { - this.whenCreated = whenCreated; - return this; - } -} diff --git a/ebean-csv-reader/src/test/java/org/example/Country.java b/ebean-csv-reader/src/test/java/org/example/Country.java deleted file mode 100644 index 15782fb2af..0000000000 --- a/ebean-csv-reader/src/test/java/org/example/Country.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.example; - -import javax.persistence.Entity; -import javax.persistence.Id; - -@Entity -public class Country { - - @Id - String code; - - String name; - - public String code() { - return code; - } - - public Country code(String code) { - this.code = code; - return this; - } - - public String name() { - return name; - } - - public Country name(String name) { - this.name = name; - return this; - } -} diff --git a/ebean-csv-reader/src/test/java/org/example/Customer.java b/ebean-csv-reader/src/test/java/org/example/Customer.java deleted file mode 100644 index 53a3fb9fa8..0000000000 --- a/ebean-csv-reader/src/test/java/org/example/Customer.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.example; - -import javax.persistence.*; -import java.time.LocalDate; - -import static javax.persistence.CascadeType.PERSIST; - -@Entity -public class Customer extends BaseEntity { - - enum Status { - NEW, - ACTIVE, - INACTIVE - } - - @Enumerated(EnumType.STRING) - Status status; - - String name; - - LocalDate anniversary; - - @ManyToOne(optional = false, cascade = PERSIST) - DAddress billingAddress; - - - public Status status() { - return status; - } - - public Customer status(Status status) { - this.status = status; - return this; - } - - public String name() { - return name; - } - - public Customer name(String name) { - this.name = name; - return this; - } - - public LocalDate anniversary() { - return anniversary; - } - - public Customer anniversary(LocalDate anniversary) { - this.anniversary = anniversary; - return this; - } - - public DAddress billingAddress() { - return billingAddress; - } - - public Customer billingAddress(DAddress billingAddress) { - this.billingAddress = billingAddress; - return this; - } -} diff --git a/ebean-csv-reader/src/test/java/org/example/DAddress.java b/ebean-csv-reader/src/test/java/org/example/DAddress.java deleted file mode 100644 index 2c8c2337ac..0000000000 --- a/ebean-csv-reader/src/test/java/org/example/DAddress.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.example; - -import javax.persistence.Entity; -import javax.persistence.ManyToOne; - -import static javax.persistence.CascadeType.PERSIST; - -@Entity -public class DAddress extends BaseEntity { - - String line1; - - String line2; - String city; - - @ManyToOne(optional = false) - Country country; - - public String line1() { - return line1; - } - - public DAddress line1(String line1) { - this.line1 = line1; - return this; - } - - public String line2() { - return line2; - } - - public DAddress line2(String line2) { - this.line2 = line2; - return this; - } - - public String city() { - return city; - } - - public DAddress city(String city) { - this.city = city; - return this; - } - - public Country country() { - return country; - } - - public DAddress country(Country country) { - this.country = country; - return this; - } -} diff --git a/ebean-csv-reader/src/test/resources/application-test.yml b/ebean-csv-reader/src/test/resources/application-test.yml deleted file mode 100644 index 758521ea5b..0000000000 --- a/ebean-csv-reader/src/test/resources/application-test.yml +++ /dev/null @@ -1,4 +0,0 @@ -ebean: - test: - platform: h2 - ddlMode: dropCreate diff --git a/ebean-csv-reader/src/test/resources/test1.csv b/ebean-csv-reader/src/test/resources/test1.csv deleted file mode 100644 index 2147575618..0000000000 --- a/ebean-csv-reader/src/test/resources/test1.csv +++ /dev/null @@ -1,9 +0,0 @@ -10000,NEW,"Roland",01-Jan-2009,"12 someplace",Auckland,NZ -,ACTIVE,"Greg",14-Feb-2009,"13 someplace",Sydney,AU -,INACTIVE,"Dan",29-Sep-2009,"14 someplace",Auckland,NZ -,NEW,"ARob",01-Jan-2009,"12 someplace",Auckland,NZ -,ACTIVE,"BGreg",14-Feb-2009,"13 someplace",Sydney,AU -,INACTIVE,"CDan",29-Sep-2009,"14 someplace",Auckland,NZ -,NEW,"DRob",01-Jan-2009,"12 someplace",Auckland,NZ -,ACTIVE,"EGreg",14-Feb-2009,"13 someplace",Sydney,AU -,INACTIVE,"FDan",29-Sep-2009,"14 someplace",Auckland,NZ diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml deleted file mode 100644 index fa7d937e46..0000000000 --- a/ebean-externalmapping-api/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 13.18.0 - - - ebean external mapping api - API for mapping external named queries - ebean-externalmapping-api - - diff --git a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapDto.java b/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapDto.java deleted file mode 100644 index de486211bb..0000000000 --- a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.ebeaninternal.xmapping.api; - -import java.util.ArrayList; -import java.util.List; - -/** - * External DTO mapping. - */ -public class XmapDto { - - protected final String clazz; - protected final List rawSql = new ArrayList<>(); - - public XmapDto(String clazz) { - this.clazz = clazz; - } - - public String getClazz() { - return clazz; - } - - public List getRawSql() { - return rawSql; - } - -} diff --git a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEbean.java b/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEbean.java deleted file mode 100644 index 117a086f41..0000000000 --- a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEbean.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.ebeaninternal.xmapping.api; - -import java.util.ArrayList; -import java.util.List; - -/** - * External mapping for Entity and DTO beans. - */ -public class XmapEbean { - - protected final List entity = new ArrayList<>(); - protected final List dto = new ArrayList<>(); - - public List getEntity() { - return entity; - } - - public List getDto() { - return dto; - } - -} diff --git a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEntity.java b/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEntity.java deleted file mode 100644 index d71942f216..0000000000 --- a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapEntity.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.ebeaninternal.xmapping.api; - -import java.util.ArrayList; -import java.util.List; - -/** - * External mapping for an Entity. - */ -public class XmapEntity { - - protected final String clazz; - protected final List namedQuery = new ArrayList<>(); - protected final List rawSql = new ArrayList<>(); - - public XmapEntity(String clazz) { - this.clazz = clazz; - } - - /** - * Return the entity class. - */ - public String getClazz() { - return clazz; - } - - /** - * Return the named queries for this entity. - */ - public List getNamedQuery() { - return namedQuery; - } - - /** - * Return the named raw sql queries for this entity. - */ - public List getRawSql() { - return rawSql; - } -} diff --git a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapNamedQuery.java b/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapNamedQuery.java deleted file mode 100644 index f8baa39926..0000000000 --- a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapNamedQuery.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.ebeaninternal.xmapping.api; - -/** - * External named query. - */ -public class XmapNamedQuery { - - protected final String name; - protected final String query; - - public XmapNamedQuery(String name, String query) { - this.name = name; - this.query = query; - } - - /** - * Return the name. - */ - public String getName() { - return name; - } - - /** - * Return the query. - */ - public String getQuery() { - return query; - } -} diff --git a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapRawSql.java b/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapRawSql.java deleted file mode 100644 index 00bf4956ec..0000000000 --- a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapRawSql.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.ebeaninternal.xmapping.api; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * External named raw sql query. - */ -public class XmapRawSql { - - protected final String name; - protected final String query; - protected final Map columnMapping = new LinkedHashMap<>(); - protected final Map aliasMapping = new LinkedHashMap<>(); - - public XmapRawSql(String name, String query) { - this.name = name; - this.query = query; - } - - public void addColumnMapping(String column, String property) { - columnMapping.put(column, property); - } - - public void addAliasMapping(String alias, String property) { - aliasMapping.put(alias, property); - } - - /** - * Return the name. - */ - public String getName() { - return name; - } - - /** - * Return the query. - */ - public String getQuery() { - return query; - } - - /** - * Return the column to property mapping. - */ - public Map getColumnMapping() { - return columnMapping; - } - - /** - * Return the alias to property mapping. - */ - public Map getAliasMapping() { - return aliasMapping; - } - -} diff --git a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapService.java b/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapService.java deleted file mode 100644 index ccdea0876c..0000000000 --- a/ebean-externalmapping-api/src/main/java/io/ebeaninternal/xmapping/api/XmapService.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.ebeaninternal.xmapping.api; - -import java.util.List; - -/** - * Read and return external mapping for named queries etc. - */ -public interface XmapService { - - /** - * Read and return external named queries etc. - */ - List read(ClassLoader classLoader, List mappingLocations); - -} diff --git a/ebean-externalmapping-api/src/main/java/module-info.java b/ebean-externalmapping-api/src/main/java/module-info.java deleted file mode 100644 index 30d64401ac..0000000000 --- a/ebean-externalmapping-api/src/main/java/module-info.java +++ /dev/null @@ -1,4 +0,0 @@ -module io.ebean.xmapping.api { - - exports io.ebeaninternal.xmapping.api; -} diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml deleted file mode 100644 index b3bf4ad7b1..0000000000 --- a/ebean-externalmapping-xml/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 13.18.0 - - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - ebean external mapping xml - XML implementation for mapping external named queries - ebean-externalmapping-xml - - - - - io.ebean - ebean-externalmapping-api - 13.18.0 - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.6 - - - jakarta.activation - jakarta.activation-api - 1.2.1 - provided - - - - - - io.avaje - classpath-scanner - 7.1 - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-platform-h2 - 13.18.0 - test - - - - io.ebean - ebean-core - 13.18.0 - test - - - - io.ebean - ebean-ddl-generator - 13.18.0 - test - - - - io.avaje - junit - 1.1 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.34 - true - - - - io.ebean.tile:enhancement:13.17.1 - - - - - - - diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java deleted file mode 100644 index 19ebdfa09d..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.ebeaninternal.xmlmapping; - -import io.avaje.classpath.scanner.ClassPathScanner; -import io.avaje.classpath.scanner.ClassPathScannerFactory; -import io.avaje.classpath.scanner.Resource; -import io.ebeaninternal.xmapping.api.XmapEbean; - -import java.util.ArrayList; -import java.util.List; -import java.util.ServiceLoader; - -/** - * Reads the Xml deployment information. - */ -class InternalConfigXmlRead { - - private final ToXmapEbean to = new ToXmapEbean(); - private final ClassLoader classLoader; - private final List mappingLocations; - - InternalConfigXmlRead(ClassLoader classLoader, List mappingLocations) { - this.classLoader = classLoader; - this.mappingLocations = mappingLocations; -// if (config.getClassLoadConfig().isJavaxJAXBPresent()) { -// init(); -// } - } - - List read() { - List list = new ArrayList<>(); - list.addAll(to.toBeans(XmlMappingReader.readByResourceName(classLoader, "ebean.xml"))); - list.addAll(to.toBeans(XmlMappingReader.readByResourceList(xmlMappingResources()))); - return list; - } - - private List xmlMappingResources() { - List scanners = scanners(); - List resourceList = new ArrayList<>(); - if (mappingLocations != null && !mappingLocations.isEmpty()) { - for (ClassPathScanner finder : scanners) { - for (String mappingLocation : mappingLocations) { - resourceList.addAll(finder.scanForResources(mappingLocation, resourceName -> resourceName.endsWith(".xml"))); - } - } - } - return resourceList; - } - - /** - * Return the list of ClassPathScanner services using DatabaseConfig service loader. - */ - private List scanners() { - List scanners = new ArrayList<>(); - for (ClassPathScannerFactory factory : ServiceLoader.load(ClassPathScannerFactory.class, classLoader)) { - scanners.add(factory.createScanner(classLoader)); - } - return scanners; - } -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/JaxbXmapService.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/JaxbXmapService.java deleted file mode 100644 index f5581bfa70..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/JaxbXmapService.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.ebeaninternal.xmlmapping; - -import io.ebeaninternal.xmapping.api.XmapEbean; -import io.ebeaninternal.xmapping.api.XmapService; - -import java.util.List; - -public class JaxbXmapService implements XmapService { - - @Override - public List read(ClassLoader classLoader, List mappingLocations) { - return new InternalConfigXmlRead(classLoader, mappingLocations).read(); - } -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/ToXmapEbean.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/ToXmapEbean.java deleted file mode 100644 index f822111b27..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/ToXmapEbean.java +++ /dev/null @@ -1,85 +0,0 @@ -package io.ebeaninternal.xmlmapping; - -import io.ebeaninternal.xmapping.api.XmapDto; -import io.ebeaninternal.xmapping.api.XmapEbean; -import io.ebeaninternal.xmapping.api.XmapEntity; -import io.ebeaninternal.xmapping.api.XmapNamedQuery; -import io.ebeaninternal.xmapping.api.XmapRawSql; -import io.ebeaninternal.xmlmapping.model.XmAliasMapping; -import io.ebeaninternal.xmlmapping.model.XmColumnMapping; -import io.ebeaninternal.xmlmapping.model.XmDto; -import io.ebeaninternal.xmlmapping.model.XmEbean; -import io.ebeaninternal.xmlmapping.model.XmEntity; -import io.ebeaninternal.xmlmapping.model.XmNamedQuery; -import io.ebeaninternal.xmlmapping.model.XmRawSql; - -import java.util.List; - -import static java.util.stream.Collectors.toList; - -public class ToXmapEbean { - - public List toBeans(List xmBeans) { - return xmBeans.stream() - .map(this::toBean) - .collect(toList()); - } - - private XmapEbean toBean(XmEbean bean) { - XmapEbean xmap = new XmapEbean(); - xmap.getDto().addAll(toDto(bean.getDto())); - xmap.getEntity().addAll(toEntity(bean.getEntity())); - return xmap; - } - - private List toEntity(List xmEntity) { - return xmEntity.stream() - .map(this::toEntity) - .collect(toList()); - } - - private XmapEntity toEntity(XmEntity xmEntity) { - XmapEntity entity = new XmapEntity(xmEntity.getClazz()); - for (XmNamedQuery named : xmEntity.getNamedQuery()) { - entity.getNamedQuery().add(toNamed(named)); - } - for (XmRawSql xmRawSql : xmEntity.getRawSql()) { - entity.getRawSql().add(toRaw(xmRawSql)); - } - return entity; - } - - private XmapNamedQuery toNamed(XmNamedQuery named) { - return new XmapNamedQuery(named.getName(), named.getQuery().getValue()); - } - - private List toDto(List dto) { - return dto.stream() - .map(this::toDto) - .collect(toList()); - } - - private XmapDto toDto(XmDto xmapDto) { - XmapDto dto = new XmapDto(xmapDto.getClazz()); - dto.getRawSql().addAll(toRaw(xmapDto.getRawSql())); - return dto; - } - - private List toRaw(List rawSql) { - return rawSql.stream() - .map(this::toRaw) - .collect(toList()); - } - - private XmapRawSql toRaw(XmRawSql xmRawSql) { - XmapRawSql rawSql = new XmapRawSql(xmRawSql.getName(), xmRawSql.getQuery().getValue()); - for (XmColumnMapping xmCol : xmRawSql.getColumnMapping()) { - rawSql.addColumnMapping(xmCol.getColumn(), xmCol.getProperty()); - } - for (XmAliasMapping xmAlias : xmRawSql.getAliasMapping()) { - rawSql.addAliasMapping(xmAlias.getAlias(), xmAlias.getProperty()); - } - return rawSql; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java deleted file mode 100644 index 8b28975efb..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.ebeaninternal.xmlmapping; - -import io.avaje.classpath.scanner.Resource; -import io.ebeaninternal.xmlmapping.model.XmEbean; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; - -public class XmlMappingReader { - - - /** - * Read and return a Migration from an xml document. - */ - public static XmEbean read(InputStream is) { - - try { - JAXBContext jaxbContext = JAXBContext.newInstance(XmEbean.class); - Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); - return (XmEbean) unmarshaller.unmarshal(is); - - } catch (JAXBException e) { - throw new RuntimeException(e); - } - } - - /** - * Read the deployment XML for the given resource name. - */ - public static List readByResourceName(ClassLoader classLoader, String resourceName) { - try { - Enumeration resources = classLoader.getResources(resourceName); - List mappings = new ArrayList<>(); - while (resources.hasMoreElements()) { - URL url = resources.nextElement(); - try (InputStream is = openNoCache(url)) { - mappings.add(XmlMappingReader.read(is)); - } - } - return mappings; - } catch (IOException e) { - throw new RuntimeException("Error reading ebean xml mapping", e); - } - } - - /** - * Read the deployment XML for the given resources. - */ - public static List readByResourceList(List resourceList) { - try { - List mappings = new ArrayList<>(); - for (Resource xmlMappingRes : resourceList) { - try (InputStream is = xmlMappingRes.inputStream()) { - mappings.add(XmlMappingReader.read(is)); - } - } - return mappings; - } catch (IOException e) { - throw new RuntimeException("Error reading ebean xml mapping", e); - } - } - - private static InputStream openNoCache(URL url) throws IOException { - URLConnection urlConnection = url.openConnection(); - urlConnection.setUseCaches(false); - return urlConnection.getInputStream(); - } -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java deleted file mode 100644 index 7d10dde8de..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package io.ebeaninternal.xmlmapping.model; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the io.ebeaninternal.xmlmapping.model package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.xmlmapping.model - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link XmRawSql } - */ - public XmRawSql createRawSql() { - return new XmRawSql(); - } - - /** - * Create an instance of {@link XmAliasMapping } - */ - public XmAliasMapping createAliasMapping() { - return new XmAliasMapping(); - } - - /** - * Create an instance of {@link XmColumnMapping } - */ - public XmColumnMapping createColumnMapping() { - return new XmColumnMapping(); - } - - /** - * Create an instance of {@link XmQuery } - */ - public XmQuery createQuery() { - return new XmQuery(); - } - - /** - * Create an instance of {@link XmEbean } - */ - public XmEbean createEbean() { - return new XmEbean(); - } - - /** - * Create an instance of {@link XmEntity } - */ - public XmEntity createEntity() { - return new XmEntity(); - } - - /** - * Create an instance of {@link XmNamedQuery } - */ - public XmNamedQuery createNamedQuery() { - return new XmNamedQuery(); - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java deleted file mode 100644 index 82f4da7d6a..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.ebeaninternal.xmlmapping.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; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="alias" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="property" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -@XmlRootElement(name = "alias-mapping") -public class XmAliasMapping { - - @XmlAttribute(name = "alias", required = true) - protected String alias; - @XmlAttribute(name = "property", required = true) - protected String property; - - /** - * Gets the value of the alias property. - * - * @return possible object is - * {@link String } - */ - public String getAlias() { - return alias; - } - - /** - * Sets the value of the alias property. - * - * @param value allowed object is - * {@link String } - */ - public void setAlias(String value) { - this.alias = value; - } - - /** - * Gets the value of the property property. - * - * @return possible object is - * {@link String } - */ - public String getProperty() { - return property; - } - - /** - * Sets the value of the property property. - * - * @param value allowed object is - * {@link String } - */ - public void setProperty(String value) { - this.property = value; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java deleted file mode 100644 index a992971cb4..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.ebeaninternal.xmlmapping.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; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="column" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="property" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -@XmlRootElement(name = "column-mapping") -public class XmColumnMapping { - - @XmlAttribute(name = "column", required = true) - protected String column; - @XmlAttribute(name = "property", required = true) - protected String property; - - /** - * Gets the value of the column property. - * - * @return possible object is - * {@link String } - */ - public String getColumn() { - return column; - } - - /** - * Sets the value of the column property. - * - * @param value allowed object is - * {@link String } - */ - public void setColumn(String value) { - this.column = value; - } - - /** - * Gets the value of the property property. - * - * @return possible object is - * {@link String } - */ - public String getProperty() { - return property; - } - - /** - * Sets the value of the property property. - * - * @param value allowed object is - * {@link String } - */ - public void setProperty(String value) { - this.property = value; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java deleted file mode 100644 index 57e431322e..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java +++ /dev/null @@ -1,121 +0,0 @@ -package io.ebeaninternal.xmlmapping.model; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}named-query" maxOccurs="unbounded"/>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}raw-sql" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="class" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "namedQuery", - "rawSql" -}) -@XmlRootElement(name = "dto") -public class XmDto { - - @XmlElement(name = "named-query", required = true) - protected List namedQuery; - @XmlElement(name = "raw-sql", required = true) - protected List rawSql; - @XmlAttribute(name = "class", required = true) - protected String clazz; - - /** - * Gets the value of the namedQuery property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the namedQuery property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getNamedQuery().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link XmNamedQuery } - */ - public List getNamedQuery() { - if (namedQuery == null) { - namedQuery = new ArrayList<>(); - } - return this.namedQuery; - } - - /** - * Gets the value of the rawSql property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the rawSql property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getRawSql().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link XmRawSql } - */ - public List getRawSql() { - if (rawSql == null) { - rawSql = new ArrayList<>(); - } - return this.rawSql; - } - - /** - * Gets the value of the clazz property. - * - * @return possible object is - * {@link String } - */ - public String getClazz() { - return clazz; - } - - /** - * Sets the value of the clazz property. - * - * @param value allowed object is - * {@link String } - */ - public void setClazz(String value) { - this.clazz = value; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java deleted file mode 100644 index 35ba42d584..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java +++ /dev/null @@ -1,80 +0,0 @@ -package io.ebeaninternal.xmlmapping.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 java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}entity" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "entity", - "dto" -}) -@XmlRootElement(name = "ebean") -public class XmEbean { - - @XmlElement(required = false) - protected List entity; - - @XmlElement(required = false) - protected List dto; - - /** - * Gets the value of the entity property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the entity property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getEntity().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link XmEntity } - */ - public List getEntity() { - if (entity == null) { - entity = new ArrayList<>(); - } - return this.entity; - } - - /** - * Returns the List of XmDto beans. - */ - public List getDto() { - if (dto == null) { - dto = new ArrayList<>(); - } - return this.dto; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java deleted file mode 100644 index daf3529930..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java +++ /dev/null @@ -1,121 +0,0 @@ -package io.ebeaninternal.xmlmapping.model; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}named-query" maxOccurs="unbounded"/>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}raw-sql" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="class" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "namedQuery", - "rawSql" -}) -@XmlRootElement(name = "entity") -public class XmEntity { - - @XmlElement(name = "named-query", required = true) - protected List namedQuery; - @XmlElement(name = "raw-sql", required = true) - protected List rawSql; - @XmlAttribute(name = "class", required = true) - protected String clazz; - - /** - * Gets the value of the namedQuery property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the namedQuery property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getNamedQuery().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link XmNamedQuery } - */ - public List getNamedQuery() { - if (namedQuery == null) { - namedQuery = new ArrayList<>(); - } - return this.namedQuery; - } - - /** - * Gets the value of the rawSql property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the rawSql property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getRawSql().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link XmRawSql } - */ - public List getRawSql() { - if (rawSql == null) { - rawSql = new ArrayList<>(); - } - return this.rawSql; - } - - /** - * Gets the value of the clazz property. - * - * @return possible object is - * {@link String } - */ - public String getClazz() { - return clazz; - } - - /** - * Sets the value of the clazz property. - * - * @param value allowed object is - * {@link String } - */ - public void setClazz(String value) { - this.clazz = value; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java deleted file mode 100644 index 644075c7bb..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java +++ /dev/null @@ -1,81 +0,0 @@ -package io.ebeaninternal.xmlmapping.model; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}query"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "query" -}) -@XmlRootElement(name = "named-query") -public class XmNamedQuery { - - @XmlElement(required = true) - protected XmQuery query; - @XmlAttribute(name = "name", required = true) - protected String name; - - /** - * Gets the value of the query property. - * - * @return possible object is - * {@link XmQuery } - */ - public XmQuery getQuery() { - return query; - } - - /** - * Sets the value of the query property. - * - * @param value allowed object is - * {@link XmQuery } - */ - public void setQuery(XmQuery value) { - this.query = value; - } - - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) { - this.name = value; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java deleted file mode 100644 index 236cd38172..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.ebeaninternal.xmlmapping.model; - -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 javax.xml.bind.annotation.XmlValue; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *     </extension>
- *   </simpleContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "value" -}) -@XmlRootElement(name = "query") -public class XmQuery { - - @XmlValue - protected String value; - - /** - * Gets the value of the value property. - * - * @return possible object is - * {@link String } - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value allowed object is - * {@link String } - */ - public void setValue(String value) { - this.value = value; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java deleted file mode 100644 index 52455aa490..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java +++ /dev/null @@ -1,145 +0,0 @@ -package io.ebeaninternal.xmlmapping.model; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; - - -/** - *

Java class for anonymous complex type. - *

- *

The following schema fragment specifies the expected content contained within this class. - *

- * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}alias-mapping" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}column-mapping" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://ebean-orm.github.io/xml/ns/ebean}query"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "aliasMapping", - "columnMapping", - "query" -}) -@XmlRootElement(name = "raw-sql") -public class XmRawSql { - - @XmlElement(name = "alias-mapping") - protected List aliasMapping; - @XmlElement(name = "column-mapping") - protected List columnMapping; - @XmlElement(required = true) - protected XmQuery query; - @XmlAttribute(name = "name", required = true) - protected String name; - - /** - * Gets the value of the aliasMapping property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the aliasMapping property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getAliasMapping().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link XmAliasMapping } - */ - public List getAliasMapping() { - if (aliasMapping == null) { - aliasMapping = new ArrayList<>(); - } - return this.aliasMapping; - } - - /** - * Gets the value of the columnMapping property. - *

- *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the columnMapping property. - *

- *

- * For example, to add a new item, do as follows: - * 

-   *    getColumnMapping().add(newItem);
-   *
- *

- *

- *

- * Objects of the following type(s) are allowed in the list - * {@link XmColumnMapping } - */ - public List getColumnMapping() { - if (columnMapping == null) { - columnMapping = new ArrayList<>(); - } - return this.columnMapping; - } - - /** - * Gets the value of the query property. - * - * @return possible object is - * {@link XmQuery } - */ - public XmQuery getQuery() { - return query; - } - - /** - * Sets the value of the query property. - * - * @param value allowed object is - * {@link XmQuery } - */ - public void setQuery(XmQuery value) { - this.query = value; - } - - /** - * Gets the value of the name property. - * - * @return possible object is - * {@link String } - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value allowed object is - * {@link String } - */ - public void setName(String value) { - this.name = value; - } - -} diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java deleted file mode 100644 index 1822923b4c..0000000000 --- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/ebean", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package io.ebeaninternal.xmlmapping.model; diff --git a/ebean-externalmapping-xml/src/main/java/module-info.java b/ebean-externalmapping-xml/src/main/java/module-info.java deleted file mode 100644 index 420f85c537..0000000000 --- a/ebean-externalmapping-xml/src/main/java/module-info.java +++ /dev/null @@ -1,21 +0,0 @@ -import io.avaje.classpath.scanner.ClassPathScannerFactory; -import io.ebeaninternal.xmapping.api.XmapService; -import io.ebeaninternal.xmlmapping.JaxbXmapService; - -/** - * Provider of XmapService. - */ -module io.ebean.xmapping.xml { - - provides XmapService with JaxbXmapService; - - requires transitive io.ebean.xmapping.api; - requires transitive java.xml; - requires transitive java.xml.bind; - requires io.avaje.classpath.scanner.api; - requires io.avaje.classpath.scanner; - requires static java.sql; // for testing - - uses ClassPathScannerFactory; - -} diff --git a/ebean-externalmapping-xml/src/main/resources/META-INF/services/io.ebeaninternal.xmapping.api.XmapService b/ebean-externalmapping-xml/src/main/resources/META-INF/services/io.ebeaninternal.xmapping.api.XmapService deleted file mode 100644 index e65ada2dfd..0000000000 --- a/ebean-externalmapping-xml/src/main/resources/META-INF/services/io.ebeaninternal.xmapping.api.XmapService +++ /dev/null @@ -1 +0,0 @@ -io.ebeaninternal.xmlmapping.JaxbXmapService diff --git a/ebean-externalmapping-xml/src/main/resources/ebean-1.0.xsd b/ebean-externalmapping-xml/src/main/resources/ebean-1.0.xsd deleted file mode 100644 index 63de5f96b4..0000000000 --- a/ebean-externalmapping-xml/src/main/resources/ebean-1.0.xsd +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java b/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java deleted file mode 100644 index c76eda519b..0000000000 --- a/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.ebeaninternal.xmlmapping.model; - -import io.ebeaninternal.xmlmapping.XmlMappingReader; -import org.junit.jupiter.api.Test; - -import java.io.InputStream; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - -public class XmlMappingReaderTest { - - @Test - public void read() { - - InputStream is = XmlMappingReaderTest.class.getResourceAsStream("/test-ebean.xml"); - XmEbean testMapping = XmlMappingReader.read(is); - - assertNotNull(testMapping); - } - -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Address.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Address.java deleted file mode 100644 index 79d26f71f1..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Address.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.tests.model.basic; - -import javax.persistence.Entity; -import javax.persistence.Table; - -@Entity -@Table(name = "o_address") -public class Address extends BasicDomain { - String line1; - String line2; - String city; -// @ManyToOne -// Country country; -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/BasicDomain.java deleted file mode 100644 index d65d4f426b..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/BasicDomain.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.tests.model.basic; - -import io.ebean.Model; -import io.ebean.annotation.WhenCreated; -import io.ebean.annotation.WhenModified; - -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; -import java.io.Serializable; -import java.sql.Timestamp; -import java.time.Instant; - -@MappedSuperclass -public class BasicDomain extends Model { - - @Id - long id; - - @WhenCreated - Instant whenCreated; - - @WhenModified - Instant whenModified; - - @Version - long version; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public Instant getWhenCreated() { - return whenCreated; - } - - public void setWhenCreated(Instant whenCreated) { - this.whenCreated = whenCreated; - } - - public Instant getWhenModified() { - return whenModified; - } - - public void setWhenModified(Instant whenModified) { - this.whenModified = whenModified; - } - - public long getVersion() { - return version; - } - - public void setVersion(long version) { - this.version = version; - } -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Contact.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Contact.java deleted file mode 100644 index ed9c38823a..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Contact.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.tests.model.basic; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; - -@Entity -public class Contact extends BasicDomain { - - @ManyToOne(optional = false) - Customer customer; - - String firstName; - String lastName; - String phone; - String mobile; - String email; - boolean isMember; - - public Contact(String firstName, String lastName) { - this.firstName = firstName; - this.lastName = lastName; - } -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/CustDto.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/CustDto.java deleted file mode 100644 index fc7bd299e2..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/CustDto.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.tests.model.basic; - - public class CustDto { - - final Integer id; - - final String name; - - int totalOrders; - - public CustDto(Integer id, String name) { - this.id = id; - this.name = name; - } - - @Override - public String toString() { - return "id:" + id + " name:" + name + " totalOrders:" + totalOrders; - } - - public Integer getId() { - return id; - } - - public String getName() { - return name; - } - - public int getTotalOrders() { - return totalOrders; - } - - public void setTotalOrders(int totalOrders) { - this.totalOrders = totalOrders; - } - } diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Customer.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Customer.java deleted file mode 100644 index bbba927528..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Customer.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.tests.model.basic; - -import io.ebean.annotation.DbEnumValue; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import java.util.List; - -@NamedQuery(name = "name", query = "select(name) order by name") -@NamedQuery(name = "withStatus", query = "select(name,status) order by name") -@Entity -@Table(name = "o_customer") -public class Customer extends BasicDomain { - public enum Status { - NEW("N"), - ACTIVE("A"), - INACTIVE("I"); - - String dbValue; - Status(String dbValue) { - this.dbValue = dbValue; - } - @DbEnumValue - public String getValue() { - return dbValue; - } - } - - Status status; - String name; - String smallnote; - - @ManyToOne(cascade = CascadeType.ALL) - Address billingAddress; - @ManyToOne(cascade = CascadeType.ALL) - Address shippingAddress; - - @OneToMany(mappedBy = "customer") - List orders; - - @OneToMany(mappedBy = "customer", cascade = CascadeType.ALL) - List contacts; - - public Status getStatus() { - return status; - } - - public void setStatus(Status status) { - this.status = status; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getSmallnote() { - return smallnote; - } - - public void setSmallnote(String smallnote) { - this.smallnote = smallnote; - } - - public Address getBillingAddress() { - return billingAddress; - } - - public void setBillingAddress(Address billingAddress) { - this.billingAddress = billingAddress; - } - - public Address getShippingAddress() { - return shippingAddress; - } - - public void setShippingAddress(Address shippingAddress) { - this.shippingAddress = shippingAddress; - } - - public List getOrders() { - return orders; - } - - public void setOrders(List orders) { - this.orders = orders; - } - - public List getContacts() { - return contacts; - } - - public void setContacts(List contacts) { - this.contacts = contacts; - } -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Order.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Order.java deleted file mode 100644 index 076f5bb21a..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Order.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.tests.model.basic; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; -import java.time.LocalDate; -import java.util.List; - -@Entity -@Table(name = "o_order") -public class Order extends BasicDomain { - - public enum Status { - NEW, - APPROVED, - SHIPPED, - COMPLETE - } - - @Enumerated(value = EnumType.ORDINAL) - Status status = Status.NEW; - LocalDate orderDate; - LocalDate shipDate; - - @ManyToOne(cascade = CascadeType.PERSIST) - Customer customer; - - @OneToMany(cascade = CascadeType.ALL, mappedBy = "order") - @OrderBy("id asc, orderQty asc, cretime desc") - List details; - -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderAggregate.java deleted file mode 100644 index 0cd8381dc5..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderAggregate.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.tests.model.basic; - -import io.ebean.annotation.Sql; - -import javax.persistence.Entity; -import javax.persistence.OneToOne; - -/** - * An example of an Aggregate object. - *

- * Note the @Sql indicates to Ebean that this bean is not based on a table but - * instead uses RawSql. - *

- */ -@Entity -@Sql -public class OrderAggregate { - - @OneToOne - Order order; - Double maxAmount; - Double totalAmount; - Long totalItems; - -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderDetail.java deleted file mode 100644 index 4404c88b85..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/OrderDetail.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.tests.model.basic; - -import io.ebean.annotation.Cache; -import io.ebean.annotation.DocEmbedded; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; -import java.io.Serializable; -import java.sql.Timestamp; - -@Entity -@Table(name = "o_order_detail") -public class OrderDetail extends BasicDomain { - - @ManyToOne(optional = false) - Order order; - - Integer orderQty; - Integer shipQty; - Double unitPrice; - - @ManyToOne - Product product; - -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Product.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Product.java deleted file mode 100644 index ac1e863801..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/Product.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.tests.model.basic; - -import javax.persistence.Entity; -import javax.persistence.Table; - -@Entity -@Table(name = "o_product") -public class Product extends BasicDomain { - String sku; - String name; -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java deleted file mode 100644 index 047c4a1433..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/BaseTestCase.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.tests.model.basic.test; - -import io.ebean.DB; -import io.ebean.annotation.Platform; -import io.ebeaninternal.api.SpiEbeanServer; - -public class BaseTestCase { - - protected boolean isSqlServer() { - return Platform.SQLSERVER == platform(); - } - - protected Platform platform() { - return spiEbeanServer().platform().base(); - } - - protected SpiEbeanServer spiEbeanServer() { - return (SpiEbeanServer) DB.getDefault(); - } - -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java deleted file mode 100644 index 30a7c82a23..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.tests.model.basic.test; - -import io.ebean.DB; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.CustDto; -import org.tests.model.basic.Customer; - -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -public class NamedDtoQueryTest { - - @Test - public void dto_findList_constructorMatch() { - - Customer customer = new Customer(); - customer.setName("dtoTest"); - customer.save(); - - final List list = DB.getDefault().createNamedDtoQuery(CustDto.class, "findByName") - .setParameter("dtoT%") - .findList(); - - assertThat(list).hasSize(1); - assertThat(list.get(0).getId()).isEqualTo(customer.getId()); - } -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java deleted file mode 100644 index 442f402691..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.tests.model.basic.test; - -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Query; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.Customer; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Named queries both local to the entity bean and via external xml source. - */ -public class NamedLocalAndExternalTest extends BaseTestCase { - - private Database server() { - return DB.getDefault(); - } - - private String sqlOf(Query query) { - return query.getGeneratedSql(); - } - - @Test - public void namedQuery() { - - Query name = server().createNamedQuery(Customer.class, "name"); - name.findList(); - - assertThat(sqlOf(name)).contains("select t0.id, t0.name from o_customer t0 order by t0.name"); - } - - @Test - public void namedQuery_withStatus() { - - Query name = server().createNamedQuery(Customer.class, "withStatus"); - name.order().clear().asc("status"); - name.findList(); - - assertThat(sqlOf(name)).contains("select t0.id, t0.name, t0.status from o_customer t0 order by t0.status"); - } - - @Test - public void namedQuery_fromXml() { - - Query query = server() - .createNamedQuery(Customer.class, "withContactsById") - .setParameter("id", 1); - - query.setUseCache(false); - query.findOne(); - - assertThat(sqlOf(query)).contains("from o_customer t0 left join contact t1 on t1.customer_id = t0.id "); - } - - @Test - public void namedQuery_fromCustomXmlLocations() { - - Query query = server() - .createNamedQuery(Customer.class, "withContactsById2") - .setParameter("id", 1); - - query.setUseCache(false); - query.findOne(); - - assertThat(sqlOf(query)).contains("from o_customer t0 left join contact t1 on t1.customer_id = t0.id "); - } -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java deleted file mode 100644 index f28f01fb9b..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.tests.model.basic.test; - -import io.ebean.DB; -import io.ebean.Query; -import org.assertj.core.api.AbstractCharSequenceAssert; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.OrderAggregate; - -public class OrderAggregateNamedRawSqlTest { - - protected AbstractCharSequenceAssert assertSql(Query query) { - return org.assertj.core.api.Assertions.assertThat(query.getGeneratedSql()); - } - - @Test - public void testDefaultNamedRawSql() { - Query query = DB.find(OrderAggregate.class); - query.findList(); - - assertSql(query).contains("count(*) as total_items, sum(order_qty*unit_price) as total_amount"); - } - - @Test - public void testNamedRawSql() { - Query query = DB.createNamedQuery(OrderAggregate.class, "withMax"); - query.findList(); - assertSql(query).contains("count(*) as total_items, sum(order_qty*unit_price) as total_amount, max(order_qty*unit_price) as maxAmount from o_order_detail"); - } - - @Test - public void testNamedRawSql_with_extraPredicates() { - - Query query = DB.createNamedQuery(OrderAggregate.class, "withMax"); - query - .where().gt("order.id", 1) - .having().gt("totalItems", 1) - .order().desc("totalAmount") - .findList(); - - assertSql(query).contains("count(*) as total_items, sum(order_qty*unit_price) as total_amount, max(order_qty*unit_price) as maxAmount from o_order_detail"); - assertSql(query).contains("from o_order_detail where order_id > ? group by order_id having count(*) > ? order by sum(order_qty*unit_price) desc"); - } - - @Test - public void testNamedRawSql_with_param() { - - Query query = DB.createNamedQuery(OrderAggregate.class, "withParam"); - query - .setParameter("minId", 2) - .where().isNotNull("order.id") - .having().lt("totalAmount", 100) - .order().desc("totalAmount") - .setMaxRows(10) - .findList(); - - assertSql(query).contains("count(*) as totalItems, sum(order_qty*unit_price) as totalAmount, max(order_qty*unit_price) as maxAmount from o_order_detail"); - assertSql(query).contains("from o_order_detail where id > ? and order_id is not null group by order_id having sum(order_qty*unit_price) < ? order by sum(order_qty*unit_price) desc"); - } -} diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java deleted file mode 100644 index 0e9350dc00..0000000000 --- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.tests.model.basic.test; - -import io.ebean.DB; -import io.ebean.Query; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.Order; - -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -public class RawSqlOrmQueryTest extends BaseTestCase { - - //@IgnorePlatform(Platform.ORACLE) - @Test - public void testNamed() { - - Query query = DB.getDefault().createNamedQuery(Order.class, "myRawTest"); - query.setParameter("orderStatus", Order.Status.NEW); - query.setMaxRows(10); - List list = query.findList(); - for (Order order : list) { - order.getWhenCreated(); - } - - String sql = query.getGeneratedSql(); - if (isSqlServer()) { - assertThat(sql).contains("select top 10 o.id,"); - } else { - assertThat(sql).contains("select o.id,"); - assertThat(sql).contains("limit 10"); - } - assertThat(sql).contains("o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line1, a.line2, a.city from o_order o"); - assertThat(sql).contains("join o_customer c on o.customer_id = c.id "); - assertThat(sql).contains("where o.status = ? order by c.name, c.id"); - } - - //@IgnorePlatform(Platform.ORACLE) - @Test - public void testNamed_fromCustomXmlLocations() { - - //ResetBasicData.reset(); - - Query query = DB.getDefault().createNamedQuery(Order.class, "myRawTest2"); - query.setParameter("orderStatus", Order.Status.NEW); - query.setMaxRows(10); - List list = query.findList(); - for (Order order : list) { - order.getWhenModified(); - } - - String sql = query.getGeneratedSql(); - if (isSqlServer()) { - assertThat(sql).contains("select top 10 o.id,"); - } else { - assertThat(sql).contains("select o.id,"); - assertThat(sql).contains("limit 10"); - } - assertThat(sql).contains("o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line1, a.line2, a.city from o_order o"); - assertThat(sql).contains("join o_customer c on o.customer_id = c.id "); - assertThat(sql).contains("where o.status = ? order by c.name, c.id"); - } - - //@IgnorePlatform(Platform.ORACLE) - @Test - public void testNamed_fromCustomXmlLocations_withComments() { - - //ResetBasicData.reset(); - - Query query = DB.getDefault().createNamedQuery(Order.class, "myRawTest3"); - query.setMaxRows(10); - - query.findList(); - assertThat(query.getGeneratedSql()).contains("-- must be unparsed raw sql"); - } - -} diff --git a/ebean-externalmapping-xml/src/test/resources/META-INF/ebean-version.mf b/ebean-externalmapping-xml/src/test/resources/META-INF/ebean-version.mf deleted file mode 100644 index 5b6b424fe3..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/META-INF/ebean-version.mf +++ /dev/null @@ -1 +0,0 @@ -ebean-version: 143 diff --git a/ebean-externalmapping-xml/src/test/resources/application-test.properties b/ebean-externalmapping-xml/src/test/resources/application-test.properties deleted file mode 100644 index 15ecf2d07c..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/application-test.properties +++ /dev/null @@ -1,17 +0,0 @@ -ebean.mappingLocations=classpath:/ebean-xml-mappings - -ebean.ddl.generate=true -ebean.ddl.run=true -datasource.default=h2 - -datasource.db.username=sa -datasource.db.password= -datasource.db.url=jdbc:h2:mem:xm - -datasource.h2.username=sa -datasource.h2.password= -datasource.h2.url=jdbc:h2:mem:xm - -datasource.pg.username=sa -datasource.pg.password= -datasource.pg.url=jdbc:h2:mem:xm diff --git a/ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/CustomerMapping.xml b/ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/CustomerMapping.xml deleted file mode 100644 index 1d26d6e5f3..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/CustomerMapping.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - select (name, version) - fetch contacts (firstName, lastName, email) - where id = :id - - - - - - - - select id, name from o_customer where name like ? - - - - - diff --git a/ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/OrderMapping.xml b/ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/OrderMapping.xml deleted file mode 100644 index a4745ccbc6..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/ebean-xml-mappings/OrderMapping.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - select o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line1, a.line2, a.city - from o_order o - join o_customer c on o.customer_id = c.id - join o_address a on c.billing_address_id = a.id - where o.status = :orderStatus - order by c.name, c.id - - - - - - - - -- must be unparsed raw sql - select o.id, o.status - from o_order o - - - - - - diff --git a/ebean-externalmapping-xml/src/test/resources/ebean.mf b/ebean-externalmapping-xml/src/test/resources/ebean.mf deleted file mode 100644 index 78e35a60f7..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/ebean.mf +++ /dev/null @@ -1 +0,0 @@ -synthetic: false diff --git a/ebean-externalmapping-xml/src/test/resources/ebean.xml b/ebean-externalmapping-xml/src/test/resources/ebean.xml deleted file mode 100644 index 8fe6794519..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/ebean.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount - from o_order_detail - group by order_id - - - - - - - select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount, max(order_qty*unit_price) as maxAmount - from o_order_detail - group by order_id - - - - - - - select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount, max(order_qty*unit_price) as maxAmount - from o_order_detail where id > :minId - group by order_id - - - - - - - - - - - select o.id, o.status, o.ship_date, c.id, c.name, a.id, a.line1, a.line2, a.city - from o_order o - join o_customer c on o.customer_id = c.id - join o_address a on c.billing_address_id = a.id - where o.status = :orderStatus - order by c.name, c.id - - - - - - - - select (name, version) - fetch contacts (firstName, lastName, email) - where id = :id - - - - - diff --git a/ebean-externalmapping-xml/src/test/resources/logback-test.xml b/ebean-externalmapping-xml/src/test/resources/logback-test.xml deleted file mode 100644 index 8d97efd243..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/logback-test.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - TRACE - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - diff --git a/ebean-externalmapping-xml/src/test/resources/test-ebean.xml b/ebean-externalmapping-xml/src/test/resources/test-ebean.xml deleted file mode 100644 index 2429076630..0000000000 --- a/ebean-externalmapping-xml/src/test/resources/test-ebean.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount - from o_order_detail - group by order_id - - - - - - select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount - from o_order_detail - group by order_id - - - - - diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml deleted file mode 100644 index 208c88de1d..0000000000 --- a/ebean-jackson-jsonnode/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 13.18.0 - - - ebean-jackson-jsonnode - - - - - io.ebean - ebean-core-type - 13.18.0 - provided - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - provided - - - - io.avaje - junit - 1.1 - test - - - - diff --git a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java deleted file mode 100644 index c932d53397..0000000000 --- a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.ebean.jackson.jsonnode; - -import com.fasterxml.jackson.databind.JsonNode; -import io.ebean.config.dbplatform.DbPlatformType; -import io.ebean.core.type.ScalarType; -import io.ebean.core.type.ScalarTypeSet; - -import java.sql.Types; - -class JsonNodeSet implements ScalarTypeSet { - - final ScalarType varchar; - final ScalarType clob; - final ScalarType blob; - final ScalarType jsonb; - final ScalarType json; - - JsonNodeSet(ScalarType varchar, ScalarType clob, ScalarType blob, ScalarType jsonb, ScalarType json) { - this.varchar = varchar; - this.clob = clob; - this.blob = blob; - this.jsonb = jsonb; - this.json = json; - } - - @Override - public Class type() { - return JsonNode.class; - } - - @Override - public ScalarType defaultType() { - return json; - } - - @Override - public ScalarType forType(int dbType) { - switch (dbType) { - case Types.VARCHAR: - return varchar; - case Types.BLOB: - return blob; - case Types.CLOB: - return clob; - case DbPlatformType.JSONB: - return jsonb; - default: - return json; - } - } -} diff --git a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java deleted file mode 100644 index af8f198fe3..0000000000 --- a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.ebean.jackson.jsonnode; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.config.DatabaseConfig; -import io.ebean.core.type.PostgresHelper; -import io.ebean.core.type.ScalarType; -import io.ebean.core.type.ScalarTypeSet; -import io.ebean.core.type.ScalarTypeSetFactory; - -public class JsonNodeTypeFactory implements ScalarTypeSetFactory { - - @Override - public ScalarTypeSet createTypeSet(DatabaseConfig config, Object objectMapper) { - if (objectMapper == null) { - return null; - } - - ObjectMapper mapper = (ObjectMapper) objectMapper; - var varchar = new ScalarTypeJsonNode.Varchar(mapper); - var clob = new ScalarTypeJsonNode.Clob(mapper); - var blob = new ScalarTypeJsonNode.Blob(mapper); - ScalarType json = clob; // Default for non-Postgres databases - ScalarType jsonb = clob; // Default for non-Postgres databases - if (PostgresHelper.isPostgresCompatible(config.getDatabasePlatform())) { - json = new ScalarTypeJsonNodePostgres.JSON(mapper); - jsonb = new ScalarTypeJsonNodePostgres.JSONB(mapper); - } - return new JsonNodeSet(varchar, clob, blob, jsonb, json); - } -} diff --git a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java deleted file mode 100644 index ca9859bdee..0000000000 --- a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java +++ /dev/null @@ -1,201 +0,0 @@ -package io.ebean.jackson.jsonnode; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.core.type.DataBinder; -import io.ebean.core.type.DataReader; -import io.ebean.core.type.DocPropertyType; -import io.ebean.core.type.ScalarTypeBase; -import io.ebean.text.TextException; -import io.ebean.util.IOUtils; - -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.sql.SQLException; -import java.sql.Types; - -/** - * Type which maps Jackson's JsonNode to various DB types (Clob, Varchar, Blob) in JSON format. - */ -abstract class ScalarTypeJsonNode extends ScalarTypeBase { - - /** - * Clob storage based implementation. - */ - static final class Clob extends ScalarTypeJsonNode { - - Clob(ObjectMapper objectMapper) { - super(objectMapper, Types.CLOB); - } - - @Override - public JsonNode read(DataReader reader) throws SQLException { - String content = reader.getStringFromStream(); - if (content == null) { - return null; - } - return parse(content); - } - } - - /** - * Varchar storage based implementation. - */ - static final class Varchar extends ScalarTypeJsonNode { - - public Varchar(ObjectMapper objectMapper) { - super(objectMapper, Types.VARCHAR); - } - } - - /** - * Blob storage based implementation. - */ - static class Blob extends ScalarTypeJsonNode { - - Blob(ObjectMapper objectMapper) { - super(objectMapper, Types.BLOB); - } - - @Override - public JsonNode read(DataReader dataReader) throws SQLException { - InputStream is = dataReader.getBinaryStream(); - if (is == null) { - return null; - } - try (Reader reader = IOUtils.newReader(is)) { - return parse(reader); - } catch (IOException e) { - throw new SQLException("Error reading Blob stream from DB", e); - } - } - - @Override - public void bind(DataBinder binder, JsonNode value) throws SQLException { - if (value == null) { - binder.setNull(Types.BLOB); - } else { - String rawJson = formatValue(value); - binder.setBlob(rawJson.getBytes(StandardCharsets.UTF_8)); - } - } - } - - /** - * Jackson's ObjectMapper used to read / write JsonNode - */ - final ObjectMapper objectMapper; - - ScalarTypeJsonNode(ObjectMapper objectMapper, int jdbcType) { - super(JsonNode.class, false, jdbcType); - this.objectMapper = objectMapper; - } - - /** - * Map is a mutable type. Use the isDirty() method to check for dirty state. - */ - @Override - public boolean mutable() { - return true; - } - - /** - * Return true if the value should be considered dirty (and included in an update). - */ - @Override - public boolean isDirty(Object value) { - return true; - } - - @Override - public JsonNode read(DataReader reader) throws SQLException { - String rawJson = reader.getString(); - if (rawJson == null) { - return null; - } - return parse(rawJson); - } - - @Override - public void bind(DataBinder binder, JsonNode value) throws SQLException { - if (value == null) { - binder.setNull(Types.VARCHAR); - } else { - String rawJson = formatValue(value); - binder.setString(rawJson); - } - } - - @Override - public Object toJdbcType(Object value) { - return value; - } - - @Override - public JsonNode toBeanType(Object value) { - return (JsonNode) value; - } - - @Override - public String formatValue(JsonNode jsonNode) { - try { - return objectMapper.writeValueAsString(jsonNode); - } catch (IOException e) { - throw new TextException(e); - } - } - - @Override - public JsonNode parse(String value) { - try { - return objectMapper.readValue(value, JsonNode.class); - } catch (IOException e) { - throw new TextException("Failed to parse JSON [{}] as JsonNode", value, e); - } - } - - public JsonNode parse(Reader reader) { - try { - return objectMapper.readValue(reader, JsonNode.class); - } catch (IOException e) { - throw new TextException(e); - } - } - - @Override - public JsonNode readData(DataInput dataInput) throws IOException { - if (!dataInput.readBoolean()) { - return null; - } else { - return parse(dataInput.readUTF()); - } - } - - @Override - public void writeData(DataOutput dataOutput, JsonNode value) throws IOException { - if (value == null) { - dataOutput.writeBoolean(false); - } else { - dataOutput.writeBoolean(true); - dataOutput.writeUTF(format(value)); - } - } - - @Override - public void jsonWrite(JsonGenerator writer, JsonNode value) throws IOException { - objectMapper.writeTree(writer, value); - } - - @Override - public JsonNode jsonRead(JsonParser parser) throws IOException { - return objectMapper.readValue(parser, JsonNode.class); - } - - @Override - public DocPropertyType docType() { - return DocPropertyType.OBJECT; - } - -} diff --git a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java deleted file mode 100644 index c78a69b2b6..0000000000 --- a/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java +++ /dev/null @@ -1,50 +0,0 @@ -package io.ebean.jackson.jsonnode; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.config.dbplatform.DbPlatformType; -import io.ebean.core.type.DataBinder; -import io.ebean.core.type.PostgresHelper; - -import java.sql.SQLException; - -/** - * Support for mapping JsonNode to Postgres DB types JSON and JSONB. - */ -abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode { - - final ObjectMapper objectMapper; - final String postgresType; - - ScalarTypeJsonNodePostgres(ObjectMapper objectMapper, int jdbcType, String postgresType) { - super(objectMapper, jdbcType); - this.objectMapper = objectMapper; - this.postgresType = postgresType; - } - - @Override - public void bind(DataBinder binder, JsonNode value) throws SQLException { - String rawJson = (value == null) ? null : formatValue(value); - binder.setObject(PostgresHelper.asObject(postgresType, rawJson)); - } - - /** - * ScalarType mapping JsonNode to Postgres JSON database type. - */ - static final class JSON extends ScalarTypeJsonNodePostgres { - - public JSON(ObjectMapper objectMapper) { - super(objectMapper, DbPlatformType.JSON, PostgresHelper.JSON_TYPE); - } - } - - /** - * ScalarType mapping JsonNode to Postgres JSONB database type. - */ - static final class JSONB extends ScalarTypeJsonNodePostgres { - - public JSONB(ObjectMapper objectMapper) { - super(objectMapper, DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE); - } - } -} diff --git a/ebean-jackson-jsonnode/src/main/java/module-info.java b/ebean-jackson-jsonnode/src/main/java/module-info.java deleted file mode 100644 index 84fc029738..0000000000 --- a/ebean-jackson-jsonnode/src/main/java/module-info.java +++ /dev/null @@ -1,10 +0,0 @@ -import io.ebean.jackson.jsonnode.JsonNodeTypeFactory; - -module io.ebean.jackson.jsonnode { - - requires io.ebean.core.type; - requires com.fasterxml.jackson.core; - requires com.fasterxml.jackson.databind; - - provides io.ebean.core.type.ScalarTypeSetFactory with JsonNodeTypeFactory; -} diff --git a/ebean-jackson-jsonnode/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory b/ebean-jackson-jsonnode/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory deleted file mode 100644 index 3ed48464aa..0000000000 --- a/ebean-jackson-jsonnode/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory +++ /dev/null @@ -1 +0,0 @@ -io.ebean.jackson.jsonnode.JsonNodeTypeFactory diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml deleted file mode 100644 index abaa8f3728..0000000000 --- a/ebean-joda-time/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - ebean-parent - io.ebean - 13.18.0 - - 4.0.0 - - ebean-joda-time - - - - - io.ebean - ebean-core-type - 13.18.0 - provided - - - - joda-time - joda-time - 2.11.1 - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - io.avaje - junit - 1.1 - test - - - - diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java deleted file mode 100644 index c4883368e4..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.ebean.joda.time; - -import io.ebean.config.DatabaseConfig; -import io.ebean.core.type.ExtraTypeFactory; -import io.ebean.core.type.ScalarType; - -import java.util.ArrayList; -import java.util.List; - -/** - * Register the Joda-Time ScalarType support. - */ -public class JodaExtraTypeFactory implements ExtraTypeFactory { - - @Override - public List> createTypes(DatabaseConfig config, Object objectMapper) { - var jsonDateTime = config.getJsonDateTime(); - var jsonDate = config.getJsonDate(); - - List> types = new ArrayList<>(); - types.add(new ScalarTypeJodaLocalDateTime(jsonDateTime)); - types.add(new ScalarTypeJodaDateTime(jsonDateTime)); - if (config.getDatabasePlatform().supportsNativeJavaTime()) { - types.add(new ScalarTypeJodaLocalDateNative(jsonDate)); - } else { - types.add(new ScalarTypeJodaLocalDate(jsonDate)); - } - types.add(new ScalarTypeJodaDateMidnight(jsonDate)); - types.add(new ScalarTypeJodaPeriod()); - String jodaLocalTimeMode = config.getJodaLocalTimeMode(); - if ("normal".equalsIgnoreCase(jodaLocalTimeMode)) { - // use the expected/normal local time zone - types.add(new ScalarTypeJodaLocalTime()); - } else if ("utc".equalsIgnoreCase(jodaLocalTimeMode)) { - // use the old UTC based - types.add(new ScalarTypeJodaLocalTimeUTC()); - } - return types; - } -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java deleted file mode 100644 index 61f71869b1..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.ebean.joda.time; - -import io.ebean.config.JsonConfig; -import io.ebean.core.type.ScalarTypeBaseDate; -import io.ebean.core.type.BasicTypeConverter; -import org.joda.time.DateMidnight; - -import java.sql.Date; -import java.sql.Types; - -/** - * ScalarType for Joda DateMidnight. This maps to a JDBC Date. - */ -@SuppressWarnings("deprecation") -final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate { - - /** - * Instantiates a new scalar type joda date midnight. - */ - ScalarTypeJodaDateMidnight(JsonConfig.Date mode) { - super(mode, org.joda.time.DateMidnight.class, false, Types.DATE); - } - - @Override - protected String toIsoFormat(DateMidnight value) { - return value.toLocalDate().toString(); - } - - @Override - public long convertToMillis(org.joda.time.DateMidnight value) { - return value.getMillis(); - } - - @Override - public org.joda.time.DateMidnight convertFromDate(Date ts) { - return new org.joda.time.DateMidnight(ts.getTime()); - } - - @Override - public Date convertToDate(org.joda.time.DateMidnight t) { - return new Date(t.getMillis()); - } - - @Override - public Object toJdbcType(Object value) { - if (value instanceof org.joda.time.DateMidnight) { - return new Date(((org.joda.time.DateMidnight) value).getMillis()); - } - return BasicTypeConverter.toDate(value); - } - - @Override - public org.joda.time.DateMidnight toBeanType(Object value) { - if (value instanceof java.util.Date) { - return new org.joda.time.DateMidnight(((java.util.Date) value).getTime()); - } - return (org.joda.time.DateMidnight) value; - } -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateTime.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateTime.java deleted file mode 100644 index 594795f2bc..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateTime.java +++ /dev/null @@ -1,72 +0,0 @@ -package io.ebean.joda.time; - -import io.ebean.config.JsonConfig; -import io.ebean.core.type.ScalarTypeBaseDateTime; -import io.ebean.core.type.BasicTypeConverter; -import org.joda.time.DateTime; - -import java.sql.Timestamp; -import java.sql.Types; -import java.time.Instant; - -/** - * ScalarType for Joda DateTime. This maps to a JDBC Timestamp. - */ -final class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime { - - ScalarTypeJodaDateTime(JsonConfig.DateTime mode) { - super(mode, DateTime.class, false, Types.TIMESTAMP); - } - - @Override - public long convertToMillis(DateTime value) { - return value.getMillis(); - } - - @Override - protected String toJsonNanos(DateTime value) { - return String.valueOf(value.toDateTime().getMillis()); - } - - @Override - protected String toJsonISO8601(DateTime value) { - return value.toString(); - } - - @Override - public DateTime convertFromMillis(long systemTimeMillis) { - return new DateTime(systemTimeMillis); - } - - @Override - public DateTime convertFromTimestamp(Timestamp ts) { - return new DateTime(ts.getTime()); - } - - @Override - public DateTime convertFromInstant(Instant ts) { - return new DateTime(ts.toEpochMilli()); - } - - @Override - public Timestamp convertToTimestamp(DateTime t) { - return new Timestamp(t.getMillis()); - } - - @Override - public Object toJdbcType(Object value) { - if (value instanceof DateTime) { - return new Timestamp(((DateTime) value).getMillis()); - } - return BasicTypeConverter.toTimestamp(value); - } - - @Override - public DateTime toBeanType(Object value) { - if (value instanceof java.util.Date) { - return new DateTime(((java.util.Date) value).getTime()); - } - return (DateTime) value; - } - -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDate.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDate.java deleted file mode 100644 index fa10d20e99..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDate.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.ebean.joda.time; - -import java.sql.Date; -import java.sql.Types; - -import io.ebean.core.type.ScalarTypeBaseDate; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalDate; - -import io.ebean.config.JsonConfig; -import io.ebean.core.type.BasicTypeConverter; - -/** - * ScalarType for Joda LocalDate. This maps to a JDBC Date. - */ -class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate { - - ScalarTypeJodaLocalDate(JsonConfig.Date mode) { - super(mode, LocalDate.class, false, Types.DATE); - } - - @Override - protected String toIsoFormat(LocalDate value) { - return value.toString(); - } - - @Override - public LocalDate convertFromMillis(long systemTimeMillis) { - return new LocalDate(systemTimeMillis); - } - - @Override - public long convertToMillis(LocalDate value) { - return value.toDateTimeAtStartOfDay(DateTimeZone.UTC).getMillis(); - } - - @Override - public LocalDate convertFromDate(Date date) { - return LocalDate.fromDateFields(date); - } - - @SuppressWarnings("deprecation") - @Override - public Date convertToDate(LocalDate value) { - return new Date(value.getYear() - 1900, value.getMonthOfYear() - 1, value.getDayOfMonth()); - } - - @Override - public Object toJdbcType(Object value) { - if (value instanceof LocalDate) { - return convertToDate((LocalDate) value); - } - return BasicTypeConverter.toDate(value); - } - - @Override - public LocalDate toBeanType(Object value) { - if (value instanceof java.util.Date) { - return LocalDate.fromDateFields((java.util.Date) value); - } - return (LocalDate) value; - } -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateNative.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateNative.java deleted file mode 100644 index b25a9609fe..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateNative.java +++ /dev/null @@ -1,35 +0,0 @@ -package io.ebean.joda.time; - -import java.sql.SQLException; -import java.sql.Types; - -import org.joda.time.LocalDate; - -import io.ebean.config.JsonConfig; -import io.ebean.core.type.DataBinder; -import io.ebean.core.type.DataReader; - -/** - * ScalarType for Joda LocalDate. This maps to a LocalDate. Not all drivers/platforms may support this. - */ -final class ScalarTypeJodaLocalDateNative extends ScalarTypeJodaLocalDate{ - - ScalarTypeJodaLocalDateNative(JsonConfig.Date mode) { - super(mode); - } - - @Override - public void bind(DataBinder binder, LocalDate value) throws SQLException { - if (value == null) { - binder.setNull(Types.DATE); - } else { - binder.setObject(java.time.LocalDate.of(value.getYear(), value.getMonthOfYear(), value.getDayOfMonth())); - } - } - - @Override - public LocalDate read(DataReader reader) throws SQLException { - java.time.LocalDate jtDate = reader.getObject(java.time.LocalDate.class); - return jtDate == null ? null : new org.joda.time.LocalDate(jtDate.getYear(), jtDate.getMonthValue(), jtDate.getDayOfMonth()); - } -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java deleted file mode 100644 index 787c5dd83e..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java +++ /dev/null @@ -1,77 +0,0 @@ -package io.ebean.joda.time; - -import io.ebean.config.JsonConfig; -import io.ebean.core.type.ScalarTypeBaseDateTime; -import io.ebean.core.type.BasicTypeConverter; -import org.joda.time.LocalDateTime; - -import java.sql.Timestamp; -import java.sql.Types; -import java.time.Instant; - -/** - * ScalarType for Joda LocalDateTime. This maps to a JDBC Timestamp. - */ -final class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime { - - ScalarTypeJodaLocalDateTime(JsonConfig.DateTime mode) { - super(mode, LocalDateTime.class, false, Types.TIMESTAMP); - } - - @Override - protected String toJsonNanos(LocalDateTime value) { - return String.valueOf(value.toDateTime().getMillis()); - } - - @Override - protected String toJsonISO8601(LocalDateTime value) { - return value.toString(); - } - - @Override - protected LocalDateTime fromJsonISO8601(String value) { - return LocalDateTime.parse(value); - } - - @Override - public long convertToMillis(LocalDateTime value) { - return value.toDateTime().getMillis(); - } - - @Override - public LocalDateTime convertFromMillis(long systemTimeMillis) { - return new LocalDateTime(systemTimeMillis); - } - - @Override - public LocalDateTime convertFromTimestamp(Timestamp ts) { - return new LocalDateTime(ts.getTime()); - } - - @Override - public LocalDateTime convertFromInstant(Instant ts) { - return new LocalDateTime(ts.toEpochMilli()); - } - - @Override - public Timestamp convertToTimestamp(LocalDateTime t) { - return new Timestamp(t.toDateTime().getMillis()); - } - - @Override - public Object toJdbcType(Object value) { - if (value instanceof LocalDateTime) { - return new Timestamp(((LocalDateTime) value).toDateTime().getMillis()); - } - return BasicTypeConverter.toTimestamp(value); - } - - @Override - public LocalDateTime toBeanType(Object value) { - if (value instanceof java.util.Date) { - return new LocalDateTime(((java.util.Date) value).getTime()); - } - return (LocalDateTime) value; - } - -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTime.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTime.java deleted file mode 100644 index 9e62b683ad..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTime.java +++ /dev/null @@ -1,118 +0,0 @@ -package io.ebean.joda.time; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import io.ebean.core.type.DataBinder; -import io.ebean.core.type.DataReader; -import io.ebean.core.type.DocPropertyType; -import io.ebean.core.type.ScalarTypeBase; -import io.ebean.core.type.BasicTypeConverter; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalTime; - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.sql.SQLException; -import java.sql.Time; -import java.sql.Types; - -/** - * ScalarType for Joda LocalTime. This maps to a JDBC Time. - */ -class ScalarTypeJodaLocalTime extends ScalarTypeBase { - - ScalarTypeJodaLocalTime() { - super(LocalTime.class, false, Types.TIME); - } - - @Override - public void bind(DataBinder binder, LocalTime value) throws SQLException { - if (value == null) { - binder.setNull(Types.TIME); - } else { - binder.setTime(new Time(value.toDateTimeToday().getMillis())); - } - } - - @Override - public LocalTime read(DataReader reader) throws SQLException { - Time sqlTime = reader.getTime(); - if (sqlTime == null) { - return null; - } else { - return new LocalTime(sqlTime, DateTimeZone.getDefault()); - } - } - - @Override - public Object toJdbcType(Object value) { - if (value instanceof LocalTime) { - LocalTime lt = (LocalTime) value; - return new Time(lt.toDateTimeToday().getMillis()); - } - return BasicTypeConverter.toTime(value); - } - - @Override - public LocalTime toBeanType(Object value) { - if (value instanceof java.util.Date) { - return new LocalTime(value, DateTimeZone.getDefault()); - } - return (LocalTime) value; - } - - @Override - public String formatValue(LocalTime v) { - return v.toString(); - } - - @Override - public LocalTime parse(String value) { - return new LocalTime(value); - } - - public LocalTime convertFromMillis(long systemTimeMillis) { - return new LocalTime(systemTimeMillis, DateTimeZone.getDefault()); - } - - @Override - public LocalTime readData(DataInput dataInput) throws IOException { - if (!dataInput.readBoolean()) { - return null; - } else { - String val = dataInput.readUTF(); - return parse(val); - } - } - - @Override - public void writeData(DataOutput dataOutput, LocalTime value) throws IOException { - if (value == null) { - dataOutput.writeBoolean(false); - } else { - dataOutput.writeBoolean(true); - dataOutput.writeUTF(format(value)); - } - } - - @Override - public void jsonWrite(JsonGenerator writer, LocalTime value) throws IOException { - writer.writeString(value.toString()); - } - - @Override - public LocalTime jsonRead(JsonParser parser) throws IOException { - if (JsonToken.VALUE_NUMBER_INT == parser.getCurrentToken()) { - return convertFromMillis(parser.getLongValue()); - } else { - return parse(parser.getValueAsString()); - } - } - - @Override - public DocPropertyType docType() { - return DocPropertyType.KEYWORD; - } -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeUTC.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeUTC.java deleted file mode 100644 index 163c1f7ec0..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeUTC.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.ebean.joda.time; - -import io.ebean.core.type.DataBinder; -import io.ebean.core.type.DataReader; -import io.ebean.core.type.BasicTypeConverter; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalTime; - -import java.sql.SQLException; -import java.sql.Time; -import java.sql.Types; - -/** - * ScalarType for Joda LocalTime. This maps to a JDBC Time. - */ -final class ScalarTypeJodaLocalTimeUTC extends ScalarTypeJodaLocalTime { - - ScalarTypeJodaLocalTimeUTC() { - super(); - } - - @Override - public void bind(DataBinder binder, LocalTime value) throws SQLException { - if (value == null) { - binder.setNull(Types.TIME); - } else { - Time sqlTime = new Time(value.getMillisOfDay()); - binder.setTime(sqlTime); - } - } - - @Override - public LocalTime read(DataReader reader) throws SQLException { - Time sqlTime = reader.getTime(); - if (sqlTime == null) { - return null; - } else { - return new LocalTime(sqlTime, DateTimeZone.UTC); - } - } - - @Override - public Object toJdbcType(Object value) { - if (value instanceof LocalTime) { - return new Time(((LocalTime) value).getMillisOfDay()); - } - return BasicTypeConverter.toTime(value); - } - - @Override - public LocalTime toBeanType(Object value) { - if (value instanceof java.util.Date) { - return new LocalTime(value, DateTimeZone.UTC); - } - return (LocalTime) value; - } - - @Override - public LocalTime convertFromMillis(long systemTimeMillis) { - return new LocalTime(systemTimeMillis); - } - -} diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaPeriod.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaPeriod.java deleted file mode 100644 index 27914fc1c0..0000000000 --- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaPeriod.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.ebean.joda.time; - -import io.ebean.core.type.ScalarTypeBaseVarchar; -import org.joda.time.Period; - -/** - * ScalarType for Joda Period stored as DB VARCHAR - */ -final class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar { - - ScalarTypeJodaPeriod() { - super(Period.class); - } - - @Override - public int length() { - return 50; - } - - @Override - public String formatValue(Period v) { - return v.toString(); - } - - @Override - public Period parse(String value) { - return Period.parse(value); - } - - @Override - public Period convertFromDbString(String dbValue) { - return Period.parse(dbValue); - } - - @Override - public String convertToDbString(Period beanValue) { - return beanValue.toString(); - } - -} diff --git a/ebean-joda-time/src/main/java/module-info.java b/ebean-joda-time/src/main/java/module-info.java deleted file mode 100644 index 941aeb4bdd..0000000000 --- a/ebean-joda-time/src/main/java/module-info.java +++ /dev/null @@ -1,9 +0,0 @@ - -module io.ebean.joda.time { - - requires io.ebean.core.type; - requires org.joda.time; - requires com.fasterxml.jackson.core; - - provides io.ebean.core.type.ExtraTypeFactory with io.ebean.joda.time.JodaExtraTypeFactory; -} diff --git a/ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory b/ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory deleted file mode 100644 index 3f23de83c3..0000000000 --- a/ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory +++ /dev/null @@ -1 +0,0 @@ -io.ebean.joda.time.JodaExtraTypeFactory diff --git a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaDateMidnightTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaDateMidnightTest.java deleted file mode 100644 index ddc3f82965..0000000000 --- a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaDateMidnightTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.ebean.joda.time; - -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import io.ebean.config.JsonConfig; -import org.joda.time.DateMidnight; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.io.StringReader; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -class ScalarTypeJodaDateMidnightTest { - - ScalarTypeJodaDateMidnight type = new ScalarTypeJodaDateMidnight(JsonConfig.Date.ISO8601); - JsonFactory jsonFactory = new JsonFactory(); - - @Test - void testIsoFormat() throws IOException { - // long millis = 1674472451640L; - JsonParser parser = jsonFactory.createParser(new StringReader("\"2023-01-23\"")); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.VALUE_STRING, token); - DateMidnight dm = type.jsonRead(parser); - String iso = type.toIsoFormat(dm); - assertEquals("2023-01-23", iso); - } -} diff --git a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTest.java deleted file mode 100644 index 94ad4f8559..0000000000 --- a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package io.ebean.joda.time; - -import io.ebean.config.JsonConfig; -import org.joda.time.LocalDate; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.sql.Date; -import java.util.TimeZone; - -import static org.assertj.core.api.Assertions.assertThat; - - -public class ScalarTypeJodaLocalDateTest { - - private ScalarTypeJodaLocalDate type = new ScalarTypeJodaLocalDate(JsonConfig.Date.MILLIS); - - @Test - public void convertToMillis_convertFromMillis() { - - LocalDate localDate = new LocalDate(); - long millis = type.convertToMillis(localDate); - LocalDate localDate1 = type.convertFromMillis(millis); - - assertThat(localDate).isEqualTo(localDate1); - } - - @Test - public void convertToDate_convertFromDate_westOfUtc() { - final TimeZone originaDefaultTimezone = TimeZone.getDefault(); - try { - TimeZone.setDefault(TimeZone.getTimeZone("America/Chicago")); - - convertDate(new LocalDate()); - convertDate(new LocalDate(1899, 12, 1)); - convertDate(new LocalDate(1900, 1, 1)); - convertDate(new LocalDate(2021, 2, 8)); - - } finally { - TimeZone.setDefault(originaDefaultTimezone); - } - } - - @Test - public void convertToDate_convertFromDate() { - - convertDate(new LocalDate()); - convertDate(new LocalDate(1899, 12, 1)); - convertDate(new LocalDate(1900, 1, 1)); - convertDate(new LocalDate(2021, 2, 8)); - } - - private void convertDate(LocalDate localDate) { - - Date dateValue = type.convertToDate(localDate); - LocalDate localDate1 = type.convertFromDate(dateValue); - - assertThat(localDate).isEqualTo(localDate1); - } - - @Test - public void toJdbcType() { - - LocalDate localDate = new LocalDate(); - Object jdbcType = type.toJdbcType(localDate); - Date dateValue = type.convertToDate(localDate); - - assertThat(jdbcType).isEqualTo(dateValue); - } - - @Test - public void toBeanType() { - - LocalDate localDate = new LocalDate(); - Date dateValue = type.convertToDate(localDate); - LocalDate beanType = type.toBeanType(dateValue); - - assertThat(beanType).isEqualTo(localDate); - } - - -} diff --git a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTimeTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTimeTest.java deleted file mode 100644 index 9f4c6e86bc..0000000000 --- a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTimeTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.ebean.joda.time; - -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import io.ebean.config.JsonConfig; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalDateTime; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.io.StringReader; -import java.sql.Timestamp; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -class ScalarTypeJodaLocalDateTimeTest { - - ScalarTypeJodaLocalDateTime type = new ScalarTypeJodaLocalDateTime(JsonConfig.DateTime.ISO8601); - JsonFactory jsonFactory = new JsonFactory(); - - @Test - void testIsoFormat() throws IOException { - JsonParser parser = jsonFactory.createParser(new StringReader("\"2023-01-23T12:14:11.640\"")); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.VALUE_STRING, token); - - LocalDateTime ldt1 = type.jsonRead(parser); - String iso = type.toJsonISO8601(ldt1); - assertEquals("2023-01-23T12:14:11.640", iso); - } - - @Test - void testConvertFromTimestamp() { - long now = System.currentTimeMillis(); - Timestamp nowTs = new Timestamp(now); - - LocalDateTime ldt1 = type.convertFromTimestamp(nowTs); - LocalDateTime ldt2 = localConvertFromTimestamp(nowTs); - - assertEquals(ldt1, ldt2); - - Timestamp ts1 = type.convertToTimestamp(ldt1); - Timestamp ts2 = localConvertToTimestamp(ldt2); - - assertEquals(ts1, ts2); - } - - LocalDateTime localConvertFromTimestamp(Timestamp ts) { - return new LocalDateTime(ts.getTime(), DateTimeZone.getDefault()); - } - - Timestamp localConvertToTimestamp(LocalDateTime t) { - return new Timestamp(t.toDateTime(DateTimeZone.getDefault()).getMillis()); - } - -} diff --git a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeTest.java deleted file mode 100644 index 9e8b9f1617..0000000000 --- a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package io.ebean.joda.time; - -import org.joda.time.DateTimeZone; -import org.joda.time.LocalDateTime; -import org.joda.time.LocalTime; -import org.junit.jupiter.api.Test; - -import java.sql.Timestamp; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class ScalarTypeJodaLocalTimeTest { - - ScalarTypeJodaLocalTime type = new ScalarTypeJodaLocalTime(); - - @Test - public void toJdbcType_toBeanType() { - - LocalTime localTime0 = new LocalTime().withMillisOfSecond(0); - Object time = type.toJdbcType(localTime0); - LocalTime localTime1 = type.toBeanType(time); - - assertThat(localTime0).isEqualTo(localTime1); - } - - @Test - public void test() { - - long now = System.currentTimeMillis(); - - //DateTimeZone timeZone = DateTimeZone.getDefault(); - //ISOChronology instance = ISOChronology.getInstance(); - - LocalDateTime ldt1 = new LocalDateTime(now, DateTimeZone.getDefault()); - LocalDateTime ldt2 = new LocalDateTime(now); - - assertEquals(ldt1, ldt2); - - Timestamp ts1 = new Timestamp(ldt1.toDateTime(DateTimeZone.getDefault()).getMillis()); - Timestamp ts2 = new Timestamp(ldt2.toDateTime().getMillis()); - - assertEquals(ts1, ts2); - - } - - -} diff --git a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaPeriodTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaPeriodTest.java deleted file mode 100644 index 12f1f3496a..0000000000 --- a/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaPeriodTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.ebean.joda.time; - -import org.joda.time.Period; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -public class ScalarTypeJodaPeriodTest { - - private ScalarTypeJodaPeriod scalarType = new ScalarTypeJodaPeriod(); - - @Test - public void getLength() { - assertThat(scalarType.length()).isEqualTo(50); - } - - @Test - public void formatAndParse() { - - Period original = Period.years(1).plusMonths(2).plusDays(4) - .plusHours(12).plusMinutes(19).plusSeconds(20); - - String value = scalarType.formatValue(original); - assertThat(value).isEqualTo("P1Y2M4DT12H19M20S"); - - Period period = scalarType.parse(value); - assertThat(period).isEqualTo(original); - } - - - @Test - public void convertFromDbString() { - - Period original = Period.years(1).plusMonths(2).plusDays(4) - .plusHours(23).plusMinutes(19).plusSeconds(20).plusMillis(987); - - String stringVal = scalarType.convertToDbString(original); - Period period = scalarType.convertFromDbString(stringVal); - - assertThat(period).isEqualTo(original); - } - -} diff --git a/pom.xml b/pom.xml index 9e2ec85d36..ddd9a58a30 100644 --- a/pom.xml +++ b/pom.xml @@ -81,9 +81,6 @@ ebean-core-type ebean-core ebean-ddl-generator - ebean-autotune - ebean-externalmapping-api - ebean-externalmapping-xml ebean-test querybean-generator kotlin-querybean-generator @@ -92,9 +89,6 @@ ebean-redis platforms composites - ebean-joda-time - ebean-csv-reader - ebean-jackson-jsonnode ebean-jackson-mapper ebean-spring-txn From 510e129ff66e780008f834b7e3d8b86d265009e7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 19:22:16 +1200 Subject: [PATCH 007/161] Remove unused and empty ebean-kotlin module It never got used, may as well clean up and remove it. --- ebean-kotlin/pom.xml | 103 ------------------ .../kotlin/org/example/domain/FooEntity.kt | 18 --- .../org/example/domain/FooEntityTest.kt | 21 ---- .../src/test/resources/application-test.yaml | 4 - pom.xml | 1 - 5 files changed, 147 deletions(-) delete mode 100644 ebean-kotlin/pom.xml delete mode 100644 ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt delete mode 100644 ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt delete mode 100644 ebean-kotlin/src/test/resources/application-test.yaml diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml deleted file mode 100644 index 8a076c9aa0..0000000000 --- a/ebean-kotlin/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 13.18.0 - - - ebean-kotlin - - - 1.8 - 1.8 - 1.6.0 - - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - provided - - - - io.ebean - ebean-core - 13.18.0 - provided - - - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - - io.avaje - junit - 1.1 - test - - - - io.ebean - ebean-test - 13.18.0 - test - - - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - 1.8 - - - - compile - - compile - - - - test-compile - - test-compile - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.34 - true - - - io.ebean.tile:enhancement:13.17.1 - - - - - - - - diff --git a/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt b/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt deleted file mode 100644 index f1bc6d7534..0000000000 --- a/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.example.domain - -import io.ebean.Model -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Version - -@Entity -class FooEntity(name: String) : Model() { - - @Id - var id: Long = 0 - - var name: String = name - - @Version - var version: Long = 0 -} diff --git a/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt b/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt deleted file mode 100644 index ef94f3b48c..0000000000 --- a/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -package org.example.domain - -import io.ebean.DB -import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Test - -class FooEntityTest { - - @Test - fun iud() { - - val foo = FooEntity("hello") - foo.save() - - val found = DB.find(FooEntity::class.java, foo.id) - assertThat(found).isNotNull - - found?.delete() - - } -} diff --git a/ebean-kotlin/src/test/resources/application-test.yaml b/ebean-kotlin/src/test/resources/application-test.yaml deleted file mode 100644 index 310638fcbb..0000000000 --- a/ebean-kotlin/src/test/resources/application-test.yaml +++ /dev/null @@ -1,4 +0,0 @@ -ebean: - test: - platform: h2 - diff --git a/pom.xml b/pom.xml index ddd9a58a30..a9c938511d 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,6 @@ composites ebean-jackson-mapper ebean-spring-txn - From 5ae9942dd5f5034bc7ad8f7afe3c1938da8eb41f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 19:26:17 +1200 Subject: [PATCH 008/161] Remove unused and empty ebean-kotlin module It never got used, may as well clean up and remove it. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index a9c938511d..915466d9c8 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,6 @@ true - ebean-kotlin tests From 15de44eef8a1c1fd1e5b2a47ecdd014fe983033f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 19:35:03 +1200 Subject: [PATCH 009/161] Remove deprecated MetaInfoManager.collectMetricsAsJson() - move to collectMetrics().asJson() Removing these deprecated methods: - collectMetricsAsJson() -> collectMetrics().asJson(); - collectMetricsAsData() -> collectMetrics().asData() ```java /** * Deprecated migrate to collectMetrics().asJson(). */ @Deprecated default ServerMetricsAsJson collectMetricsAsJson() { return collectMetrics().asJson(); } /** * Deprecated migrate to collectMetrics().asData(). */ @Deprecated default List collectMetricsAsData() { return collectMetrics().asData(); } ``` --- .../main/java/io/ebean/meta/MetaInfoManager.java | 16 ---------------- .../tests/query/finder/TestCustomerFinder.java | 12 ++++++------ 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java b/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java index 81e7944f04..1052d495ce 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java @@ -16,22 +16,6 @@ public interface MetaInfoManager { */ ServerMetrics collectMetrics(); - /** - * Deprecated migrate to collectMetrics().asJson(). - */ - @Deprecated - default ServerMetricsAsJson collectMetricsAsJson() { - return collectMetrics().asJson(); - } - - /** - * Deprecated migrate to collectMetrics().asData(). - */ - @Deprecated - default List collectMetricsAsData() { - return collectMetrics().asData(); - } - /** * Visit the metrics resetting and collecting/reporting as desired. */ diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 9722adf177..5da4bac4e7 100644 --- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -28,7 +28,7 @@ public void a_runFirst_metricsAsJson_sqlInInitialCollectionOnly() { StringBuilder buffer0 = new StringBuilder(); DB.getDefault().metaInfo() - .collectMetricsAsJson() + .collectMetrics().asJson() .withHeader(false) .write(buffer0); @@ -42,7 +42,7 @@ public void a_runFirst_metricsAsJson_sqlInInitialCollectionOnly() { StringBuilder buffer1 = new StringBuilder(); DB.getDefault().metaInfo() - .collectMetricsAsJson() + .collectMetrics().asJson() .withHeader(false) .write(buffer1); @@ -230,7 +230,7 @@ public void test_metricsAsJson_withAll() { runQueries(); String metricsJson = server().metaInfo() - .collectMetricsAsJson() + .collectMetrics().asJson() .withHash(true) .withExtraAttributes(true) .withNewLine(true) @@ -254,7 +254,7 @@ public void test_metricsAsJson_minimal() { runQueries(); String metricsJson = server().metaInfo() - .collectMetricsAsJson() + .collectMetrics().asJson() .withHash(false) .withExtraAttributes(false) .withNewLine(false) @@ -277,7 +277,7 @@ public void test_metricsAsJson_write() { StringBuilder buffer = new StringBuilder(); server().metaInfo() - .collectMetricsAsJson() + .collectMetrics().asJson() .withHeader(false) .write(buffer); @@ -295,7 +295,7 @@ public void test_metricsAsJson_writeWithHeader() { StringBuilder buffer = new StringBuilder(); server().metaInfo() - .collectMetricsAsJson() + .collectMetrics().asJson() .withHeader(true) .write(buffer); From 4878ca47b5979d74cf70a8fd0ad06c101fd39bba Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 19:45:17 +1200 Subject: [PATCH 010/161] Remove deprecated ExtendedServer query methods - use query.usingTransaction() instead Removing all the deprecated query methods from ExtendedServer. Migrate to passing the explicit transaction to the query using query.usingTransaction() instead. --- .../main/java/io/ebean/ExtendedServer.java | 167 ------------------ .../io/ebeaninternal/api/SpiEbeanServer.java | 136 ++++++++++++++ .../ebean/xtest/base/ExtendedServerTest.java | 2 +- 3 files changed, 137 insertions(+), 168 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java index db8c6d9f5b..1c1a682899 100644 --- a/ebean-api/src/main/java/io/ebean/ExtendedServer.java +++ b/ebean-api/src/main/java/io/ebean/ExtendedServer.java @@ -1,15 +1,6 @@ package io.ebean; -import io.avaje.lang.Nullable; - import java.time.Clock; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.stream.Stream; /** * The extended API for Database. @@ -35,162 +26,4 @@ public interface ExtendedServer { @Deprecated void setClock(Clock clock); - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - boolean exists(Query ormQuery, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - int findCount(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - List findIds(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - QueryIterator findIterate(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - Stream findStream(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - void findEach(Query query, Consumer consumer, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - void findEach(Query query, int batch, Consumer> consumer, Transaction t); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - void findEachWhile(Query query, Predicate consumer, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - List> findVersions(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - List findList(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - FutureRowCount findFutureCount(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - FutureIds findFutureIds(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - FutureList findFutureList(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - PagedList findPagedList(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - Set findSet(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - Map findMap(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - List findSingleAttributeList(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - Set findSingleAttributeSet(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - @Nullable - T findOne(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - Optional findOneOrEmpty(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - int delete(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - int update(Query query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - List findList(SqlQuery query, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - void findEach(SqlQuery query, Consumer consumer, Transaction transaction); - - /** - * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. - */ - @Deprecated - void findEachWhile(SqlQuery query, Predicate consumer, Transaction transaction); - - /** - * Deprecated migrate to using {@link SqlQuery#usingTransaction(Transaction)}. - */ - @Deprecated - @Nullable - SqlRow findOne(SqlQuery query, Transaction transaction); - } 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 2111be2be4..cac3c874f4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -16,6 +16,9 @@ import io.ebeaninternal.server.transaction.RemoteTransactionEvent; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Stream; @@ -317,4 +320,137 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio * Create a query bind capture for the given query plan. */ SpiQueryBindCapture createQueryBindCapture(SpiQueryPlan queryPlan); + + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + boolean exists(Query ormQuery, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + int findCount(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + List findIds(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + QueryIterator findIterate(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + Stream findStream(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + void findEach(Query query, Consumer consumer, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + void findEach(Query query, int batch, Consumer> consumer, Transaction t); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + void findEachWhile(Query query, Predicate consumer, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + List> findVersions(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + List findList(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + FutureRowCount findFutureCount(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + FutureIds findFutureIds(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + FutureList findFutureList(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + PagedList findPagedList(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + Set findSet(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + Map findMap(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + List findSingleAttributeList(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + Set findSingleAttributeSet(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + @Nullable + T findOne(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + Optional findOneOrEmpty(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + int delete(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + int update(Query query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + List findList(SqlQuery query, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + void findEach(SqlQuery query, Consumer consumer, Transaction transaction); + + /** + * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}. + */ + void findEachWhile(SqlQuery query, Predicate consumer, Transaction transaction); + + /** + * Deprecated migrate to using {@link SqlQuery#usingTransaction(Transaction)}. + */ + @Nullable + SqlRow findOne(SqlQuery query, Transaction transaction); } diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java index c0ccdfb9b6..d29b524016 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java @@ -44,7 +44,7 @@ public void findList() { // obtain extended API ... such that we can execute the // query using an explicit transaction - List customers = server.extended().findList(query, transaction); + List customers = query.usingTransaction(transaction).findList(); assertThat(customers).isNotEmpty(); transaction.commit(); From f415ee22b8b2dadbf4fa6eefae68d4483435ef74 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 19:51:31 +1200 Subject: [PATCH 011/161] Update javadoc for ExtendedServer --- ebean-api/src/main/java/io/ebean/ExtendedServer.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java index 1c1a682899..baa003edeb 100644 --- a/ebean-api/src/main/java/io/ebean/ExtendedServer.java +++ b/ebean-api/src/main/java/io/ebean/ExtendedServer.java @@ -4,14 +4,6 @@ /** * The extended API for Database. - *

- * Deprecated in favour of using {@link Query#usingTransaction(Transaction)} instead. - *

- * This provides the finder methods that take an explicit transaction rather than obtaining - * the transaction from the usual mechanism (which is ThreadLocal based). - *

- * Note that in all cases the transaction supplied can be null and in this case the Database - * will use the normal mechanism to obtain the transaction to use. */ public interface ExtendedServer { From f52a18989cd3d8af402072ca2bfd5fe924efeb34 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 19:54:39 +1200 Subject: [PATCH 012/161] Remove deprecated BeanFinder.server, migrate to BeanFinder.database --- ebean-api/src/main/java/io/ebean/BeanFinder.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/BeanFinder.java b/ebean-api/src/main/java/io/ebean/BeanFinder.java index 62a9bd6f96..f0b8c17ad2 100644 --- a/ebean-api/src/main/java/io/ebean/BeanFinder.java +++ b/ebean-api/src/main/java/io/ebean/BeanFinder.java @@ -33,11 +33,6 @@ @NonNullApi public abstract class BeanFinder { - /** - * Migrate to using database rather than server. - */ - @Deprecated - protected final Database server; protected final Database database; protected final Class type; @@ -50,7 +45,6 @@ public abstract class BeanFinder { protected BeanFinder(Class type, Database database) { this.type = type; this.database = database; - this.server = database; } /** From e5f7a28d80158740b3a21a1cbe688283cafe7c98 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 20:00:50 +1200 Subject: [PATCH 013/161] Remove deprecated methods from ProfileLocation These methods are no longer used. --- .../src/main/java/io/ebean/ProfileLocation.java | 17 ----------------- .../org/tests/profile/ProfileLocationTest.java | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/ProfileLocation.java b/ebean-api/src/main/java/io/ebean/ProfileLocation.java index 20a9a0d571..fa14ea8bda 100644 --- a/ebean-api/src/main/java/io/ebean/ProfileLocation.java +++ b/ebean-api/src/main/java/io/ebean/ProfileLocation.java @@ -30,23 +30,6 @@ static ProfileLocation create(String label) { return XServiceProvider.profileLocationFactory().create(label); } - /** - * Deprecated in favor of {@link #create(String)}. - */ - @Deprecated - static ProfileLocation create(int lineNumber, String label) { - return create(label); - } - - /** - * Deprecated for removal - not used. - * Create and return a new ProfileLocation with a given location. - */ - @Deprecated - static ProfileLocation createAt(String location) { - return XServiceProvider.profileLocationFactory().createAt(location); - } - /** * Obtain the description returning true if this is the initial call. */ diff --git a/ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java b/ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java index 38597e0041..8865acfd9c 100644 --- a/ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java +++ b/ebean-test/src/test/java/org/tests/profile/ProfileLocationTest.java @@ -7,7 +7,7 @@ class ProfileLocationTest { - private static final ProfileLocation loc = ProfileLocation.create(12, "foo"); + private static final ProfileLocation loc = ProfileLocation.create("foo"); private static final ProfileLocation locB = ProfileLocation.create(); private static final ProfileLocation loc2 = ProfileLocation.create(); private static final ProfileLocation locWithLine = ProfileLocation.createWithLine(); From 4c47a84daf7b624ec50ff952929a077aaedbdc43 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 20:09:14 +1200 Subject: [PATCH 014/161] Remove deprecated DatabaseConfig.defaultOrderById Should no longer be used / set to true. ```java /** * Deprecated - look to have explicit order by. Sets the default orderById setting for queries. */ @Deprecated public void setDefaultOrderById(boolean defaultOrderById) { this.defaultOrderById = defaultOrderById; } ``` --- .../java/io/ebean/config/DatabaseConfig.java | 24 ------------------- .../server/querydefn/DefaultOrmQuery.java | 1 - 2 files changed, 25 deletions(-) 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 8c25f20143..8abaf3d131 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -526,11 +526,6 @@ public class DatabaseConfig { private ProfilingConfig profilingConfig = new ProfilingConfig(); - /** - * Controls the default order by id setting of queries. See {@link Query#orderById(boolean)} - */ - private boolean defaultOrderById; - /** * The mappingLocations for searching xml mapping. */ @@ -595,22 +590,6 @@ public void setSlowQueryListener(SlowQueryListener slowQueryListener) { this.slowQueryListener = slowQueryListener; } - - /** - * Deprecated - look to have explicit order by. Sets the default orderById setting for queries. - */ - @Deprecated - public void setDefaultOrderById(boolean defaultOrderById) { - this.defaultOrderById = defaultOrderById; - } - - /** - * Returns the default orderById setting for queries. - */ - public boolean isDefaultOrderById() { - return defaultOrderById; - } - /** * Put a service object into configuration such that it can be used by ebean or a plugin. *

@@ -2327,8 +2306,6 @@ public void setJodaLocalTimeMode(String jodaLocalTimeMode) { *

* If no classes are specified then the classes are found automatically via * searching the class path. - *

- * Alternatively the classes can be added via {@link #setClasses(List)}. * * @param cls the entity type (or other type) that should be registered by this database. */ @@ -2942,7 +2919,6 @@ protected void loadSettings(PropertiesWrapper p) { jdbcFetchSizeFindEach = p.getInt("jdbcFetchSizeFindEach", jdbcFetchSizeFindEach); jdbcFetchSizeFindList = p.getInt("jdbcFetchSizeFindList", jdbcFetchSizeFindList); databasePlatformName = p.get("databasePlatformName", databasePlatformName); - defaultOrderById = p.getBoolean("defaultOrderById", defaultOrderById); uuidVersion = p.getEnum(UuidVersion.class, "uuidVersion", uuidVersion); uuidStateFile = p.get("uuidStateFile", uuidStateFile); 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 45866375d6..e5e6b8e5a6 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 @@ -169,7 +169,6 @@ public DefaultOrmQuery(BeanDescriptor desc, SpiEbeanServer server, Expression this.rootBeanDescriptor = desc; this.beanType = desc.type(); this.server = server; - this.orderById = server.config().isDefaultOrderById(); this.disableLazyLoading = server.config().isDisableLazyLoading(); this.expressionFactory = expressionFactory; this.detail = new OrmQueryDetail(); From f21caa07556758fe9e70b6495368fc64af982aa5 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 20:34:04 +1200 Subject: [PATCH 015/161] Remove deprecated ExpressionList.setOrderBy() - migrate to orderBy() Migrate to `.orderBy(String orderBy)` ```java /** * Deprecated migrate to {@link #orderBy(String)} */ @Deprecated Query setOrderBy(String orderBy); ``` --- ebean-api/src/main/java/io/ebean/ExpressionList.java | 6 ------ .../server/expression/DefaultExpressionList.java | 5 ----- .../ebeaninternal/server/expression/JunctionExpression.java | 5 ----- 3 files changed, 16 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java index 29040fcbae..ec1e36c316 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionList.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java @@ -95,12 +95,6 @@ public interface ExpressionList { */ OrderBy orderBy(); - /** - * Deprecated migrate to {@link #orderBy(String)} - */ - @Deprecated - Query setOrderBy(String orderBy); - /** * Apply the path properties to the query replacing the select and fetch clauses. */ 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 3a015e0faf..fffa19d096 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 @@ -312,11 +312,6 @@ public ExpressionList orderBy(String orderBy) { return this; } - @Override - public Query setOrderBy(String orderBy) { - return query.order(orderBy); - } - @Override public Query orderById(boolean orderById) { return query.orderById(orderById); 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 87d6ae3310..05268588b1 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 @@ -980,11 +980,6 @@ public ExpressionList setMaxRows(int maxRows) { return exprList.setMaxRows(maxRows); } - @Override - public Query setOrderBy(String orderBy) { - return exprList.setOrderBy(orderBy); - } - @Override public Query setUseCache(boolean useCache) { return exprList.setUseCache(useCache); From 430926c5a9116157810b34664dfe3876423f6c92 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 20:44:31 +1200 Subject: [PATCH 016/161] Remove deprecated Query setLoadBeanCache() - migrate to setBeanCacheMode() Typically migrate to `.setBeanCacheMode(CacheMode.PUT)` or `.setBeanCacheMode(CacheMode.OFF)` ```java /** * Deprecated - migrate to use setBeanCacheMode(CacheMode.PUT) or other CacheMode. *

* When set to true all the beans from this query are loaded into the bean cache. */ @Deprecated Query setLoadBeanCache(boolean loadBeanCache); ``` --- ebean-api/src/main/java/io/ebean/Query.java | 8 -------- .../server/query/DefaultFetchGroupQuery.java | 5 ----- .../server/querydefn/DefaultOrmQuery.java | 6 ------ .../src/main/java/io/ebean/typequery/TQRootBean.java | 11 ----------- .../test/java/org/tests/basic/TestLoadBeanCache.java | 5 +++-- 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index ad7a955ee1..195c8948ee 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -1579,14 +1579,6 @@ default Query setUseQueryCache(boolean enabled) { */ Query setReadOnly(boolean readOnly); - /** - * Deprecated - migrate to use setBeanCacheMode(CacheMode.PUT) or other CacheMode. - *

- * When set to true all the beans from this query are loaded into the bean cache. - */ - @Deprecated - Query setLoadBeanCache(boolean loadBeanCache); - /** * Set a timeout on this query. *

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 b4ce3a696c..5775fb6930 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 @@ -500,11 +500,6 @@ public Query setReadOnly(boolean readOnly) { throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); } - @Override - public Query setLoadBeanCache(boolean loadBeanCache) { - throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); - } - @Override public Query setTimeout(int secs) { 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/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index e5e6b8e5a6..1b5dbff220 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 @@ -1276,12 +1276,6 @@ public final Query setUseQueryCache(CacheMode useQueryCache) { return this; } - @Override - public final Query setLoadBeanCache(boolean loadBeanCache) { - this.useBeanCache = loadBeanCache ? CacheMode.PUT : CacheMode.OFF; - return this; - } - @Override public final Query setTimeout(int secs) { this.timeout = secs; 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 847ff86b0b..be8a42c7a3 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -913,17 +913,6 @@ public R setLazyLoadBatchSize(int lazyLoadBatchSize) { return root; } - /** - * Deprecated migrate to setBeanCacheMode() or setUseCache(). - *

- * When set to true all the beans from this query are loaded into the bean cache. - */ - @Deprecated - public R setLoadBeanCache(boolean loadBeanCache) { - query.setLoadBeanCache(loadBeanCache); - return root; - } - /** * Set the property to use as keys for a map. *

diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index 3448e1c2c3..2dea13ede4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -1,5 +1,6 @@ package org.tests.basic; +import io.ebean.CacheMode; import io.ebean.Query; import io.ebean.xtest.BaseTestCase; import io.ebean.DB; @@ -20,7 +21,7 @@ class TestLoadBeanCache extends BaseTestCase { @Test void loadBeanCache_false() { - Query query = DB.find(Country.class).setLoadBeanCache(false); + Query query = DB.find(Country.class).setBeanCacheMode(CacheMode.OFF); SpiQuery spiQuery = (SpiQuery) query; assertThat(spiQuery.isBeanCachePut()).isFalse(); @@ -32,7 +33,7 @@ void testLoad() { ResetBasicData.reset(); Map map = DB.find(Country.class) - .setLoadBeanCache(true) + .setBeanCacheMode(CacheMode.PUT) .setUseQueryCache(true) .setReadOnly(true) .order("name") From bac7cd1ee7cd3569fa82e37e6eedec3ac0d2f017 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 20:48:13 +1200 Subject: [PATCH 017/161] Remove deprecated Query Bean fetchAll() - migrate to fetch() ```java /** * Deprecated in favor of fetch(). */ @Deprecated public final R fetchAll() { return fetch(); } ``` --- .../src/main/java/io/ebean/typequery/TQAssocBean.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java index a60b2f99db..9c56d58524 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java @@ -100,14 +100,6 @@ public final R fetchCache(String properties) { return _root; } - /** - * Deprecated in favor of fetch(). - */ - @Deprecated - public final R fetchAll() { - return fetch(); - } - /** * Eagerly fetch this association loading the specified properties. */ From 6a2d0c233a8590522be3cbdb73a5bf2a01da3e6e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 20:56:13 +1200 Subject: [PATCH 018/161] No functional change, Expr internal reuse of factory() method --- ebean-api/src/main/java/io/ebean/Expr.java | 78 +++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Expr.java b/ebean-api/src/main/java/io/ebean/Expr.java index 072eb7e95e..275dd04f77 100644 --- a/ebean-api/src/main/java/io/ebean/Expr.java +++ b/ebean-api/src/main/java/io/ebean/Expr.java @@ -41,14 +41,14 @@ public static ExpressionFactory factory() { * Equal To - property equal to the given value. */ public static Expression eq(String propertyName, Object value) { - return DB.expressionFactory().eq(propertyName, value); + return factory().eq(propertyName, value); } /** * Not Equal To - property not equal to the given value. */ public static Expression ne(String propertyName, Object value) { - return DB.expressionFactory().ne(propertyName, value); + return factory().ne(propertyName, value); } /** @@ -56,7 +56,7 @@ public static Expression ne(String propertyName, Object value) { * using a lower() function to make it case insensitive). */ public static Expression ieq(String propertyName, String value) { - return DB.expressionFactory().ieq(propertyName, value); + return factory().ieq(propertyName, value); } /** @@ -66,28 +66,28 @@ public static Expression ieq(String propertyName, String value) { *

*/ public static Expression inRange(String propertyName, Object value1, Object value2) { - return DB.expressionFactory().inRange(propertyName, value1, value2); + return factory().inRange(propertyName, value1, value2); } /** * Between - property between the two given values. */ public static Expression between(String propertyName, Object value1, Object value2) { - return DB.expressionFactory().between(propertyName, value1, value2); + return factory().between(propertyName, value1, value2); } /** * Between - value between two given properties. */ public static Expression between(String lowProperty, String highProperty, Object value) { - return DB.expressionFactory().betweenProperties(lowProperty, highProperty, value); + return factory().betweenProperties(lowProperty, highProperty, value); } /** * Greater Than - property greater than the given value. */ public static Expression gt(String propertyName, Object value) { - return DB.expressionFactory().gt(propertyName, value); + return factory().gt(propertyName, value); } /** @@ -95,42 +95,42 @@ public static Expression gt(String propertyName, Object value) { * value. */ public static Expression ge(String propertyName, Object value) { - return DB.expressionFactory().ge(propertyName, value); + return factory().ge(propertyName, value); } /** * Less Than - property less than the given value. */ public static Expression lt(String propertyName, Object value) { - return DB.expressionFactory().lt(propertyName, value); + return factory().lt(propertyName, value); } /** * Less Than or Equal to - property less than or equal to the given value. */ public static Expression le(String propertyName, Object value) { - return DB.expressionFactory().le(propertyName, value); + return factory().le(propertyName, value); } /** * Is Null - property is null. */ public static Expression isNull(String propertyName) { - return DB.expressionFactory().isNull(propertyName); + return factory().isNull(propertyName); } /** * Is Not Null - property is not null. */ public static Expression isNotNull(String propertyName) { - return DB.expressionFactory().isNotNull(propertyName); + return factory().isNotNull(propertyName); } /** * Case insensitive {@link #exampleLike(Object)} */ public static ExampleExpression iexampleLike(Object example) { - return DB.expressionFactory().iexampleLike(example); + return factory().iexampleLike(example); } /** @@ -138,14 +138,14 @@ public static ExampleExpression iexampleLike(Object example) { * LikeType.RAW (you need to add you own wildcards % and _). */ public static ExampleExpression exampleLike(Object example) { - return DB.expressionFactory().exampleLike(example); + return factory().exampleLike(example); } /** * Create the query by Example expression specifying more options. */ public static ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType) { - return DB.expressionFactory().exampleLike(example, caseInsensitive, likeType); + return factory().exampleLike(example, caseInsensitive, likeType); } /** @@ -153,7 +153,7 @@ public static ExampleExpression exampleLike(Object example, boolean caseInsensit * characters % (percentage) and _ (underscore). */ public static Expression like(String propertyName, String value) { - return DB.expressionFactory().like(propertyName, value); + return factory().like(propertyName, value); } /** @@ -162,14 +162,14 @@ public static Expression like(String propertyName, String value) { * a lower() function to make the expression case insensitive. */ public static Expression ilike(String propertyName, String value) { - return DB.expressionFactory().ilike(propertyName, value); + return factory().ilike(propertyName, value); } /** * Starts With - property like value%. */ public static Expression startsWith(String propertyName, String value) { - return DB.expressionFactory().startsWith(propertyName, value); + return factory().startsWith(propertyName, value); } /** @@ -177,14 +177,14 @@ public static Expression startsWith(String propertyName, String value) { * lower() function to make the expression case insensitive. */ public static Expression istartsWith(String propertyName, String value) { - return DB.expressionFactory().istartsWith(propertyName, value); + return factory().istartsWith(propertyName, value); } /** * Ends With - property like %value. */ public static Expression endsWith(String propertyName, String value) { - return DB.expressionFactory().endsWith(propertyName, value); + return factory().endsWith(propertyName, value); } /** @@ -192,14 +192,14 @@ public static Expression endsWith(String propertyName, String value) { * function to make the expression case insensitive. */ public static Expression iendsWith(String propertyName, String value) { - return DB.expressionFactory().iendsWith(propertyName, value); + return factory().iendsWith(propertyName, value); } /** * Contains - property like %value%. */ public static Expression contains(String propertyName, String value) { - return DB.expressionFactory().contains(propertyName, value); + return factory().contains(propertyName, value); } /** @@ -207,42 +207,42 @@ public static Expression contains(String propertyName, String value) { * function to make the expression case insensitive. */ public static Expression icontains(String propertyName, String value) { - return DB.expressionFactory().icontains(propertyName, value); + return factory().icontains(propertyName, value); } /** * For collection properties that are empty (have not existing elements). */ public static Expression isEmpty(String propertyName) { - return DB.expressionFactory().isEmpty(propertyName); + return factory().isEmpty(propertyName); } /** * For collection properties that are not empty (have existing elements). */ public static Expression isNotEmpty(String propertyName) { - return DB.expressionFactory().isNotEmpty(propertyName); + return factory().isNotEmpty(propertyName); } /** * In - property has a value in the array of values. */ public static Expression in(String propertyName, Object[] values) { - return DB.expressionFactory().in(propertyName, values); + return factory().in(propertyName, values); } /** * In - using a subQuery. */ public static Expression in(String propertyName, Query subQuery) { - return DB.expressionFactory().in(propertyName, subQuery); + return factory().in(propertyName, subQuery); } /** * In - property has a value in the collection of values. */ public static Expression in(String propertyName, Collection values) { - return DB.expressionFactory().in(propertyName, values); + return factory().in(propertyName, values); } /** @@ -279,14 +279,14 @@ public static Expression in(String propertyName, Collection values) { * } */ public static Expression inOrEmpty(String propertyName, Collection values) { - return DB.expressionFactory().inOrEmpty(propertyName, values); + return factory().inOrEmpty(propertyName, values); } /** * Id Equal to - ID property is equal to the value. */ public static Expression idEq(Object value) { - return DB.expressionFactory().idEq(value); + return factory().idEq(value); } /** @@ -299,7 +299,7 @@ public static Expression idEq(Object value) { * @param propertyMap a map keyed by property names. */ public static Expression allEq(Map propertyMap) { - return DB.expressionFactory().allEq(propertyMap); + return factory().allEq(propertyMap); } /** @@ -310,7 +310,7 @@ public static Expression allEq(Map propertyMap) { *

*/ public static Expression raw(String raw, Object value) { - return DB.expressionFactory().raw(raw, value); + return factory().raw(raw, value); } /** @@ -321,48 +321,48 @@ public static Expression raw(String raw, Object value) { *

*/ public static Expression raw(String raw, Object[] values) { - return DB.expressionFactory().raw(raw, values); + return factory().raw(raw, values); } /** * Add raw expression with no parameters. */ public static Expression raw(String raw) { - return DB.expressionFactory().raw(raw); + return factory().raw(raw); } /** * And - join two expressions with a logical and. */ public static Expression and(Expression expOne, Expression expTwo) { - return DB.expressionFactory().and(expOne, expTwo); + return factory().and(expOne, expTwo); } /** * Or - join two expressions with a logical or. */ public static Expression or(Expression expOne, Expression expTwo) { - return DB.expressionFactory().or(expOne, expTwo); + return factory().or(expOne, expTwo); } /** * Negate the expression (prefix it with NOT). */ public static Expression not(Expression exp) { - return DB.expressionFactory().not(exp); + return factory().not(exp); } /** * Return a list of expressions that will be joined by AND's. */ public static Junction conjunction(Query query) { - return DB.expressionFactory().conjunction(query); + return factory().conjunction(query); } /** * Return a list of expressions that will be joined by OR's. */ public static Junction disjunction(Query query) { - return DB.expressionFactory().disjunction(query); + return factory().disjunction(query); } } From e71be4e1b10e2befce35f1a0e60be89b6091cfb2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 21:21:39 +1200 Subject: [PATCH 019/161] Deprecate order() methods on Query, ExpressionList - migrate to orderBy() Unfortunately we have order() and orderBy() methods which do the same thing. I have decided to deprecate the order() ones in favour of the orderBy() methods so that ultimately we will end up with less methods and I think orderBy() is the correct choice. Apologies for the migration pain here. --- .../main/java/io/ebean/ExpressionList.java | 25 +++++++---------- ebean-api/src/main/java/io/ebean/Query.java | 20 +++++--------- .../expression/DefaultExpressionList.java | 15 ++--------- .../expression/FilterExpressionList.java | 10 ++----- .../server/expression/JunctionExpression.java | 10 ------- .../java/io/ebean/typequery/TQRootBean.java | 27 ++++--------------- 6 files changed, 25 insertions(+), 82 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java index ec1e36c316..05b9084e78 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionList.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java @@ -54,14 +54,12 @@ public interface ExpressionList { Query orderById(boolean orderById); /** - * Set the order by clause replacing the existing order by clause if there is - * one. - *

- * This follows SQL syntax using commas between each property with the - * optional asc and desc keywords representing ascending and descending order - * respectively. + * Deprecated migrate to {@link #orderBy(String)} */ - ExpressionList order(String orderByClause); + @Deprecated(since = "13.19") + default ExpressionList order(String orderByClause) { + return orderBy(orderByClause); + } /** * Set the order by clause replacing the existing order by clause if there is @@ -74,15 +72,12 @@ public interface ExpressionList { ExpressionList orderBy(String orderBy); /** - * Return the OrderBy so that you can append an ascending or descending - * property to the order by clause. - *

- * This will never return a null. If no order by clause exists then an 'empty' - * OrderBy object is returned. - *

- * This is the same as orderBy() + * Deprecated migrate to orderBy(). */ - OrderBy order(); + @Deprecated + default OrderBy order() { + return orderBy(); + } /** * Return the OrderBy so that you can append an ascending or descending diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index 195c8948ee..f7cd568241 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -1372,13 +1372,9 @@ enum LockWait { Query orderBy(String orderByClause); /** - * Set the order by clause replacing the existing order by clause if there is - * one. - *

- * This follows SQL syntax using commas between each property with the - * optional asc and desc keywords representing ascending and descending order - * respectively. + * Deprecated migrate to orderBy(). */ + @Deprecated(since = "13.19") default Query order(String orderByClause) { return orderBy(orderByClause); } @@ -1395,14 +1391,9 @@ default Query order(String orderByClause) { OrderBy orderBy(); /** - * Return the OrderBy so that you can append an ascending or descending - * property to the order by clause. - *

- * This will never return a null. If no order by clause exists then an 'empty' - * OrderBy object is returned. - *

- * This is the same as orderBy() + * Deprecated migrate to orderBy(). */ + @Deprecated(since = "13.19") default OrderBy order() { return orderBy(); } @@ -1413,8 +1404,9 @@ default OrderBy order() { Query setOrderBy(OrderBy orderBy); /** - * Set an OrderBy object to replace any existing OrderBy clause. + * Deprecated migrate to setOrderBy(). */ + @Deprecated(since = "13.19") default Query setOrder(OrderBy orderBy) { return setOrderBy(orderBy); } 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 fffa19d096..2898b50ebc 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 @@ -290,25 +290,14 @@ public ExpressionList where() { return query.where(); } - @Override - public OrderBy order() { - return query.order(); - } - @Override public OrderBy orderBy() { - return query.order(); - } - - @Override - public ExpressionList order(String orderByClause) { - query.order(orderByClause); - return this; + return query.orderBy(); } @Override public ExpressionList orderBy(String orderBy) { - query.order(orderBy); + query.orderBy(orderBy); return this; } 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 3b8c5005b8..d58a6fdfed 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 @@ -131,8 +131,8 @@ public Query setMapKey(String mapKey) { } @Override - public OrderBy order() { - return rootQuery.order(); + public OrderBy orderBy() { + return rootQuery.orderBy(); } @Override @@ -141,12 +141,6 @@ public ExpressionList orderBy(String orderByClause) { return this; } - @Override - public ExpressionList order(String orderByClause) { - this.orderByClause = orderByClause; - return this; - } - @Override public ExpressionList setMaxRows(int maxRows) { this.maxRows = maxRows; 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 05268588b1..9bed902313 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 @@ -895,16 +895,6 @@ public ExpressionList or(Expression expOne, Expression expTwo) { return exprList.or(expOne, expTwo); } - @Override - public OrderBy order() { - return exprList.order(); - } - - @Override - public ExpressionList order(String orderByClause) { - return exprList.order(orderByClause); - } - @Override public OrderBy orderBy() { return exprList.orderBy(); 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 be8a42c7a3..4e13d82385 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -1241,23 +1241,10 @@ public R orderBy() { } /** - * Marker that can be used to indicate that the order by clause is defined after this. - *

- *

Example: order by customer name, order date

- * 
{@code
-   *   List orders =
-   *          new QOrder()
-   *            .customer.name.ilike("rob")
-   *            .orderBy()
-   *              .customer.name.asc()
-   *              .orderDate.asc()
-   *            .findList();
-   *
-   * }
+ * Deprecated migrate to orderBy(). */ + @Deprecated(since = "13.19") public R order() { - // Yes this does not actually do anything! We include it because style wise it makes - // the query nicer to read and suggests that order by definitions are added after this return root; } @@ -1274,15 +1261,11 @@ public R orderBy(String orderByClause) { } /** - * Set the full raw order by clause replacing the existing order by clause if there is one. - *

- * This follows SQL syntax using commas between each property with the - * optional asc and desc keywords representing ascending and descending order - * respectively. + * Deprecated migrate to {@link #orderBy(String)} */ + @Deprecated(since = "13.19") public R order(String orderByClause) { - query.order(orderByClause); - return root; + return orderBy(orderByClause); } /** From 2ab7c3529a111cfa1700fdfaaf650584ad6ab83a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 21:27:55 +1200 Subject: [PATCH 020/161] Tidy ebean-core internal API - Remove unused BeanIdList --- .../java/io/ebeaninternal/api/BeanIdList.java | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/api/BeanIdList.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BeanIdList.java b/ebean-core/src/main/java/io/ebeaninternal/api/BeanIdList.java deleted file mode 100644 index 1b635b8b8d..0000000000 --- a/ebean-core/src/main/java/io/ebeaninternal/api/BeanIdList.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.ebeaninternal.api; - -import java.util.List; - -/** - * Wrapper of the list of Id's. - */ -public class BeanIdList { - - private final List idList; - - private boolean hasMore; - - public BeanIdList(List idList) { - this.idList = idList; - } - - /** - * Add an Id to the list. - */ - public void add(Object id) { - idList.add(id); - } - - /** - * Return the list of Id's. - */ - public List getIdList() { - return idList; - } - - /** - * Return true if max rows was hit and there is more rows to fetch. - */ - public boolean isHasMore() { - return hasMore; - } - - /** - * Set to true when max rows is hit and there are more rows to fetch. - */ - public void setHasMore(boolean hasMore) { - this.hasMore = hasMore; - } - -} From 2929483b0d0669211b55e4bdca4d864097d5151d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Jun 2023 22:05:53 +1200 Subject: [PATCH 021/161] Refactor ebean-core internal API - getters -> accessors --- .../io/ebeaninternal/api/BeanCacheResult.java | 4 +- .../java/io/ebeaninternal/api/BindParams.java | 57 +++++------ .../ebeaninternal/api/CacheIdLookupMany.java | 4 +- .../api/CacheIdLookupSingle.java | 2 +- .../io/ebeaninternal/api/ExtraMetrics.java | 4 +- .../io/ebeaninternal/api/LoadManyRequest.java | 2 +- .../io/ebeaninternal/api/LoadRequest.java | 2 +- .../io/ebeaninternal/api/ManyWhereJoins.java | 8 +- .../io/ebeaninternal/api/NaturalKeyEntry.java | 2 +- .../api/NaturalKeyEntryBasic.java | 2 +- .../api/NaturalKeyEntrySimple.java | 2 +- .../api/NaturalKeyQueryData.java | 5 +- .../io/ebeaninternal/api/NaturalKeySet.java | 4 +- .../io/ebeaninternal/api/PropertyJoin.java | 4 +- .../io/ebeaninternal/api/SpiCallableSql.java | 4 +- .../io/ebeaninternal/api/SpiDtoQuery.java | 12 +-- .../ebeaninternal/api/SpiExpressionList.java | 2 +- .../api/SpiExpressionValidation.java | 2 +- .../java/io/ebeaninternal/api/SpiQuery.java | 86 ++++++++--------- .../ebeaninternal/api/SpiQuerySecondary.java | 4 +- .../io/ebeaninternal/api/SpiSqlUpdate.java | 4 +- .../io/ebeaninternal/api/SpiTransaction.java | 23 +++-- .../api/SpiTransactionProxy.java | 44 ++++----- .../java/io/ebeaninternal/api/SpiUpdate.java | 14 +-- .../io/ebeaninternal/api/SpiUpdatePlan.java | 10 +- .../ebeaninternal/api/TransactionEvent.java | 8 +- .../server/core/AbstractSqlQueryRequest.java | 2 +- .../server/core/DefaultBeanLoader.java | 2 +- .../server/core/DefaultCallableSql.java | 8 +- .../server/core/DefaultServer.java | 18 ++-- .../server/core/DefaultSqlUpdate.java | 4 +- .../server/core/DtoQueryRequest.java | 8 +- .../server/core/OrmQueryRequest.java | 50 +++++----- .../server/core/PersistRequest.java | 2 +- .../server/core/PersistRequestBean.java | 24 ++--- .../core/PersistRequestCallableSql.java | 4 +- .../server/core/PersistRequestOrmUpdate.java | 12 +-- .../server/core/PersistRequestUpdateSql.java | 8 +- .../deploy/BeanCollectionHelpFactory.java | 2 +- .../server/deploy/BeanDescriptor.java | 2 +- .../deploy/BeanDescriptorCacheHelp.java | 2 +- .../server/deploy/BeanPropertyAssocMany.java | 4 +- .../server/dto/DtoMappingRequest.java | 6 +- .../expression/DefaultExpressionList.java | 4 +- .../expression/FilterExpressionList.java | 2 +- .../server/expression/PrepareDocNested.java | 2 +- .../server/loadcontext/DLoadBaseContext.java | 2 +- .../server/loadcontext/DLoadContext.java | 16 ++-- .../ebeaninternal/server/persist/Binder.java | 6 +- .../server/persist/DefaultPersister.java | 10 +- .../server/persist/ExeCallableSql.java | 4 +- .../server/persist/ExeOrmUpdate.java | 10 +- .../server/persist/ExeUpdateSql.java | 6 +- .../server/persist/PstmtFactory.java | 12 +-- .../server/persist/SaveManyBeans.java | 2 +- .../server/persist/dml/DmlHandler.java | 6 +- .../server/persist/dml/InsertHandler.java | 2 +- .../server/persist/dml/UpdateHandler.java | 2 +- .../server/persist/dml/UpdatePlan.java | 10 +- .../io/ebeaninternal/server/query/CQuery.java | 26 ++--- .../server/query/CQueryBuilder.java | 31 +++--- .../server/query/CQueryBuilderRawSql.java | 6 +- .../server/query/CQueryEngine.java | 22 ++--- .../query/CQueryFetchSingleAttribute.java | 12 +-- .../server/query/CQueryPlan.java | 16 ++-- .../server/query/CQueryPlanManager.java | 4 +- .../server/query/CQueryPlanRawSql.java | 2 +- .../server/query/CQueryPredicates.java | 20 ++-- .../server/query/CQueryRowCount.java | 8 +- .../server/query/CQueryUpdate.java | 8 +- .../server/query/SqlTreeBuilder.java | 46 ++++----- .../server/querydefn/DefaultDtoQuery.java | 16 ++-- .../server/querydefn/DefaultOrmQuery.java | 94 +++++++++---------- .../server/querydefn/DefaultOrmUpdate.java | 14 +-- .../server/querydefn/DefaultUpdateQuery.java | 2 +- .../server/querydefn/OrmQueryProperties.java | 2 +- .../server/querydefn/OrmQuerySecondary.java | 4 +- .../transaction/DocStoreOnlyTransaction.java | 2 +- .../ImplicitReadOnlyTransaction.java | 24 ++--- .../server/transaction/JdbcTransaction.java | 26 ++--- .../transaction/JtaTransactionManager.java | 10 +- .../server/transaction/NoTransaction.java | 22 ++--- .../transaction/PostCommitProcessing.java | 16 ++-- .../transaction/SavepointTransaction.java | 4 +- .../transaction/TransactionFactory.java | 2 +- .../transaction/TransactionManager.java | 2 +- .../server/util/BindParamsParser.java | 6 +- ...faultServer_createOrmQueryRequestTest.java | 32 +++---- .../expression/PrepareDocNestedTest.java | 14 +-- .../server/querydefn/DefaultOrmQueryTest.java | 6 +- .../java/io/ebean/typequery/PBooleanTest.java | 2 +- .../txn/SpringJdbcTransactionManager.java | 4 +- .../xtest/internal/api/BindParamsTest.java | 2 +- .../io/ebean/xtest/plugin/BeanTypeTest.java | 2 +- .../tests/basic/TestPersistenceContext.java | 2 +- .../batchinsert/TestBatchInsertFlush.java | 2 +- .../TestBatchOnCascadeExceptionHandling.java | 2 +- .../query/TestAutofetchTuneWithJoin.java | 2 +- .../org/tests/query/TestQueryFindEach.java | 2 +- .../tests/rawsql/TestInsertSqlLogging.java | 2 +- .../TestDeleteFromPersistenceContext.java | 4 +- .../transaction/TestNestedSubTransaction.java | 4 +- .../transaction/TestPersistContextClear.java | 2 +- .../TestTransparentPersist.java | 2 +- 104 files changed, 545 insertions(+), 557 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java b/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java index 11e6d5f15c..9105831936 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/BeanCacheResult.java @@ -40,14 +40,14 @@ public Entry(T bean, Object key) { /** * Return the natural key or id value. */ - public Object getKey() { + public Object key() { return key; } /** * Return the bean. */ - public T getBean() { + public T bean() { return bean; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java index 7fffd8c3b5..12be6d5e56 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java @@ -107,13 +107,13 @@ public boolean isEmpty() { /** * Return a Natural Key bind param if supported. */ - public NaturalKeyBindParam getNaturalKeyBindParam() { + public NaturalKeyBindParam naturalKeyBindParam() { if (!positionedParameters.isEmpty()) { return null; } if (namedParameters.size() == 1) { Entry e = namedParameters.entrySet().iterator().next(); - return new NaturalKeyBindParam(e.getKey(), e.getValue().getInValue()); + return new NaturalKeyBindParam(e.getKey(), e.getValue().inValue()); } return null; } @@ -135,7 +135,7 @@ public boolean requiresNamedParamsPrepare() { * Set a null parameter using position. */ public void setNullParameter(int position, int jdbcType) { - Param p = getParam(position); + Param p = parameter(position); p.setInNullType(jdbcType); } @@ -143,7 +143,7 @@ public void setNullParameter(int position, int jdbcType) { * Set an In Out parameter using position. */ public void setParameter(int position, Object value, int outType) { - Param p = getParam(position); + Param p = parameter(position); p.setInValue(value); p.setOutType(outType); } @@ -168,7 +168,7 @@ public void setNextParameter(Object value) { @SuppressWarnings("rawtypes") public void setParameter(int position, Object value) { //TODO: Review - assert value != null : "use setNullParameter"; - Param p = getParam(position); + Param p = parameter(position); if (value instanceof Collection) { // use of postgres ANY with positioned parameter value = new MultiValueWrapper((Collection)value); @@ -180,15 +180,21 @@ public void setParameter(int position, Object value) { * Register the parameter as an Out parameter using position. */ public void registerOut(int position, int outType) { - Param p = getParam(position); + Param p = parameter(position); p.setOutType(outType); } - private Param getParam(String name) { + /** + * Return the named parameter. + */ + public Param parameter(String name) { return namedParameters.computeIfAbsent(name, k -> new Param()); } - private Param getParam(int position) { + /** + * Return the Parameter for a given position. + */ + public Param parameter(int position) { int more = position - positionedParameters.size(); if (more > 0) { for (int i = 0; i < more; i++) { @@ -202,7 +208,7 @@ private Param getParam(int position) { * Set a named In Out parameter. */ public void setParameter(String name, Object value, int outType) { - Param p = getParam(name); + Param p = parameter(name); p.setInValue(value); p.setOutType(outType); } @@ -211,7 +217,7 @@ public void setParameter(String name, Object value, int outType) { * Set a named In parameter that is null. */ public void setNullParameter(String name, int jdbcType) { - Param p = getParam(name); + Param p = parameter(name); p.setInNullType(jdbcType); } @@ -220,7 +226,7 @@ public void setNullParameter(String name, int jdbcType) { */ public Param setParameter(String name, Object value) { // TODO: Review - assert value != null : "use setNullParameter"; - Param p = getParam(name); + Param p = parameter(name); p.setInValue(value); return p; } @@ -229,7 +235,7 @@ public Param setParameter(String name, Object value) { * Set a named In parameter that is multi-valued. */ public void setArrayParameter(String name, Collection value) { - Param p = getParam(name); + Param p = parameter(name); p.setInValue(new MultiValueWrapper(value)); } @@ -240,7 +246,7 @@ public void setArrayParameter(String name, Collection value) { *

*/ public Param setEncryptionKey(String name, Object value) { - Param p = getParam(name); + Param p = parameter(name); p.setEncryptionKey(value); return p; } @@ -249,25 +255,10 @@ public Param setEncryptionKey(String name, Object value) { * Register the named parameter as an Out parameter. */ public void registerOut(String name, int outType) { - Param p = getParam(name); + Param p = parameter(name); p.setOutType(outType); } - /** - * Return the Parameter for a given position. - */ - public Param getParameter(int position) { - // Used to read Out value by CallableSql - return getParam(position); - } - - /** - * Return the named parameter. - */ - public Param getParameter(String name) { - return getParam(name); - } - /** * Return the values of ordered parameters. */ @@ -286,7 +277,7 @@ public void setPreparedSql(String preparedSql) { * Return the sql with ? place holders (named parameters have been processed * and ordered). */ - public String getPreparedSql() { + public String preparedSql() { return preparedSql; } @@ -457,7 +448,7 @@ public boolean isOutParam() { * Return the jdbc type of this parameter. Used for registering Out * parameters and setting NULL In parameters. */ - public int getType() { + public int type() { return type; } @@ -500,7 +491,7 @@ public void setInNullType(int type) { * Return the OUT value that was retrieved. This value is set after * CallableStatement was executed. */ - public Object getOutValue() { + public Object outValue() { return outValue; } @@ -508,7 +499,7 @@ public Object getOutValue() { * Return the In value. If this is null, then the type should be used to * specify the type of the null. */ - public Object getInValue() { + public Object inValue() { return inValue; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java index 37db76e00a..326cbdf1bd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupMany.java @@ -37,8 +37,8 @@ public List removeHits(BeanCacheResult cacheResult) { Set hitIds = new HashSet<>(); List beans = new ArrayList<>(); for (BeanCacheResult.Entry hit : cacheResult.hits()) { - hitIds.add(hit.getKey()); - beans.add(hit.getBean()); + hitIds.add(hit.key()); + beans.add(hit.bean()); } this.remaining = idInExpression.removeIds(hitIds); return beans; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java index bfc55b5c13..c405986120 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/CacheIdLookupSingle.java @@ -26,7 +26,7 @@ public List removeHits(BeanCacheResult cacheResult) { final List> hits = cacheResult.hits(); if (hits.size() == 1) { found = true; - return Collections.singletonList(hits.get(0).getBean()); + return Collections.singletonList(hits.get(0).bean()); } return Collections.emptyList(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java index 57280b9f38..edda47b11e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ExtraMetrics.java @@ -31,14 +31,14 @@ public ExtraMetrics() { /** * Timed metric for bind capture used with query plan collection. */ - public TimedMetric getBindCapture() { + public TimedMetric bindCapture() { return bindCapture; } /** * Timed metric for query plan collection. */ - public TimedMetric getPlanCollect() { + public TimedMetric planCollect() { return planCollect; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index 67493cda52..0fdb582167 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -90,7 +90,7 @@ public SpiQuery createQuery(SpiEbeanServer server) { SpiQuery query = many.newQuery(server); String orderBy = many.lazyFetchOrderBy(); if (orderBy != null) { - query.order(orderBy); + query.orderBy(orderBy); } String extraWhere = many.extraWhere(); if (extraWhere != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java index b8259d5b19..ae4dd7e4ab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadRequest.java @@ -45,6 +45,6 @@ public Transaction transaction() { * So one of - findIterate(), findEach(), findEachWhile() or findVisit(). */ public boolean isParentFindIterate() { - return parentRequest != null && parentRequest.query().getType() == SpiQuery.Type.ITERATE; + return parentRequest != null && parentRequest.query().type() == SpiQuery.Type.ITERATE; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java index 463f1705ea..ffe6bb76d6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java @@ -102,17 +102,17 @@ public boolean requireSqlDistinct() { /** * Return the set of many where joins. */ - public Collection getPropertyJoins() { + public Collection propertyJoins() { return joins.values(); } /** * Return the set of property names for the many where joins. */ - public TreeSet getPropertyNames() { + public TreeSet propertyNames() { TreeSet propertyNames = new TreeSet<>(); for (PropertyJoin join : joins.values()) { - propertyNames.add(join.getProperty()); + propertyNames.add(join.property()); } return propertyNames; } @@ -138,7 +138,7 @@ public boolean isFormulaWithJoin(String prefix) { /** * Return the formula properties to build the select clause for a findCount query. */ - public List getFormulaJoinProperties(String prefix) { + public List formulaJoinProperties(String prefix) { return formulaJoinProperties.get(prefix); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java index f53e6a56ba..239be41cc2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntry.java @@ -13,5 +13,5 @@ public interface NaturalKeyEntry { /** * Return the inValue (used to remove from IN clause of original query). */ - Object getInValue(); + Object inValue(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java index 61514bc665..74db49a6c4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntryBasic.java @@ -67,7 +67,7 @@ public String key() { } @Override - public Object getInValue() { + public Object inValue() { return inValue; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java index 0ad6e9343c..0d0aa78984 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyEntrySimple.java @@ -16,7 +16,7 @@ public String key() { } @Override - public Object getInValue() { + public Object inValue() { return val; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java index e83bed445c..c7989557ac 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java @@ -189,14 +189,13 @@ public boolean allHits() { * Adjust the IN clause removing the hit entry. */ public List removeHits(BeanCacheResult cacheResult) { - List> hits = cacheResult.hits(); this.hitCount = hits.size(); List beans = new ArrayList<>(hitCount); for (BeanCacheResult.Entry hit : hits) { - removeKey(set.getInValue(hit.getKey())); - beans.add(hit.getBean()); + removeKey(set.inValue(hit.key())); + beans.add(hit.bean()); } return beans; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java index 89b5ae4849..92bfd13809 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeySet.java @@ -23,7 +23,7 @@ public Set keys() { return map.keySet(); } - Object getInValue(Object naturalKey) { - return map.get(naturalKey).getInValue(); + Object inValue(Object naturalKey) { + return map.get(naturalKey).inValue(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java b/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java index ab63e09d41..4e10b64959 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/PropertyJoin.java @@ -18,14 +18,14 @@ public PropertyJoin(String property, SqlJoinType joinType) { /** * Return the property that should be joined. */ - public String getProperty() { + public String property() { return property; } /** * Return true if this join is required to be an outer join. */ - public SqlJoinType getSqlJoinType() { + public SqlJoinType sqlJoinType() { return joinType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCallableSql.java index 3ddab2b510..3e43475ab7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCallableSql.java @@ -4,7 +4,7 @@ public interface SpiCallableSql extends CallableSql { - BindParams getBindParams(); + BindParams bindParams(); - TransactionEventTable getTransactionEventTable(); + TransactionEventTable transactionEventTable(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java index cc64fb097c..77de4f521b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java @@ -19,7 +19,7 @@ public interface SpiDtoQuery extends DtoQuery, SpiSqlBinding { /** * Get the query plan for the cache. */ - DtoQueryPlan getQueryPlan(Object planKey); + DtoQueryPlan queryPlan(Object planKey); /** * Build the query plan. @@ -39,7 +39,7 @@ public interface SpiDtoQuery extends DtoQuery, SpiSqlBinding { /** * Return the label with fallback to profile location label. */ - String getPlanLabel(); + String planLabel(); /** * Obtain the location if necessary. @@ -49,21 +49,21 @@ public interface SpiDtoQuery extends DtoQuery, SpiSqlBinding { /** * Return the profile location. */ - ProfileLocation getProfileLocation(); + ProfileLocation profileLocation(); /** * Return the associated DTO bean type. */ - Class getType(); + Class type(); /** * Return an underlying ORM query (if this query is built from an ORM query). */ - SpiQuery getOrmQuery(); + SpiQuery ormQuery(); /** * Return the explicit transaction used to execute the query. */ - Transaction getTransaction(); + Transaction transaction(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java index 5c4ce37ed6..15fa906f6d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionList.java @@ -20,7 +20,7 @@ public interface SpiExpressionList extends ExpressionList, SpiExpression { /** * Return the underlying list of expressions. */ - List getUnderlyingList(); + List underlyingList(); /** * Return a copy of the ExpressionList with the path trimmed for filterMany() expressions. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java index 203827820c..4f28591bdd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java @@ -29,7 +29,7 @@ public void validate(String propertyName) { /** * Return the set of properties considered as having unknown paths. */ - public Set getUnknownProperties() { + public Set unknownProperties() { return unknown; } 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 e10b863152..f7293d6114 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java @@ -206,7 +206,7 @@ public boolean isHistory() { * Return the mode of the query of if null return CURRENT mode. */ public static TemporalMode of(SpiQuery query) { - return (query != null) ? query.getTemporalMode() : TemporalMode.CURRENT; + return (query != null) ? query.temporalMode() : TemporalMode.CURRENT; } } @@ -218,22 +218,22 @@ public static TemporalMode of(SpiQuery query) { /** * Return the id used to identify a particular query for the given bean type. */ - String getProfileId(); + String profileId(); /** * Return the profile location for this query. */ - ProfileLocation getProfileLocation(); + ProfileLocation profileLocation(); /** * Return the label set on the query. */ - String getLabel(); + String label(); /** * Return the label manually set on the query or from the profile location. */ - String getPlanLabel(); + String planLabel(); /** * Return true if this is a "find by id" query. This includes a check for a single "equal to" expression for the Id. @@ -258,7 +258,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the unmodified native sql query (with named params etc). */ - String getNativeSql(); + String nativeSql(); /** * Return the ForUpdate mode. @@ -269,17 +269,17 @@ public static TemporalMode of(SpiQuery query) { /** * Return the bean descriptor for this query. */ - BeanDescriptor getBeanDescriptor(); + BeanDescriptor descriptor(); /** * Return the query plan key. */ - Object getQueryPlanKey(); + Object queryPlanKey(); /** * Return the RawSql that was set to use for this query. */ - SpiRawSql getRawSql(); + SpiRawSql rawSql(); /** * Return true if this query should be executed against the doc store. @@ -298,7 +298,7 @@ public static TemporalMode of(SpiQuery query) { * This can be null and in that case use the default scope. *

*/ - PersistenceContextScope getPersistenceContextScope(); + PersistenceContextScope persistenceContextScope(); /** * Return the origin key. @@ -308,7 +308,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the default lazy load batch size. */ - int getLazyLoadBatchSize(); + int lazyLoadBatchSize(); /** * Return true if select all properties was used to ensure the property @@ -339,12 +339,12 @@ public static TemporalMode of(SpiQuery query) { /** * Return the query mode. */ - Mode getMode(); + Mode mode(); /** * Return the Temporal mode for the query. */ - TemporalMode getTemporalMode(); + TemporalMode temporalMode(); /** * Return true if this is a find versions between query. @@ -354,12 +354,12 @@ public static TemporalMode of(SpiQuery query) { /** * Return the find versions start timestamp. */ - Timestamp getVersionStart(); + Timestamp versionStart(); /** * Return the find versions end timestamp. */ - Timestamp getVersionEnd(); + Timestamp versionEnd(); /** * Return true if this is a 'As Of' query. @@ -408,7 +408,7 @@ public static TemporalMode of(SpiQuery query) { void addSoftDeletePredicate(String softDeletePredicate); - List getSoftDeletePredicates(); + List softDeletePredicates(); /** * Bind the named multi-value array parameter which we would use with Postgres ANY. @@ -431,7 +431,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the type of query (List, Set, Map, Bean, rowCount etc). */ - Type getType(); + Type type(); /** * Set the query type (List, Set etc). @@ -441,12 +441,12 @@ public static TemporalMode of(SpiQuery query) { /** * Return a more detailed description of the lazy or query load. */ - String getLoadDescription(); + String loadDescription(); /** * Return the load mode (+lazy or +query). */ - String getLoadMode(); + String loadMode(); /** * This becomes a lazy loading query for a many relationship. @@ -456,7 +456,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the lazy loading 'many' property. */ - BeanPropertyAssocMany getLazyLoadMany(); + BeanPropertyAssocMany lazyLoadMany(); /** * Set the load mode (+lazy or +query) and the load description. @@ -476,7 +476,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the joins required to support predicates on the many properties. */ - ManyWhereJoins getManyWhereJoins(); + ManyWhereJoins manyWhereJoins(); /** * Reset AUTO mode to OFF for findList(). Expect explicit cache use with findList(). @@ -497,7 +497,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return a Natural Key bind parameter if supported by this query. */ - NaturalKeyBindParam getNaturalKeyBindParam(); + NaturalKeyBindParam naturalKeyBindParam(); /** * Prepare the query for docstore execution with nested paths. @@ -550,7 +550,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the tenantId to use for lazy loading. */ - Object getTenantId(); + Object tenantId(); /** * Set the path of the many when +query/+lazy loading query is executed. @@ -570,7 +570,7 @@ public static TemporalMode of(SpiQuery query) { * persistence context). *

*/ - PersistenceContext getPersistenceContext(); + PersistenceContext persistenceContext(); /** * Set an explicit TransactionContext (typically for a refresh query). @@ -598,7 +598,7 @@ public static TemporalMode of(SpiQuery query) { * returned this implies that profiling is turned on for this query (and all * the objects this query creates). */ - ProfilingListener getProfilingListener(); + ProfilingListener profilingListener(); /** * This has the effect of turning on profiling for this query. @@ -632,7 +632,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the property that invoked lazy load. */ - String getLazyLoadProperty(); + String lazyLoadProperty(); /** * Used to hook back a lazy loading query to the original query (query @@ -641,7 +641,7 @@ public static TemporalMode of(SpiQuery query) { * This will return null or an "original" query. *

*/ - ObjectGraphNode getParentNode(); + ObjectGraphNode parentNode(); /** * Return false when this is a lazy load or refresh query for a bean. @@ -702,17 +702,17 @@ public static TemporalMode of(SpiQuery query) { /** * Can return null if no expressions where added to the where clause. */ - SpiExpressionList getWhereExpressions(); + SpiExpressionList whereExpressions(); /** * Can return null if no expressions where added to the having clause. */ - SpiExpressionList getHavingExpressions(); + SpiExpressionList havingExpressions(); /** * Return the text expressions. */ - SpiExpressionList getTextExpression(); + SpiExpressionList textExpression(); /** * Returns true if either firstRow or maxRows has been set. @@ -737,12 +737,12 @@ public static TemporalMode of(SpiQuery query) { /** * Return the cache mode for using the bean cache (Get and Put). */ - CacheMode getUseBeanCache(); + CacheMode beanCacheMode(); /** * Return the cache mode if this query should use/check the query cache. */ - CacheMode getUseQueryCache(); + CacheMode queryCacheMode(); /** * Return true if the beans returned by this query should be read only. @@ -752,12 +752,12 @@ public static TemporalMode of(SpiQuery query) { /** * Return the query timeout. */ - int getTimeout(); + int timeout(); /** * Return the bind parameters. */ - BindParams getBindParams(); + BindParams bindParams(); /** * Return the bind parameters ensuring it is initialised. @@ -793,12 +793,12 @@ public static TemporalMode of(SpiQuery query) { /** * Return the query detail. */ - OrmQueryDetail getDetail(); + OrmQueryDetail detail(); /** * Return the extra join for a M2M lazy load. */ - TableJoin getM2mIncludeJoin(); + TableJoin m2mIncludeJoin(); /** * Set the extra join for a M2M lazy load. @@ -808,7 +808,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the property used to specify keys for a map. */ - String getMapKey(); + String mapKey(); /** * Return the maximum number of rows to return in the query. @@ -860,7 +860,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the hint for Statement.setFetchSize(). */ - int getBufferFetchSizeHint(); + int bufferFetchSizeHint(); /** * Return true if read auditing is disabled on this query. @@ -886,17 +886,17 @@ public static TemporalMode of(SpiQuery query) { /** * Read the readEvent for future queries (null otherwise). */ - ReadEvent getFutureFetchAudit(); + ReadEvent futureFetchAudit(); /** * Return the base table to use if user defined on the query. */ - String getBaseTable(); + String baseTable(); /** * Return root table alias set by {@link #alias(String)} command. */ - String getAlias(); + String alias(); /** * Return root table alias with default option. @@ -911,7 +911,7 @@ public static TemporalMode of(SpiQuery query) { /** * Return the properties for an update query. */ - OrmUpdateProperties getUpdateProperties(); + OrmUpdateProperties updateProperties(); /** * Simplify nested expression lists where possible. @@ -921,7 +921,7 @@ public static TemporalMode of(SpiQuery query) { /** * Returns the count distinct order setting. */ - CountDistinctOrder getCountDistinctOrder(); + CountDistinctOrder countDistinctOrder(); /** * Handles load errors. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuerySecondary.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuerySecondary.java index f4156c8fff..22572bd480 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuerySecondary.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuerySecondary.java @@ -12,10 +12,10 @@ public interface SpiQuerySecondary { /** * Return a list of path/properties that are query join loaded. */ - List getQueryJoins(); + List queryJoins(); /** * Return the list of path/properties that are lazy loaded. */ - List getLazyJoins(); + List lazyJoins(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java index 1a19bb4e30..f19c45b2f0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java @@ -7,12 +7,12 @@ public interface SpiSqlUpdate extends SqlUpdate { /** * Return the sql taking into account bind parameter expansion. */ - String getBaseSql(); + String baseSql(); /** * Return the Bind parameters. */ - BindParams getBindParams(); + BindParams bindParams(); /** * Set the final sql being executed with named parameters replaced etc. 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 a8acdb45a7..e15b51298b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -25,8 +25,7 @@ public interface SpiTransaction extends Transaction { /** * Return the user defined label for the transaction. */ - String getLabel(); - + String label(); /** * Return true if generated SQL and Bind values should be logged to the @@ -91,12 +90,12 @@ public interface SpiTransaction extends Transaction { * Returns a String used to identify the transaction. This id is used for * Transaction logging. */ - String getId(); + String id(); /** * Return the start timestamp for the transaction (JVM side). */ - long getStartNanoTime(); + long startNanoTime(); /** * Return true if this transaction has updateAllLoadedProperties set. @@ -109,7 +108,7 @@ public interface SpiTransaction extends Transaction { *

* Returning 0 implies to use the system wide default batch size. */ - DocStoreMode getDocStoreMode(); + DocStoreMode docStoreMode(); /** * Return the batch size to us for ElasticSearch Bulk API calls @@ -184,7 +183,7 @@ default int depth() { * indexes. On commit the Table modifications this generates is broadcast * around the cluster (if you have a cluster). */ - TransactionEvent getEvent(); + TransactionEvent event(); /** * Whether persistCascade is on for save and delete. @@ -200,7 +199,7 @@ default int depth() { /** * Return the BatchControl used to batch up persist requests. */ - BatchControl getBatchControl(); + BatchControl batchControl(); /** * Set the BatchControl used to batch up persist requests. There should only be one @@ -215,7 +214,7 @@ default int depth() { * later. This is along the lines of 'extended persistence context' * behaviour. */ - SpiPersistenceContext getPersistenceContext(); + SpiPersistenceContext persistenceContext(); /** * Set the persistence context to this transaction. @@ -236,7 +235,7 @@ default int depth() { * that method we can no longer trust the query only status of a * Transaction. */ - Connection getInternalConnection(); + Connection internalConnection(); /** * Return true if the manyToMany intersection should be persisted for this particular relationship direction. @@ -291,7 +290,7 @@ default int depth() { /** * Return a document store transaction. */ - DocStoreTransaction getDocStoreTransaction(); + DocStoreTransaction docStoreTransaction(); /** * Set the current Tenant Id. @@ -301,7 +300,7 @@ default int depth() { /** * Return the current Tenant Id. */ - Object getTenantId(); + Object tenantId(); /** * Return the offset time from the start of the transaction. @@ -331,7 +330,7 @@ default int depth() { /** * Return the profile location for this transaction. */ - ProfileLocation getProfileLocation(); + ProfileLocation profileLocation(); /** * Return true when nested transactions should create Savepoints. 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 87c2f606ab..bb738cb5ad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -28,8 +28,8 @@ public PersistenceException translate(String message, SQLException cause) { } @Override - public long getStartNanoTime() { - return transaction.getStartNanoTime(); + public long startNanoTime() { + return transaction.startNanoTime(); } @Override @@ -38,8 +38,8 @@ public void setLabel(String label) { } @Override - public String getLabel() { - return transaction.getLabel(); + public String label() { + return transaction.label(); } @Override @@ -98,8 +98,8 @@ public void setProfileLocation(ProfileLocation profileLocation) { } @Override - public ProfileLocation getProfileLocation() { - return transaction.getProfileLocation(); + public ProfileLocation profileLocation() { + return transaction.profileLocation(); } @Override @@ -108,18 +108,18 @@ public void setTenantId(Object tenantId) { } @Override - public Object getTenantId() { - return transaction.getTenantId(); + public Object tenantId() { + return transaction.tenantId(); } @Override - public DocStoreTransaction getDocStoreTransaction() { - return transaction.getDocStoreTransaction(); + public DocStoreTransaction docStoreTransaction() { + return transaction.docStoreTransaction(); } @Override - public DocStoreMode getDocStoreMode() { - return transaction.getDocStoreMode(); + public DocStoreMode docStoreMode() { + return transaction.docStoreMode(); } @Override @@ -214,8 +214,8 @@ public boolean isRegisteredBean(Object bean) { } @Override - public String getId() { - return transaction.getId(); + public String id() { + return transaction.id(); } @Override @@ -359,8 +359,8 @@ public boolean isExplicit() { } @Override - public TransactionEvent getEvent() { - return transaction.getEvent(); + public TransactionEvent event() { + return transaction.event(); } @Override @@ -374,8 +374,8 @@ public boolean isBatchThisRequest() { } @Override - public BatchControl getBatchControl() { - return transaction.getBatchControl(); + public BatchControl batchControl() { + return transaction.batchControl(); } @Override @@ -384,8 +384,8 @@ public void setBatchControl(BatchControl control) { } @Override - public SpiPersistenceContext getPersistenceContext() { - return transaction.getPersistenceContext(); + public SpiPersistenceContext persistenceContext() { + return transaction.persistenceContext(); } @Override @@ -394,8 +394,8 @@ public void setPersistenceContext(SpiPersistenceContext context) { } @Override - public Connection getInternalConnection() { - return transaction.getInternalConnection(); + public Connection internalConnection() { + return transaction.internalConnection(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdate.java index 2e2ed8531c..4553363db2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdate.java @@ -41,32 +41,32 @@ public String toString() { /** * Return the type of bean being updated. */ - Class getBeanType(); + Class beanType(); /** * Return the label (for metrics collection). */ - String getLabel(); + String label(); /** * Return the type of this - insert, update or delete. */ - OrmUpdateType getOrmUpdateType(); + OrmUpdateType ormUpdateType(); /** * Return the name of the table being modified. */ - String getBaseTable(); + String baseTable(); /** * Return the update statement. This could be either sql or an orm update with bean types and property names. */ - String getUpdateStatement(); + String updateStatement(); /** * Return the timeout in seconds. */ - int getTimeout(); + int timeout(); /** * Return true if the cache should be notified to invalidate objects. @@ -76,7 +76,7 @@ public String toString() { /** * Return the bind parameters. */ - BindParams getBindParams(); + BindParams bindParams(); /** * Set the generated sql used. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdatePlan.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdatePlan.java index ab094616d1..5cb956b850 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdatePlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiUpdatePlan.java @@ -36,27 +36,27 @@ public interface SpiUpdatePlan { /** * Return the time this plan was created. */ - long getTimeCreated(); + long timeCreated(); /** * Return the time this plan was last used. */ - long getTimeLastUsed(); + long timeLastUsed(); /** * Return the hash key for this plan. */ - String getKey(); + String key(); /** * Return the concurrency mode for this plan. */ - ConcurrencyMode getMode(); + ConcurrencyMode mode(); /** * Return the update SQL statement. */ - String getSql(); + String sql(); /** * Return the set of bindable update properties. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java index 2c06dbb813..c1fc45f304 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java @@ -55,7 +55,7 @@ public void addDeleteByIdList(BeanDescriptor desc, List idList) { deleteByIdMap.addList(desc, idList); } - public DeleteByIdMap getDeleteByIdMap() { + public DeleteByIdMap deleteByIdMap() { return deleteByIdMap; } @@ -70,11 +70,11 @@ public boolean isLocal() { /** * Return the list of PersistRequestBean's for this transaction. */ - public List> getListenerNotify() { + public List> listenerNotify() { return listenerNotify; } - public TransactionEventTable getEventTables() { + public TransactionEventTable eventTables() { return eventTables; } @@ -129,7 +129,7 @@ public CacheChangeSet buildCacheChanges(TransactionManager manager) { * Add any relevant PersistRequestBean's to DocStoreUpdates for later processing. */ public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates) { - List> requests = getListenerNotify(); + List> requests = listenerNotify(); if (requests != null) { for (PersistRequestBean persistRequestBean : requests) { persistRequestBean.addDocStoreUpdates(docStoreUpdates); 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 b4a0c5b202..685232dec7 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 @@ -136,7 +136,7 @@ protected void executeAsSql(Binder binder) throws SQLException { try { query.checkCancelled(); prepareSql(); - Connection conn = transaction.getInternalConnection(); + Connection conn = transaction.internalConnection(); pstmt = conn.prepareStatement(sql); if (query.getTimeout() > 0) { pstmt.setQueryTimeout(query.getTimeout()); 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 871a5b982f..a421044b06 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.getTenantId()); + SpiTransaction extraTxn = server.createReadOnlyTransaction(query.tenantId()); try { return server.findList(query, extraTxn); } finally { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java index 50807aa645..27314c9776 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java @@ -87,8 +87,8 @@ public CallableSql registerOut(int position, int type) { @Override public Object getObject(int position) { - Param p = bindParameters.getParameter(position); - return p.getOutValue(); + Param p = bindParameters.parameter(position); + return p.outValue(); } @Override @@ -108,12 +108,12 @@ public CallableSql addModification(String tableName, boolean inserts, boolean up * transaction after the transaction is committed. */ @Override - public TransactionEventTable getTransactionEventTable() { + public TransactionEventTable transactionEventTable() { return transactionEvent; } @Override - public BindParams getBindParams() { + public BindParams bindParams() { return bindParameters; } 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 7357721d83..8841349f43 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 @@ -611,7 +611,7 @@ public T reference(Class type, Object id) { PersistenceContext pc = null; SpiTransaction t = transactionManager.active(); if (t != null) { - pc = t.getPersistenceContext(); + pc = t.persistenceContext(); Object existing = desc.contextGet(pc, id); if (existing != null) { return (T) existing; @@ -904,7 +904,7 @@ public DtoQuery findDto(Class dtoType, SpiQuery ormQuery) { @Override public SpiResultSet findResultSet(SpiQuery ormQuery, SpiTransaction transaction) { - SpiOrmQueryRequest request = createQueryRequest(ormQuery.getType(), ormQuery, transaction); + SpiOrmQueryRequest request = createQueryRequest(ormQuery.type(), ormQuery, transaction); request.initTransIfRequired(); return request.findResultSet(); } @@ -965,12 +965,12 @@ private SpiOrmQueryRequest buildQueryRequest(SpiQuery query, @Nullable } query.selectAllForLazyLoadProperty(); } - ProfileLocation profileLocation = query.getProfileLocation(); + ProfileLocation profileLocation = query.profileLocation(); if (profileLocation != null) { profileLocation.obtain(); } // if determine cost and no origin for AutoTune - if (query.getParentNode() == null) { + if (query.parentNode() == null) { query.setOrigin(createCallOrigin()); } return new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) transaction); @@ -986,12 +986,12 @@ private T findIdCheckPersistenceContextAndCache(@Nullable Transaction transa if (t == null) { t = currentServerTransaction(); } - BeanDescriptor desc = query.getBeanDescriptor(); + BeanDescriptor desc = query.descriptor(); id = desc.convertId(id); PersistenceContext pc = null; if (t != null && useTransactionPersistenceContext(query)) { // first look in the transaction scoped persistence context - pc = t.getPersistenceContext(); + pc = t.persistenceContext(); if (pc != null) { WithOption o = desc.contextGetWithOption(pc, id); if (o != null) { @@ -1022,7 +1022,7 @@ private boolean useTransactionPersistenceContext(SpiQuery query) { */ @Override public PersistenceContextScope persistenceContextScope(SpiQuery query) { - PersistenceContextScope scope = query.getPersistenceContextScope(); + PersistenceContextScope scope = query.persistenceContextScope(); return (scope != null) ? scope : defaultPersistenceContextScope; } @@ -1031,7 +1031,7 @@ public PersistenceContextScope persistenceContextScope(SpiQuery query) { private T findId(Query query, @Nullable Transaction transaction) { SpiQuery spiQuery = (SpiQuery) query; spiQuery.setType(Type.BEAN); - if (SpiQuery.Mode.NORMAL == spiQuery.getMode() && !spiQuery.isForceHitDatabase()) { + if (SpiQuery.Mode.NORMAL == spiQuery.mode() && !spiQuery.isForceHitDatabase()) { // See if we can skip doing the fetch completely by getting the bean from the // persistence context or the bean cache T bean = findIdCheckPersistenceContextAndCache(transaction, spiQuery, spiQuery.getId()); @@ -2158,7 +2158,7 @@ public SpiJsonContext jsonExtended() { @Override public void slowQueryCheck(long timeMicros, int rowCount, SpiQuery query) { if (timeMicros > slowQueryMicros && slowQueryListener != null) { - slowQueryListener.process(new SlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount, query.getParentNode())); + slowQueryListener.process(new SlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount, query.parentNode())); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java index d9023b3568..98f7cba58c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java @@ -246,7 +246,7 @@ public String getSql() { } @Override - public String getBaseSql() { + public String baseSql() { return baseSql; } @@ -342,7 +342,7 @@ public SqlUpdate setNullParameter(String name, int jdbcType) { * Return the bind parameters. */ @Override - public BindParams getBindParams() { + public BindParams bindParams() { return bindParams; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java index 58c5dae77f..5ca74e9f91 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java @@ -33,7 +33,7 @@ public final class DtoQueryRequest extends AbstractSqlQueryRequest { private DataReader dataReader; DtoQueryRequest(SpiEbeanServer server, DtoQueryEngine engine, SpiDtoQuery query) { - super(server, query, query.getTransaction()); + super(server, query, query.transaction()); this.queryEngine = engine; this.query = query; query.obtainLocation(); @@ -45,7 +45,7 @@ public final class DtoQueryRequest extends AbstractSqlQueryRequest { @Override public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException { startNano = System.nanoTime(); - SpiQuery ormQuery = query.getOrmQuery(); + SpiQuery ormQuery = query.ormQuery(); if (ormQuery != null) { ormQuery.setType(type); ormQuery.setManualId(); @@ -55,7 +55,7 @@ public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException { SpiResultSet result = server.findResultSet(ormQuery, transaction); this.pstmt = result.getStatement(); this.sql = ormQuery.getGeneratedSql(); - setResultSet(result.getResultSet(), ormQuery.getQueryPlanKey()); + setResultSet(result.getResultSet(), ormQuery.queryPlanKey()); } else { // native SQL query execution @@ -74,7 +74,7 @@ private void obtainPlan(Object planKey) throws SQLException { if (planKey == null) { planKey = query.planKey(); } - plan = query.getQueryPlan(planKey); + plan = query.queryPlan(planKey); if (plan == null) { plan = query.buildPlan(mappingRequest()); query.putQueryPlan(planKey, plan); 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 6f0930523c..3f0d2ea373 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 @@ -48,12 +48,12 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery public OrmQueryRequest(SpiEbeanServer server, OrmQueryEngine queryEngine, SpiQuery query, SpiTransaction t) { super(server, t); - this.beanDescriptor = query.getBeanDescriptor(); + this.beanDescriptor = query.descriptor(); this.finder = beanDescriptor.beanFinder(); this.queryEngine = queryEngine; this.query = query; this.readOnly = query.isReadOnly(); - this.persistenceContext = query.getPersistenceContext(); + this.persistenceContext = query.persistenceContext(); } public PersistenceException translate(String bindLog, String sql, SQLException e) { @@ -188,7 +188,7 @@ public boolean isRawSql() { public DeployParser createDeployParser() { if (query.isRawSql()) { - return new DeployPropertyParserMap(query.getRawSql().getColumnMapping().getMapping()); + return new DeployPropertyParserMap(query.rawSql().getColumnMapping().getMapping()); } else { return beanDescriptor.parser(); } @@ -214,22 +214,22 @@ public PersistenceContext persistenceContext() { public void initTransIfRequired() { // first check if the query requires its own transaction if (transaction == null) { - if (query.getType().isUpdate()) { + if (query.type().isUpdate()) { // bulk update or delete query transaction = server.beginServerTransaction(); } else { // create an implicit transaction to execute this query // potentially using read-only DataSource with autoCommit - transaction = server.createReadOnlyTransaction(query.getTenantId()); + transaction = server.createReadOnlyTransaction(query.tenantId()); } createdTransaction = true; } persistenceContext = persistenceContext(query, transaction); - if (Type.ITERATE == query.getType()) { + if (Type.ITERATE == query.type()) { persistenceContext.beginIterate(); } loadContext = new DLoadContext(this, secondaryQueries); - loadContext.useReferences(Type.ITERATE == query.getType()); + loadContext.useReferences(Type.ITERATE == query.type()); } /** @@ -237,7 +237,7 @@ public void initTransIfRequired() { */ @Override public void rollbackTransIfRequired() { - if (Type.ITERATE == query.getType()) { + if (Type.ITERATE == query.type()) { persistenceContext.endIterate(); } if (createdTransaction) { @@ -258,7 +258,7 @@ public void rollbackTransIfRequired() { @Override public JsonReadOptions createJsonReadOptions() { persistenceContext = persistenceContext(query, transaction); - if (query.getPersistenceContext() == null) { + if (query.persistenceContext() == null) { query.setPersistenceContext(persistenceContext); } JsonReadOptions jsonRead = new JsonReadOptions(); @@ -277,7 +277,7 @@ public JsonReadOptions createJsonReadOptions() { private PersistenceContext persistenceContext(SpiQuery query, SpiTransaction t) { // check if there is already a persistence context set which is the case // when lazy loading or query joins are executed - PersistenceContext ctx = query.getPersistenceContext(); + PersistenceContext ctx = query.persistenceContext(); if (ctx != null) return ctx; // determine the scope (from the query and then server) @@ -285,7 +285,7 @@ private PersistenceContext persistenceContext(SpiQuery query, SpiTransaction if (scope == PersistenceContextScope.QUERY || t == null) { return new DefaultPersistenceContext(); } - return t.getPersistenceContext(); + return t.persistenceContext(); } /** @@ -295,12 +295,12 @@ private PersistenceContext persistenceContext(SpiQuery query, SpiTransaction */ @Override public void endTransIfRequired() { - if (Type.ITERATE == query.getType()) { + if (Type.ITERATE == query.type()) { persistenceContext.endIterate(); } if (createdTransaction && transaction.isActive()) { transaction.commit(); - if (query.getType().isUpdate()) { + if (query.type().isUpdate()) { // for implicit update/delete queries clear the thread local server.clearServerTransaction(); } @@ -311,14 +311,14 @@ public void endTransIfRequired() { * Return true if this is a find by id (rather than List Set or Map). */ public boolean isFindById() { - return query.getType() == Type.BEAN; + return query.type() == Type.BEAN; } /** * Return true if this is a findEach, findIterate type query where we expect many results. */ public boolean isFindIterate() { - return query.getType() == Type.ITERATE; + return query.type() == Type.ITERATE; } @Override @@ -421,7 +421,7 @@ public Set findSet() { @Override @SuppressWarnings("unchecked") public Map findMap() { - String mapKey = query.getMapKey(); + String mapKey = query.mapKey(); if (mapKey == null) { BeanProperty idProp = beanDescriptor.idProperty(); if (idProp != null) { @@ -497,7 +497,7 @@ public void resetBeanCacheAutoMode(boolean findOne) { } public boolean isQueryCachePut() { - return cacheKey != null && query.getUseQueryCache().isPut(); + return cacheKey != null && query.queryCacheMode().isPut(); } public boolean isBeanCachePutMany() { @@ -513,7 +513,7 @@ public boolean isBeanCachePut() { */ public void mergeCacheHits(BeanCollection result) { if (cacheBeans != null && !cacheBeans.isEmpty()) { - if (query.getType() == Type.MAP) { + if (query.type() == Type.MAP) { mergeCacheHitsToMap(result); } else { mergeCacheHitsToCollection(result); @@ -572,7 +572,7 @@ private Map cacheBeansToMap() { } private ElPropertyValue mapProperty() { - final String key = query.getMapKey(); + final String key = query.mapKey(); final ElPropertyValue property = key == null ? beanDescriptor.idProperty() : beanDescriptor.elGetValue(key); if (property == null) { throw new IllegalStateException("Unknown map key property " + key); @@ -631,14 +631,14 @@ public boolean getFromBeanCache() { @Override @SuppressWarnings("unchecked") public Object getFromQueryCache() { - if (query.getUseQueryCache() == CacheMode.OFF + if (query.queryCacheMode() == CacheMode.OFF || (transaction != null && transaction.isSkipCache()) || server.isDisableL2Cache()) { return null; } else { cacheKey = query.queryHash(); } - if (!query.getUseQueryCache().isGet()) { + if (!query.queryCacheMode().isGet()) { return null; } @@ -674,7 +674,7 @@ public Object getFromQueryCache() { * it in read auditing. Return false for row count and find ids queries. */ private boolean readAuditQueryType() { - Type type = query.getType(); + Type type = query.type(); switch (type) { case BEAN: case ITERATE: @@ -688,7 +688,7 @@ private boolean readAuditQueryType() { } public void putToQueryCache(Object result) { - beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, transaction.getStartNanoTime())); + beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, transaction.startNanoTime())); } /** @@ -709,7 +709,7 @@ public void logSql(String msg, Object... args) { * Return the batch size for lazy loading on this bean query request. */ public int lazyLoadBatchSize() { - int batchSize = query.getLazyLoadBatchSize(); + int batchSize = query.lazyLoadBatchSize(); return (batchSize > 0) ? batchSize : server.lazyLoadBatchSize(); } @@ -740,7 +740,7 @@ public void setDefaultFetchBuffer(int fetchSize) { * Return the tenantId associated with this request. */ public Object tenantId() { - return (transaction == null) ? null : transaction.getTenantId(); + return (transaction == null) ? null : transaction.tenantId(); } /** 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 3d30f70b3e..315fb5484c 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 @@ -126,7 +126,7 @@ int executeStatement(boolean addBatch) { boolean batch = isBatchThisRequest(); try { int rows; - BatchControl control = transaction.getBatchControl(); + BatchControl control = transaction.batchControl(); if (control != null) { rows = control.executeStatementOrBatch(this, batch, addBatch); 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 f9b08aa5fb..f4a41c25d0 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 @@ -192,7 +192,7 @@ public void profile(long offset, int flushCount) { * don't want to send to the doc store. */ private DocStoreMode calcDocStoreMode(SpiTransaction txn, Type type) { - DocStoreMode txnMode = (txn == null) ? null : txn.getDocStoreMode(); + DocStoreMode txnMode = (txn == null) ? null : txn.docStoreMode(); return beanDescriptor.docStoreMode(type, txnMode); } @@ -750,7 +750,7 @@ private void prepareForSoftDelete() { public int executeOrQueue() { boolean batch = isBatchThisRequest(); try { - BatchControl control = transaction.getBatchControl(); + BatchControl control = transaction.batchControl(); if (control != null) { return control.executeOrQueue(this, batch); } @@ -821,7 +821,7 @@ public void checkRowCount(int rowCount) { */ private void postUpdate() { if (statelessUpdate) { - beanDescriptor.contextClear(transaction.getPersistenceContext(), idValue); + beanDescriptor.contextClear(transaction.persistenceContext(), idValue); } } @@ -836,14 +836,14 @@ private void postUpdateNotify() { */ public void removeFromPersistenceContext() { idValue = beanDescriptor.getId(entityBean); - beanDescriptor.contextDeleted(transaction.getPersistenceContext(), idValue); + beanDescriptor.contextDeleted(transaction.persistenceContext(), idValue); } /** * Aggressive L1 and L2 cache cleanup for deletes. */ private void postDelete() { - beanDescriptor.contextClear(transaction.getPersistenceContext(), idValue); + beanDescriptor.contextClear(transaction.persistenceContext(), idValue); } private void changeLog() { @@ -952,7 +952,7 @@ private void logSummaryMessage() { * Add the request to TransactionEvent if there are post commit listeners. */ private void addPostCommitListeners() { - TransactionEvent event = transaction.getEvent(); + TransactionEvent event = transaction.event(); if (event != null && isNotifyListeners()) { event.addListenerNotify(this); } @@ -984,7 +984,7 @@ private void postInsert() { } if (transaction.isAutoPersistUpdates() && idValue != null) { // with getGeneratedKeys off we will not have a idValue - beanDescriptor.contextPut(transaction.getPersistenceContext(), idValue, entityBean); + beanDescriptor.contextPut(transaction.persistenceContext(), idValue, entityBean); } } @@ -1057,7 +1057,7 @@ private void notifyCacheOnPostExecute() { postExecute = true; if (notifyCache && complete) { // add cache notification (on batch persist) - TransactionEvent event = transaction.getEvent(); + TransactionEvent event = transaction.event(); if (event != null) { notifyCache(event.obtainCacheChangeSet()); } @@ -1071,7 +1071,7 @@ private void notifyCacheOnComplete() { complete = true; if (notifyCache && postExecute) { // add cache notification (on non-batch persist) - TransactionEvent event = transaction.getEvent(); + TransactionEvent event = transaction.event(); if (event != null) { notifyCache(event.obtainCacheChangeSet()); } @@ -1187,7 +1187,7 @@ public long version() { } private void setTenantId() { - Object tenantId = transaction.getTenantId(); + Object tenantId = transaction.tenantId(); if (tenantId != null) { beanDescriptor.setTenantId(entityBean, tenantId); } @@ -1242,13 +1242,13 @@ public void docStorePersist() { // processing now so set IGNORE (unlike DB + DocStore processing with post-commit) docStoreMode = DocStoreMode.IGNORE; try { - docStoreUpdate(transaction.getDocStoreTransaction().obtain()); + docStoreUpdate(transaction.docStoreTransaction().obtain()); postExecute(); if (type == Type.UPDATE && beanDescriptor.isDocStoreEmbeddedInvalidation() && transaction.isPersistCascade()) { // queue embedded/nested updates for later processing - beanDescriptor.docStoreUpdateEmbedded(this, transaction.getDocStoreTransaction().queue()); + beanDescriptor.docStoreUpdateEmbedded(this, transaction.docStoreTransaction().queue()); } } catch (IOException e) { throw new PersistenceException("Error persisting doc store bean", e); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java index 217bb0e5ce..52ae6c9334 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java @@ -86,9 +86,9 @@ public void postExecute() { } // register table modifications with the transaction event - TransactionEventTable tableEvents = callableSql.getTransactionEventTable(); + TransactionEventTable tableEvents = callableSql.transactionEventTable(); if (tableEvents != null && !tableEvents.isEmpty()) { - transaction.getEvent().add(tableEvents); + transaction.event().add(tableEvents); } else { transaction.markNotQueryOnly(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java index 7707be1db4..03aa874f8d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java @@ -19,7 +19,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest { private String bindLog; public PersistRequestOrmUpdate(SpiEbeanServer server, BeanManager mgr, SpiUpdate ormUpdate, SpiTransaction t, PersistExecute persistExecute) { - super(server, t, persistExecute, ormUpdate.getLabel()); + super(server, t, persistExecute, ormUpdate.label()); this.beanDescriptor = mgr.getBeanDescriptor(); this.ormUpdate = ormUpdate; } @@ -80,8 +80,8 @@ public void postExecute() { if (startNanos > 0) { persistExecute.collectOrmUpdate(label, startNanos); } - OrmUpdateType ormUpdateType = ormUpdate.getOrmUpdateType(); - String tableName = ormUpdate.getBaseTable(); + OrmUpdateType ormUpdateType = ormUpdate.ormUpdateType(); + String tableName = ormUpdate.baseTable(); if (transaction.isLogSummary()) { transaction.logSummary("{0} table[{1}] rows[{2}] bind[{3}]", ormUpdateType, tableName, rowCount, bindLog); } @@ -90,13 +90,13 @@ public void postExecute() { // this is used to invalidate cached objects etc switch (ormUpdateType) { case INSERT: - transaction.getEvent().add(tableName, true, false, false); + transaction.event().add(tableName, true, false, false); break; case UPDATE: - transaction.getEvent().add(tableName, false, true, false); + transaction.event().add(tableName, false, true, false); break; case DELETE: - transaction.getEvent().add(tableName, false, false, true); + transaction.event().add(tableName, false, false, true); break; default: break; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java index f0b5f31faa..e4f0c023f9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java @@ -65,7 +65,7 @@ public void executeAddBatch() { * Add this request to BatchControl to flush later. */ public void addToFlushQueue(int pos) { - BatchControl control = transaction.getBatchControl(); + BatchControl control = transaction.batchControl(); if (control == null) { control = persistExecute.createBatchControl(transaction); } @@ -167,13 +167,13 @@ public void postExecute() { // this is used to invalidate cached objects etc switch (sqlType) { case SQL_INSERT: - transaction.getEvent().add(tableName, true, false, false); + transaction.event().add(tableName, true, false, false); break; case SQL_UPDATE: - transaction.getEvent().add(tableName, false, true, false); + transaction.event().add(tableName, false, true, false); break; case SQL_DELETE: - transaction.getEvent().add(tableName, false, false, true); + transaction.event().add(tableName, false, false, true); break; case SQL_UNKNOWN: transaction.markNotQueryOnly(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java index d1aae9fb26..a2b0480db4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java @@ -48,7 +48,7 @@ public static CQueryCollectionAdd create(SpiQuery.Type manyType, OrmQuery } else if (manyType == SpiQuery.Type.MAP) { BeanDescriptor target = request.descriptor(); - ElPropertyValue elProperty = target.elGetValue(request.query().getMapKey()); + ElPropertyValue elProperty = target.elGetValue(request.query().mapKey()); return new BeanMapQueryHelp<>(elProperty); } else { 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 15d05881d4..c34a79a709 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 @@ -1618,7 +1618,7 @@ private BeanProperty findWhenModifiedProperty() { * Return the many property included in the query or null if one is not. */ public BeanPropertyAssocMany manyProperty(SpiQuery query) { - OrmQueryDetail detail = query.getDetail(); + OrmQueryDetail detail = query.detail(); for (BeanPropertyAssocMany many : propertiesMany) { if (detail.includesPath(many.name())) { return many; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 7d3e64eb31..79a20ce129 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -755,7 +755,7 @@ boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, String key, Pers void cacheUpdateQuery(boolean update, SpiTransaction transaction) { if (invalidateQueryCache || cacheNotifyOnAll || (!update && cacheNotifyOnDelete)) { - transaction.getEvent().add(desc.baseTable(), false, update, !update); + transaction.event().add(desc.baseTable(), false, update, !update); } } 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 a6c861e403..1ce1e7f2d8 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 @@ -421,11 +421,11 @@ public String assocIsEmpty(SpiExpressionRequest request, String path) { if (hasJoinTable()) { sb.append(query.isAsDraft() ? intersectionDraftTable : intersectionPublishTable); } else { - sb.append(targetDescriptor.baseTable(query.getTemporalMode())); + sb.append(targetDescriptor.baseTable(query.temporalMode())); } if (needsX2Table && hasJoinTable()) { sb.append(" x join "); - sb.append(targetDescriptor.baseTable(query.getTemporalMode())); + sb.append(targetDescriptor.baseTable(query.temporalMode())); sb.append(" x2 on "); inverseJoin.addJoin("x2", "x", sb); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java index 7f5e6126bd..60e3fdf1cf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java @@ -18,9 +18,9 @@ public final class DtoMappingRequest { private final DtoColumn[] columnMeta; public DtoMappingRequest(SpiDtoQuery query, String sql, DtoColumn[] columnMeta) { - this.type = query.getType(); - this.label = query.getPlanLabel(); - this.profileLocation = query.getProfileLocation(); + this.type = query.type(); + this.label = query.planLabel(); + this.profileLocation = query.profileLocation(); this.sql = sql; this.relaxedMode = query.isRelaxedMode(); this.columnMeta = columnMeta; 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 2898b50ebc..83419a22f8 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 @@ -558,12 +558,12 @@ public ExpressionList add(Expression expr) { @Override public ExpressionList addAll(ExpressionList exprList) { SpiExpressionList spiList = (SpiExpressionList) exprList; - list.addAll(spiList.getUnderlyingList()); + list.addAll(spiList.underlyingList()); return this; } @Override - public List getUnderlyingList() { + public List underlyingList() { return list; } 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 d58a6fdfed..f9956f1067 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 @@ -21,7 +21,7 @@ public final class FilterExpressionList extends DefaultExpressionList { private String orderByClause; public FilterExpressionList(FilterExprPath pathPrefix, FilterExpressionList original) { - super(null, original.expr, null, original.getUnderlyingList()); + super(null, original.expr, null, original.underlyingList()); this.pathPrefix = pathPrefix; this.rootQuery = original.rootQuery; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java index 8f1f48d38d..2a73d64b30 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java @@ -50,7 +50,7 @@ enum Mode { this.type = type; this.beanDescriptor = beanDescriptor; this.original = original; - this.origUnderlying = original.getUnderlyingList(); + this.origUnderlying = original.underlyingList(); this.origSize = origUnderlying.size(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java index 0b767b71ff..ca49bdcb39 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java @@ -52,7 +52,7 @@ abstract class DLoadBaseContext { void setLabel(SpiQuery query) { String label = parent.planLabel(); if (label != null) { - query.setProfilePath(label, fullPath + "(" + query.getLoadMode() + ")", parent.profileLocation()); + query.setProfilePath(label, fullPath + "(" + query.loadMode() + ")", parent.profileLocation()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index b8ac78b849..14d486325f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -89,16 +89,16 @@ public DLoadContext(OrmQueryRequest request, SpiQuerySecondary secondaryQueri this.useDocStore = query.isUseDocStore(); this.asOf = query.getAsOf(); this.asDraft = query.isAsDraft(); - this.includeSoftDeletes = query.isIncludeSoftDeletes() && query.getMode() == SpiQuery.Mode.NORMAL; + this.includeSoftDeletes = query.isIncludeSoftDeletes() && query.mode() == SpiQuery.Mode.NORMAL; this.readOnly = query.isReadOnly(); this.disableReadAudit = query.isDisableReadAudit(); this.disableLazyLoading = query.isDisableLazyLoading(); - this.useBeanCache = query.getUseBeanCache(); - this.profilingListener = query.getProfilingListener(); - this.planLabel = query.getPlanLabel(); - this.profileLocation = query.getProfileLocation(); + this.useBeanCache = query.beanCacheMode(); + this.profilingListener = query.profilingListener(); + this.planLabel = query.planLabel(); + this.profileLocation = query.profileLocation(); - ObjectGraphNode parentNode = query.getParentNode(); + ObjectGraphNode parentNode = query.parentNode(); if (parentNode != null) { this.origin = parentNode.origin(); this.relativePath = parentNode.path(); @@ -129,13 +129,13 @@ public ProfileLocation profileLocation() { * Register the +query and +lazy secondary queries with their appropriate LoadBeanContext or LoadManyContext. */ private void registerSecondaryQueries(SpiQuerySecondary secondaryQueries) { - this.secQuery = secondaryQueries.getQueryJoins(); + this.secQuery = secondaryQueries.queryJoins(); if (secQuery != null) { for (OrmQueryProperties pathProperties : secQuery) { registerSecondaryQuery(pathProperties); } } - List lazyJoins = secondaryQueries.getLazyJoins(); + List lazyJoins = secondaryQueries.lazyJoins(); if (lazyJoins != null) { for (OrmQueryProperties lazyJoin : lazyJoins) { registerSecondaryQuery(lazyJoin); 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 c63f326741..7edcc3f22c 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 @@ -105,13 +105,13 @@ private void bind(List list, DataBind dataBind, StringBuilder for (BindParams.Param param : list) { if (param.isOutParam() && cstmt != null) { - cstmt.registerOutParameter(dataBind.nextPos(), param.getType()); + cstmt.registerOutParameter(dataBind.nextPos(), param.type()); if (param.isInParam()) { dataBind.decrementPos(); } } if (param.isInParam()) { - value = param.getInValue(); + value = param.inValue(); if (bindLog != null) { if (bindLog.length() > 0) { bindLog.append(", "); @@ -128,7 +128,7 @@ private void bind(List list, DataBind dataBind, StringBuilder } } else if (value == null) { // this doesn't work for query predicates - bindObject(dataBind, null, param.getType()); + bindObject(dataBind, null, param.type()); } else { bindObject(dataBind, value); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 24a5e4f1cb..3d54c01673 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -72,7 +72,7 @@ public int executeCallable(CallableSql callSql, Transaction t) { @Override public int executeOrmUpdate(Update update, Transaction t) { SpiUpdate ormUpdate = (SpiUpdate) update; - BeanManager mgr = beanManager(ormUpdate.getBeanType()); + BeanManager mgr = beanManager(ormUpdate.beanType()); return executeOrQueue(new PersistRequestOrmUpdate(server, mgr, ormUpdate, (SpiTransaction) t, persistExecute)); } @@ -97,7 +97,7 @@ public void addBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) { @Override public int[] executeBatch(SpiSqlUpdate sqlUpdate, SpiTransaction transaction) { - BatchControl batchControl = transaction.getBatchControl(); + BatchControl batchControl = transaction.batchControl(); try { return batchControl.execute(sqlUpdate.getGeneratedSql(), sqlUpdate.isGetGeneratedKeys()); } catch (SQLException e) { @@ -761,14 +761,14 @@ private int deleteBatch(BeanDescriptor descriptor, Object id, List id notifyDeleteById(descriptor, id, idList, transaction); deleteById.setAutoTableMod(false); if (idList != null) { - t.getEvent().addDeleteByIdList(descriptor, idList); + t.event().addDeleteByIdList(descriptor, idList); } else { - t.getEvent().addDeleteById(descriptor, id); + t.event().addDeleteById(descriptor, id); } int rows = executeSqlUpdate(deleteById, t); // Delete from the persistence context so that it can't be fetched again later - PersistenceContext persistenceContext = t.getPersistenceContext(); + PersistenceContext persistenceContext = t.persistenceContext(); if (idList != null) { for (Object idValue : idList) { descriptor.contextDeleted(persistenceContext, idValue); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java index 1849cb811d..a39c4b3c0b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java @@ -60,7 +60,7 @@ private CallableStatement bindStmt(PersistRequestCallableSql request, boolean ba SpiTransaction t = request.transaction(); String sql = callableSql.getSql(); - BindParams bindParams = callableSql.getBindParams(); + BindParams bindParams = callableSql.bindParams(); // process named parameters if required sql = BindParamsParser.parse(bindParams, sql); @@ -80,7 +80,7 @@ private CallableStatement bindStmt(PersistRequestCallableSql request, boolean ba } String bindLog = null; if (!bindParams.isEmpty()) { - bindLog = binder.bind(bindParams, cstmt, t.getInternalConnection()); + bindLog = binder.bind(bindParams, cstmt, t.internalConnection()); } request.setBindLog(bindLog); // required to read OUT params later 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 1725c52423..fb166d49d1 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 @@ -39,8 +39,8 @@ public int execute(PersistRequestOrmUpdate request) { return -1; } else { SpiUpdate ormUpdate = request.ormUpdate(); - if (ormUpdate.getTimeout() > 0) { - pstmt.setQueryTimeout(ormUpdate.getTimeout()); + if (ormUpdate.timeout() > 0) { + pstmt.setQueryTimeout(ormUpdate.timeout()); } int rowCount = pstmt.executeUpdate(); request.checkRowCount(rowCount); @@ -71,11 +71,11 @@ private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batc SpiUpdate ormUpdate = request.ormUpdate(); SpiTransaction t = request.transaction(); - String sql = ormUpdate.getUpdateStatement(); + String sql = ormUpdate.updateStatement(); // convert bean and property names to table and // column names if required sql = translate(request, sql); - BindParams bindParams = ormUpdate.getBindParams(); + BindParams bindParams = ormUpdate.bindParams(); // process named parameters if required sql = BindParamsParser.parse(bindParams, sql); ormUpdate.setGeneratedSql(sql); @@ -91,7 +91,7 @@ private PreparedStatement bindStmt(PersistRequestOrmUpdate request, boolean batc } String bindLog = null; if (!bindParams.isEmpty()) { - bindLog = binder.bind(bindParams, pstmt, t.getInternalConnection()); + bindLog = binder.bind(bindParams, pstmt, t.internalConnection()); } request.setBindLog(bindLog); return pstmt; 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 20b20ef71f..cd1aad8a2f 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 @@ -77,10 +77,10 @@ private PreparedStatement bindStmt(PersistRequestUpdateSql request, boolean batc SpiSqlUpdate updateSql = request.updateSql(); SpiTransaction t = request.transaction(); - BindParams bindParams = updateSql.getBindParams(); + BindParams bindParams = updateSql.bindParams(); // process named parameters if required - String sql = updateSql.getBaseSql(); + String sql = updateSql.baseSql(); sql = BindParamsParser.parse(bindParams, sql); parseUpdate(sql, request); @@ -95,7 +95,7 @@ private PreparedStatement bindStmt(PersistRequestUpdateSql request, boolean batc } String bindLog = null; if (!bindParams.isEmpty()) { - bindLog = binder.bind(bindParams, pstmt, t.getInternalConnection()); + bindLog = binder.bind(bindParams, pstmt, t.internalConnection()); } request.setBindLog(bindLog); updateSql.setGeneratedSql(sql); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java index 39f0ead4de..3c8eca4e2e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java @@ -21,7 +21,7 @@ final class PstmtFactory { * Get a callable statement without any batching. */ CallableStatement cstmt(SpiTransaction t, String sql) throws SQLException { - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); return conn.prepareCall(sql); } @@ -29,7 +29,7 @@ CallableStatement cstmt(SpiTransaction t, String sql) throws SQLException { * Get a prepared statement without any batching. */ PreparedStatement pstmt(SpiTransaction t, String sql, boolean getGeneratedKeys) throws SQLException { - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); if (getGeneratedKeys) { return conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); } else { @@ -41,7 +41,7 @@ PreparedStatement pstmt(SpiTransaction t, String sql, boolean getGeneratedKeys) * Return a prepared statement taking into account batch requirements. */ PreparedStatement pstmtBatch(SpiTransaction t, String sql, BatchPostExecute batchExe) throws SQLException { - BatchedPstmtHolder batch = t.getBatchControl().pstmtHolder(); + BatchedPstmtHolder batch = t.batchControl().pstmtHolder(); BatchedPstmt existingStmt = batch.batchedPstmt(sql); if (existingStmt != null) { if (existingStmt.isEmpty() && t.isLogSql()) { @@ -52,7 +52,7 @@ PreparedStatement pstmtBatch(SpiTransaction t, String sql, BatchPostExecute batc if (t.isLogSql()) { t.logSql(TrimLogSql.trim(sql)); } - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); PreparedStatement stmt = conn.prepareStatement(sql); BatchedPstmt bs = new BatchedPstmt(stmt, false, sql, t); batch.addStmt(bs, batchExe); @@ -63,7 +63,7 @@ PreparedStatement pstmtBatch(SpiTransaction t, String sql, BatchPostExecute batc * Return a callable statement taking into account batch requirements. */ CallableStatement cstmtBatch(SpiTransaction t, boolean logSql, String sql, BatchPostExecute batchExe) throws SQLException { - BatchedPstmtHolder batch = t.getBatchControl().pstmtHolder(); + BatchedPstmtHolder batch = t.batchControl().pstmtHolder(); CallableStatement stmt = (CallableStatement) batch.stmt(sql, batchExe); if (stmt != null) { return stmt; @@ -71,7 +71,7 @@ CallableStatement cstmtBatch(SpiTransaction t, boolean logSql, String sql, Batch if (logSql) { t.logSql(sql); } - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); stmt = conn.prepareCall(sql); BatchedPstmt bs = new BatchedPstmt(stmt, false, sql, t); batch.addStmt(bs, batchExe); 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 ec2ab6a32f..338099eedf 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 @@ -179,7 +179,7 @@ private void saveAllBeans(final BeanProperty orderColumn) { if (hasOrderColumn && !clearedParent) { // Clear the parent bean from the PersistenceContext (L1 cache), because the order of referenced beans might have changed final BeanDescriptor beanDescriptor = many.descriptor(); - beanDescriptor.contextClear(transaction.getPersistenceContext(), beanDescriptor.getId(parentBean)); + beanDescriptor.contextClear(transaction.persistenceContext(), beanDescriptor.getId(parentBean)); clearedParent = true; } } 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 54d318a0ab..478e86ed78 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 @@ -66,7 +66,7 @@ public PersistRequestBean getPersistRequest() { * Bind to the statement returning the DataBind. */ DataBind bind(PreparedStatement stmt) { - return new DataBind(persistRequest.dataTimeZone(), stmt, transaction.getInternalConnection()); + return new DataBind(persistRequest.dataTimeZone(), stmt, transaction.internalConnection()); } /** @@ -234,7 +234,7 @@ private void bindInternal(boolean log, Object value, BeanProperty prop) throws S * Check with useGeneratedKeys to get appropriate PreparedStatement. */ PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) throws SQLException { - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); if (genKeys) { // the Id generated is always the first column // Required to stop Oracle10 giving us Oracle rowId?? @@ -249,7 +249,7 @@ PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) throws * Return a prepared statement taking into account batch requirements. */ PreparedStatement getPstmtBatch(SpiTransaction t, String sql, PersistRequestBean request, boolean genKeys) throws SQLException { - BatchedPstmtHolder batch = t.getBatchControl().pstmtHolder(); + BatchedPstmtHolder batch = t.batchControl().pstmtHolder(); batchedPstmt = batch.batchedPstmt(sql); if (batchedPstmt != null) { batchedStatus = batchedPstmt.isEmpty() ? BATCHED_FIRST : BATCHED; 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 3e7ec1cd7a..399cae8d15 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 @@ -89,7 +89,7 @@ public void bind() throws SQLException { */ @Override PreparedStatement getPstmt(SpiTransaction t, String sql, boolean useGeneratedKeys) throws SQLException { - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); if (useGeneratedKeys) { return conn.prepareStatement(sql, meta.getIdentityDbColumns()); 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 01c6e3ce95..51dfa8a877 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 @@ -37,7 +37,7 @@ public void bind() throws SQLException { return; } - sql = updatePlan.getSql(); + sql = updatePlan.sql(); SpiTransaction t = persistRequest.transaction(); PreparedStatement pstmt; if (persistRequest.isBatched()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java index 69527de9b1..cba8411912 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java @@ -45,27 +45,27 @@ public void bindSet(DmlHandler bind, EntityBean bean) throws SQLException { } @Override - public long getTimeCreated() { + public long timeCreated() { return timeCreated; } @Override - public long getTimeLastUsed() { + public long timeLastUsed() { return timeLastUsed; } @Override - public String getKey() { + public String key() { return key; } @Override - public ConcurrencyMode getMode() { + public ConcurrencyMode mode() { return mode; } @Override - public String getSql() { + public String sql() { return sql; } 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 283bc032d6..4f63522b50 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 @@ -183,13 +183,13 @@ public CQuery(OrmQueryRequest request, CQueryPredicates predicates, CQueryPla this.audit = request.isAuditReads(); this.queryPlan = queryPlan; this.query = request.query(); - this.queryMode = query.getMode(); + this.queryMode = query.mode(); this.loadContextBean = queryMode.isLoadContextBean() || query.getForUpdateLockType() != null; - this.lazyLoadManyProperty = query.getLazyLoadMany(); + this.lazyLoadManyProperty = query.lazyLoadMany(); this.readOnly = request.isReadOnly(); this.disableLazyLoading = query.isDisableLazyLoading(); - this.objectGraphNode = query.getParentNode(); - this.profilingListener = query.getProfilingListener(); + this.objectGraphNode = query.parentNode(); + this.profilingListener = query.profilingListener(); this.autoTuneProfiling = profilingListener != null; // set the generated sql back to the query // so its available to the user... @@ -214,7 +214,7 @@ private CQueryCollectionAdd createHelp(OrmQueryRequest request) { if (request.isFindById()) { return null; } else { - SpiQuery.Type manyType = request.query().getType(); + SpiQuery.Type manyType = request.query().type(); if (manyType == null) { // subQuery compiled for InQueryExpression return null; @@ -312,7 +312,7 @@ ResultSet prepareResultSet(boolean forwardOnlyHint) throws SQLException { SpiTransaction t = request.transaction(); profileOffset = t.profileOffset(); if (query.isRawSql()) { - ResultSet suppliedResultSet = query.getRawSql().getResultSet(); + ResultSet suppliedResultSet = query.rawSql().getResultSet(); if (suppliedResultSet != null) { // this is a user supplied ResultSet so use that bindLog = ""; @@ -320,7 +320,7 @@ ResultSet prepareResultSet(boolean forwardOnlyHint) throws SQLException { } } - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); if (forwardOnlyHint) { // Use forward only hints for large resultSet processing (Issue 56, MySql specific) pstmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); @@ -328,11 +328,11 @@ ResultSet prepareResultSet(boolean forwardOnlyHint) throws SQLException { } else { pstmt = conn.prepareStatement(sql); } - if (query.getTimeout() > 0) { - pstmt.setQueryTimeout(query.getTimeout()); + if (query.timeout() > 0) { + pstmt.setQueryTimeout(query.timeout()); } - if (query.getBufferFetchSizeHint() > 0) { - pstmt.setFetchSize(query.getBufferFetchSizeHint()); + if (query.bufferFetchSizeHint() > 0) { + pstmt.setFetchSize(query.bufferFetchSizeHint()); } bindLog = predicates.bind(queryPlan.bindEncryptedProperties(pstmt, conn)); } finally { @@ -566,7 +566,7 @@ private void updateStatistics() { public void profile() { transaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), loadedBeanCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), loadedBeanCount, query.profileId()); } QueryIterator readIterate(int bufferSize, OrmQueryRequest request) { @@ -695,7 +695,7 @@ void auditFind(EntityBean bean) { void auditFindMany() { if (auditIds != null && !auditIds.isEmpty()) { // get the id values of the underlying collection - ReadEvent futureReadEvent = query.getFutureFetchAudit(); + ReadEvent futureReadEvent = query.futureFetchAudit(); if (futureReadEvent == null) { // normal query execution desc.readAuditMany(queryPlan.auditQueryKey(), bindLog, auditIds); 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 bf5ecc1d68..e9e58f78a0 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 @@ -1,7 +1,6 @@ package io.ebeaninternal.server.query; import io.ebean.CountDistinctOrder; -import io.ebean.OrderBy; import io.ebean.Query; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; @@ -91,7 +90,7 @@ static String prefixOrderByFields(String name, String orderBy) { */ CQueryUpdate buildUpdateQuery(boolean deleteRequest, OrmQueryRequest request) { SpiQuery query = request.query(); - String rootTableAlias = query.getAlias(); + String rootTableAlias = query.alias(); query.setupForDeleteOrUpdate(); CQueryPredicates predicates = new CQueryPredicates(binder, request); @@ -183,7 +182,7 @@ CQueryFetchSingleAttribute buildFetchAttributeQuery(OrmQueryRequest request) if (!query.isIncludeSoftDeletes()) { BeanDescriptor desc = request.descriptor(); if (desc.isSoftDelete()) { - query.addSoftDeletePredicate(desc.softDeletePredicate(alias(query.getAlias()))); + query.addSoftDeletePredicate(desc.softDeletePredicate(alias(query.alias()))); } } CQueryPredicates predicates = new CQueryPredicates(binder, request); @@ -211,7 +210,7 @@ CQueryFetchSingleAttribute buildFetchIdsQuery(OrmQueryRequest request) { query.setSelectId(); BeanDescriptor desc = request.descriptor(); if (!query.isIncludeSoftDeletes() && desc.isSoftDelete()) { - query.addSoftDeletePredicate(desc.softDeletePredicate(alias(query.getAlias()))); + query.addSoftDeletePredicate(desc.softDeletePredicate(alias(query.alias()))); } return buildFetchAttributeQuery(request); } @@ -220,14 +219,14 @@ CQueryFetchSingleAttribute buildFetchIdsQuery(OrmQueryRequest request) { * Return the history support if this query needs it (is a 'as of' type query). */ CQueryHistorySupport historySupport(SpiQuery query) { - return query.getTemporalMode().isHistory() ? historySupport : null; + return query.temporalMode().isHistory() ? historySupport : null; } /** * Return the draft support (or null) for a 'asDraft' query. */ CQueryDraftSupport draftSupport(SpiQuery query) { - return query.getTemporalMode() == SpiQuery.TemporalMode.DRAFT ? draftSupport : null; + return query.temporalMode() == SpiQuery.TemporalMode.DRAFT ? draftSupport : null; } /** @@ -260,7 +259,7 @@ CQueryRowCount buildRowCountQuery(OrmQueryRequest request) { predicates.prepare(true); SqlTree sqlTree = createSqlTree(request, predicates, selectCountWithColumnAlias && withAgg); - if (SpiQuery.TemporalMode.CURRENT == query.getTemporalMode()) { + if (SpiQuery.TemporalMode.CURRENT == query.temporalMode()) { sqlTree.addSoftDeletePredicate(query); } @@ -298,7 +297,7 @@ CQueryRowCount buildRowCountQuery(OrmQueryRequest request) { * Return true if the query includes an aggregation property. */ private boolean includesAggregation(OrmQueryRequest request, SpiQuery query) { - return request.descriptor().includesAggregation(query.getDetail()); + return request.descriptor().includesAggregation(query.detail()); } private String wrapSelectCount(String sql) { @@ -335,7 +334,7 @@ CQuery buildQuery(OrmQueryRequest request) { SqlTree sqlTree = createSqlTree(request, predicates); if (query.isAsOfQuery()) { sqlTree.addAsOfTableAlias(query); - } else if (SpiQuery.TemporalMode.CURRENT == query.getTemporalMode()) { + } else if (SpiQuery.TemporalMode.CURRENT == query.temporalMode()) { sqlTree.addSoftDeletePredicate(query); } @@ -391,12 +390,12 @@ private String nativeQueryPaging(SpiQuery query, String sql) { private SqlTree createNativeSqlTree(OrmQueryRequest request, CQueryPredicates predicates) { SpiQuery query = request.query(); // parse named parameters returning the final sql to execute - String sql = predicates.parseBindParams(query.getNativeSql()); + String sql = predicates.parseBindParams(query.nativeSql()); if (query.hasMaxRowsOrFirstRow()) { sql = nativeQueryPaging(query, sql); } query.setGeneratedSql(sql); - Connection connection = request.transaction().getInternalConnection(); + Connection connection = request.transaction().internalConnection(); BeanDescriptor desc = request.descriptor(); try { // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable @@ -429,7 +428,7 @@ private String lower(String value) { private SqlTree createRawSqlSqlTree(OrmQueryRequest request, CQueryPredicates predicates) { BeanDescriptor descriptor = request.descriptor(); - ColumnMapping columnMapping = request.query().getRawSql().getColumnMapping(); + ColumnMapping columnMapping = request.query().rawSql().getColumnMapping(); PathProperties pathProps = new PathProperties(); // convert list of columns into (tree like) PathProperties @@ -511,7 +510,7 @@ private SqlLimitResponse buildSql(String selectClause, OrmQueryRequest reques return new SqlLimitResponse(query.getGeneratedSql()); } if (query.isRawSql()) { - return rawSqlHandler.buildSql(request, predicates, query.getRawSql().getSql()); + return rawSqlHandler.buildSql(request, predicates, query.rawSql().getSql()); } return new BuildReq(selectClause, request, predicates, select).buildSql(); } @@ -649,7 +648,7 @@ private void appendFindId() { if (request.isFindById() || query.getId() != null) { appendAndOrWhere(); BeanDescriptor desc = request.descriptor(); - String idSql = desc.idBinderIdSql(query.getAlias()); + String idSql = desc.idBinderIdSql(query.alias()); if (idSql.isEmpty()) { throw new IllegalStateException("Executing FindById query on entity bean " + desc.name() + " that doesn't have an @Id property??"); @@ -671,7 +670,7 @@ private void appendToWhere(String predicate) { } private void appendSoftDelete() { - List softDeletePredicates = query.getSoftDeletePredicates(); + List softDeletePredicates = query.softDeletePredicates(); if (softDeletePredicates != null) { appendAndOrWhere(); for (int i = 0; i < softDeletePredicates.size(); i++) { @@ -707,7 +706,7 @@ private SqlLimitResponse buildSql() { } if (countSingleAttribute) { sb.append(") r1 group by r1.attribute_"); - sb.append(toSql(query.getCountDistinctOrder())); + sb.append(toSql(query.countDistinctOrder())); } if (useSqlLimiter) { // use LIMIT/OFFSET, ROW_NUMBER() or rownum type SQL query limitation diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java index 2963d979da..eac5fea14e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java @@ -32,7 +32,7 @@ SqlLimitResponse buildSql(OrmQueryRequest request, CQueryPredicates predicate } if (!rsql.isParsed()) { String sql = rsql.getUnparsedSql(); - BindParams bindParams = request.query().getBindParams(); + BindParams bindParams = request.query().bindParams(); if (bindParams != null && bindParams.requiresNamedParamsPrepare()) { // convert named parameters into positioned parameters sql = BindParamsParser.parse(bindParams, sql); @@ -57,7 +57,7 @@ SqlLimitResponse buildSql(OrmQueryRequest request, CQueryPredicates predicate private String buildMainQuery(String orderBy, OrmQueryRequest request, CQueryPredicates predicates, SpiRawSql.Sql sql) { StringBuilder sb = new StringBuilder(); - OrmQueryProperties ormQueryProperties = request.query().getDetail().getChunk(null, false); + OrmQueryProperties ormQueryProperties = request.query().detail().getChunk(null, false); if (ormQueryProperties.hasSelectClause()) { boolean first = true; for (String selectProperty : ormQueryProperties.getIncluded()) { @@ -73,7 +73,7 @@ private String buildMainQuery(String orderBy, OrmQueryRequest request, CQuery sb.append(" "); String s = sql.getPreWhere(); - BindParams bindParams = request.query().getBindParams(); + BindParams bindParams = request.query().bindParams(); if (bindParams != null && bindParams.requiresNamedParamsPrepare()) { // convert named parameters into positioned parameters // Named Parameters only allowed prior to dynamic where 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 4078d511b7..2d89e09681 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 @@ -198,7 +198,7 @@ public QueryIterator findIterate(OrmQueryRequest request) { int iterateBufferSize = request.secondaryQueriesMinBatchSize(); if (iterateBufferSize < 1) { // not set on query joins so check if batch size set on query itself - int queryBatch = request.query().getLazyLoadBatchSize(); + int queryBatch = request.query().lazyLoadBatchSize(); if (queryBatch > 0) { iterateBufferSize = queryBatch; } else { @@ -235,8 +235,8 @@ public List> findVersions(OrmQueryRequest request) { SpiQuery query = request.query(); String sysPeriodLower = getSysPeriodLower(query); if (query.isVersionsBetween() && !historySupport.isStandardsBased()) { - query.where().lt(sysPeriodLower, query.getVersionEnd()); - query.where().geOrNull(getSysPeriodUpper(query), query.getVersionStart()); + query.where().lt(sysPeriodLower, query.versionEnd()); + query.where().geOrNull(getSysPeriodUpper(query), query.versionStart()); } // order by lower sys period desc @@ -410,10 +410,10 @@ private void logSql(CQuery query) { */ private void logFindBeanSummary(CQuery q) { SpiQuery query = q.request().query(); - String loadMode = query.getLoadMode(); - String loadDesc = query.getLoadDescription(); - String lazyLoadProp = query.getLazyLoadProperty(); - ObjectGraphNode node = query.getParentNode(); + String loadMode = query.loadMode(); + String loadDesc = query.loadDescription(); + String lazyLoadProp = query.lazyLoadProperty(); + ObjectGraphNode node = query.parentNode(); String originKey; if (node == null || node.origin() == null) { originKey = null; @@ -453,10 +453,10 @@ private void logFindBeanSummary(CQuery q) { */ private void logFindManySummary(CQuery q) { SpiQuery query = q.request().query(); - String loadMode = query.getLoadMode(); - String loadDesc = query.getLoadDescription(); - String lazyLoadProp = query.getLazyLoadProperty(); - ObjectGraphNode node = query.getParentNode(); + String loadMode = query.loadMode(); + String loadDesc = query.loadDescription(); + String lazyLoadProp = query.lazyLoadProperty(); + ObjectGraphNode node = query.parentNode(); String originKey; if (node == null || node.origin() == null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index 78b20dc1c2..a687beae5c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -125,13 +125,13 @@ private void prepareExecute() throws SQLException { query.checkCancelled(); SpiTransaction t = transaction(); profileOffset = t.profileOffset(); - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); pstmt = conn.prepareStatement(sql); - if (query.getBufferFetchSizeHint() > 0) { - pstmt.setFetchSize(query.getBufferFetchSizeHint()); + if (query.bufferFetchSizeHint() > 0) { + pstmt.setFetchSize(query.bufferFetchSizeHint()); } - if (query.getTimeout() > 0) { - pstmt.setQueryTimeout(query.getTimeout()); + if (query.timeout() > 0) { + pstmt.setQueryTimeout(query.timeout()); } bindLog = predicates.bind(pstmt, conn); } finally { @@ -165,7 +165,7 @@ private void close() { public void profile() { transaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.profileId()); } Set dependentTables() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index ad52e4ecaa..fc982503df 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -85,10 +85,10 @@ public class CQueryPlan implements SpiQueryPlan { this.beanType = request.descriptor().type(); this.planKey = request.queryPlanKey(); SpiQuery query = request.query(); - this.profileLocation = query.getProfileLocation(); + this.profileLocation = query.profileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); - this.label = query.getPlanLabel(); - this.name = deriveName(label, query.getType(), request.descriptor().simpleName()); + this.label = query.planLabel(); + this.name = deriveName(label, query.type(), request.descriptor().simpleName()); this.asOfTableCount = query.getAsOfTableCount(); this.sql = sqlRes.getSql(); this.sqlTree = sqlTree; @@ -109,10 +109,10 @@ public class CQueryPlan implements SpiQueryPlan { this.dataTimeZone = server.dataTimeZone(); this.beanType = request.descriptor().type(); SpiQuery query = request.query(); - this.profileLocation = query.getProfileLocation(); + this.profileLocation = query.profileLocation(); this.location = (profileLocation == null) ? null : profileLocation.location(); - this.label = query.getPlanLabel(); - this.name = deriveName(label, query.getType(), request.descriptor().simpleName()); + this.label = query.planLabel(); + this.name = deriveName(label, query.type(), request.descriptor().simpleName()); this.planKey = buildPlanKey(sql, logWhereSql); this.asOfTableCount = 0; this.sql = sql; @@ -142,11 +142,11 @@ private String deriveName(String label, SpiQuery.Type type, String simpleName) { } private SpiQueryBindCapture initBindCapture(SpiQuery query) { - return query.getType().isUpdate() ? SpiQueryBindCapture.NOOP : server.createQueryBindCapture(this); + return query.type().isUpdate() ? SpiQueryBindCapture.NOOP : server.createQueryBindCapture(this); } private SpiQueryBindCapture initBindCaptureRaw(String sql, SpiQuery query) { - return sql.equals(RESULT_SET_BASED_RAW_SQL) || query.getType().isUpdate() ? SpiQueryBindCapture.NOOP : server.createQueryBindCapture(this); + return sql.equals(RESULT_SET_BASED_RAW_SQL) || query.type().isUpdate() ? SpiQueryBindCapture.NOOP : server.createQueryBindCapture(this); } private CQueryPlanKey buildPlanKey(String sql, String logWhereSql) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java index ac39f6beb6..b3a4091d41 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java @@ -30,8 +30,8 @@ public CQueryPlanManager(TransactionManager transactionManager, long defaultThre this.transactionManager = transactionManager; this.defaultThreshold = defaultThreshold; this.planLogger = planLogger; - this.timeCollection = extraMetrics.getPlanCollect(); - this.timeBindCapture = extraMetrics.getBindCapture(); + this.timeCollection = extraMetrics.planCollect(); + this.timeBindCapture = extraMetrics.bindCapture(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java index 935f730ec4..f19e3fd371 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java @@ -28,7 +28,7 @@ public DataReader createDataReader(ResultSet rset) { private int[] createIndexPositions(OrmQueryRequest request, SqlTree sqlTree) { List chain = sqlTree.buildRawSqlSelectChain(); - ColumnMapping columnMapping = request.query().getRawSql().getColumnMapping(); + ColumnMapping columnMapping = request.query().rawSql().getColumnMapping(); int[] indexPositions = new int[chain.size()]; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index 4058e00fcf..78b54d56d5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -76,7 +76,7 @@ public final class CQueryPredicates { this.binder = binder; this.request = request; this.query = request.query(); - this.bindParams = query.getBindParams(); + this.bindParams = query.bindParams(); this.idValue = query.getId(); } @@ -85,15 +85,15 @@ public String bind(PreparedStatement stmt, Connection connection) throws SQLExce } public String bind(DataBind dataBind) throws SQLException { - OrmUpdateProperties updateProperties = query.getUpdateProperties(); + OrmUpdateProperties updateProperties = query.updateProperties(); if (updateProperties != null) { // bind the update set clause updateProperties.bind(binder, dataBind); } if (query.isVersionsBetween() && binder.isAsOfStandardsBased()) { // sql2011 based versions between timestamp syntax - Timestamp start = query.getVersionStart(); - Timestamp end = query.getVersionEnd(); + Timestamp start = query.versionStart(); + Timestamp end = query.versionEnd(); dataBind.append("between ").append(start).append(" and ").append(end); binder.bindObject(dataBind, start); binder.bindObject(dataBind, end); @@ -137,7 +137,7 @@ public String bind(DataBind dataBind) throws SQLException { private void buildUpdateClause(boolean buildSql, DeployParser deployParser) { if (buildSql) { - OrmUpdateProperties updateProperties = query.getUpdateProperties(); + OrmUpdateProperties updateProperties = query.updateProperties(); if (updateProperties != null) { dbUpdateClause = updateProperties.buildSetClause(deployParser); } @@ -159,14 +159,14 @@ private void buildBindWhereRawSql(boolean buildSql) { if (!buildSql && bindParams != null && bindParams.requiresNamedParamsPrepare()) { if (query.isNativeSql()) { // convert named params into positioned params - String sql = query.getNativeSql(); + String sql = query.nativeSql(); BindParamsParser.parse(bindParams, sql); } else if (query.isRawSql()) { // RawSql query hit cached query plan. Need to convert // named parameters into positioned parameters so that // the named parameters are bound - SpiRawSql.Sql sql = query.getRawSql().getSql(); + SpiRawSql.Sql sql = query.rawSql().getSql(); String s = sql.isParsed() ? sql.getPreWhere() : sql.getUnparsedSql(); BindParamsParser.parse(bindParams, s); } @@ -187,7 +187,7 @@ public void prepare(boolean buildSql) { // create a copy of the includes required to support the orderBy orderByIncludes = new HashSet<>(deployParser.includes()); } - SpiExpressionList whereExp = query.getWhereExpressions(); + SpiExpressionList whereExp = query.whereExpressions(); if (whereExp != null) { this.where = new DefaultExpressionRequest(request, deployParser, binder, whereExp); if (buildSql) { @@ -195,7 +195,7 @@ public void prepare(boolean buildSql) { } } if (manyProperty != null) { - OrmQueryProperties chunk = query.getDetail().getChunk(manyProperty.name(), false); + OrmQueryProperties chunk = query.detail().getChunk(manyProperty.name(), false); SpiExpressionList filterManyExpr = chunk.getFilterMany(); if (filterManyExpr != null) { this.filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr); @@ -204,7 +204,7 @@ public void prepare(boolean buildSql) { } } } - SpiExpressionList havingExpr = query.getHavingExpressions(); + SpiExpressionList havingExpr = query.havingExpressions(); if (havingExpr != null) { this.having = new DefaultExpressionRequest(request, deployParser, binder, havingExpr); if (buildSql) { 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 3b1865825c..4d43da157e 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 @@ -89,13 +89,13 @@ public int findCount() throws SQLException { try { SpiTransaction t = transaction(); profileOffset = t.profileOffset(); - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); lock.lock(); try { query.checkCancelled(); pstmt = conn.prepareStatement(sql); - if (query.getTimeout() > 0) { - pstmt.setQueryTimeout(query.getTimeout()); + if (query.timeout() > 0) { + pstmt.setQueryTimeout(query.timeout()); } bindLog = predicates.bind(pstmt, conn); } finally { @@ -137,7 +137,7 @@ private void close() { public void profile() { transaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.profileId()); } Set dependentTables() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java index edd8b348f7..85081238b9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java @@ -66,13 +66,13 @@ public int execute() throws SQLException { try { SpiTransaction t = transaction(); profileOffset = t.profileOffset(); - Connection conn = t.getInternalConnection(); + Connection conn = t.internalConnection(); lock.lock(); try { query.checkCancelled(); pstmt = conn.prepareStatement(sql); - if (query.getTimeout() > 0) { - pstmt.setQueryTimeout(query.getTimeout()); + if (query.timeout() > 0) { + pstmt.setQueryTimeout(query.timeout()); } bindLog = predicates.bind(pstmt, conn); } finally { @@ -113,7 +113,7 @@ private void close() { public void profile() { transaction() .profileStream() - .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId()); + .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.profileId()); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index 3c0a09dcb4..8a2465293d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -87,14 +87,14 @@ public final class SqlTreeBuilder { this.temporalMode = SpiQuery.TemporalMode.of(query); this.disableLazyLoad = query.isDisableLazyLoading(); this.readOnly = Boolean.TRUE.equals(query.isReadOnly()); - this.subQuery = Type.SQ_EXISTS == query.getType() - || Type.SQ_EX == query.getType() - || Type.ID_LIST == query.getType() - || Type.DELETE == query.getType() + this.subQuery = Type.SQ_EXISTS == query.type() + || Type.SQ_EX == query.type() + || Type.ID_LIST == query.type() + || Type.DELETE == query.type() || query.isCountDistinct(); - this.includeJoin = query.getM2mIncludeJoin(); - this.manyWhereJoins = query.getManyWhereJoins(); - this.queryDetail = query.getDetail(); + this.includeJoin = query.m2mIncludeJoin(); + this.manyWhereJoins = query.manyWhereJoins(); + this.queryDetail = query.detail(); this.predicates = predicates; this.alias = new SqlTreeAlias(request.baseTableAlias(), temporalMode); this.distinctOnPlatform = builder.isPlatformDistinctOn(); @@ -138,7 +138,7 @@ private String buildSelectClause() { if (rawSql) { return "Not Used"; } - if (query.getType() == Type.SQ_EXISTS) { + if (query.type() == Type.SQ_EXISTS) { // effective query is "where exists (select 1 from ...)" return "1"; } @@ -147,7 +147,7 @@ private String buildSelectClause() { } private String buildGroupByClause() { - if (rawSql || (!rootNode.isAggregation() && query.getHavingExpressions() == null)) { + if (rawSql || (!rootNode.isAggregation() && query.havingExpressions() == null)) { return null; } ctx.startGroupBy(); @@ -156,7 +156,7 @@ private String buildGroupByClause() { } private String buildDistinctOn() { - if (rawSql || !distinctOnPlatform || !sqlDistinct || Type.COUNT == query.getType()) { + if (rawSql || !distinctOnPlatform || !sqlDistinct || Type.COUNT == query.type()) { return null; } ctx.startGroupBy(); @@ -214,7 +214,7 @@ private void buildRoot(STreeType desc) { if (!rawSql) { alias.addJoin(queryDetail.getFetchPaths(), desc); alias.addJoin(predicates.predicateIncludes(), desc); - alias.addManyWhereJoins(manyWhereJoins.getPropertyNames()); + alias.addManyWhereJoins(manyWhereJoins.propertyNames()); // build set of table alias alias.buildAlias(); predicates.parseTableAlias(alias); @@ -259,7 +259,7 @@ private SqlTreeNode buildSelectChain(String prefix, STreePropertyAssoc prop, STr extraProps.forEach(props::addExtra); if (!rawSql && manyWhereJoins.isFormulaWithJoin(prefix)) { - for (String property : manyWhereJoins.getFormulaJoinProperties(prefix)) { + for (String property : manyWhereJoins.formulaJoinProperties(prefix)) { final STreeProperty beanProperty = desc.findPropertyFromPath(property); myJoinList.add(new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER, null)); } @@ -283,15 +283,15 @@ private SqlTreeNode buildSelectChain(String prefix, STreePropertyAssoc prop, STr *

*/ private void addManyWhereJoins(List myJoinList) { - Collection includes = manyWhereJoins.getPropertyJoins(); + Collection includes = manyWhereJoins.propertyJoins(); for (PropertyJoin joinProp : includes) { - STreePropertyAssoc beanProperty = (STreePropertyAssoc) desc.findPropertyFromPath(joinProp.getProperty()); - SqlTreeNodeManyWhereJoin nodeJoin = new SqlTreeNodeManyWhereJoin(joinProp.getProperty(), beanProperty, joinProp.getSqlJoinType(), temporalMode); + STreePropertyAssoc beanProperty = (STreePropertyAssoc) desc.findPropertyFromPath(joinProp.property()); + SqlTreeNodeManyWhereJoin nodeJoin = new SqlTreeNodeManyWhereJoin(joinProp.property(), beanProperty, joinProp.sqlJoinType(), temporalMode); myJoinList.add(nodeJoin); - if (manyWhereJoins.isFormulaWithJoin(joinProp.getProperty())) { - for (String property : manyWhereJoins.getFormulaJoinProperties(joinProp.getProperty())) { - STreeProperty beanProperty2 = desc.findPropertyFromPath(SplitName.add(joinProp.getProperty(), property)); - myJoinList.add(new SqlTreeNodeFormulaWhereJoin(beanProperty2, SqlJoinType.OUTER, joinProp.getProperty())); + if (manyWhereJoins.isFormulaWithJoin(joinProp.property())) { + for (String property : manyWhereJoins.formulaJoinProperties(joinProp.property())) { + STreeProperty beanProperty2 = desc.findPropertyFromPath(SplitName.add(joinProp.property(), property)); + myJoinList.add(new SqlTreeNodeFormulaWhereJoin(beanProperty2, SqlJoinType.OUTER, joinProp.property())); } } } @@ -302,10 +302,10 @@ private SqlTreeNode buildNode(String prefix, STreePropertyAssoc prop, STreeType buildExtraJoins(desc, myList); // Optional many property for lazy loading query - STreePropertyAssocMany lazyLoadMany = (query == null) ? null : query.getLazyLoadMany(); + STreePropertyAssocMany lazyLoadMany = (query == null) ? null : query.lazyLoadMany(); boolean withId = !rawNoId && !subQuery && (query == null || query.isWithId()); - String baseTable = (query == null) ? null : query.getBaseTable(); + String baseTable = (query == null) ? null : query.baseTable(); if (baseTable == null) { baseTable = desc.baseTable(temporalMode); } @@ -356,7 +356,7 @@ private void buildExtraJoins(STreeType desc, List myList) { // support the predicates or order by clauses. // remove ManyWhereJoins from the predicateIncludes - predicateIncludes.removeAll(manyWhereJoins.getPropertyNames()); + predicateIncludes.removeAll(manyWhereJoins.propertyNames()); predicateIncludes.addAll(predicates.orderByIncludes()); // look for predicateIncludes that are not in selectIncludes and add @@ -626,7 +626,7 @@ private void createExtraJoin(String includeProp) { // add many where joins if (manyWhereJoins.isFormulaWithJoin(includeProp)) { - for (String property : manyWhereJoins.getFormulaJoinProperties(includeProp)) { + for (String property : manyWhereJoins.formulaJoinProperties(includeProp)) { STreeProperty beanProperty = desc.findPropertyFromPath(SplitName.add(includeProp, property)); extraJoin.addChild(new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER, null)); } 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 a3cd1a9b7a..e9aa83bab4 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,8 +48,8 @@ public DefaultDtoQuery(SpiEbeanServer server, DtoBeanDescriptor descriptor, S this.server = server; this.descriptor = descriptor; this.ormQuery = ormQuery; - this.label = ormQuery.getLabel(); - this.profileLocation = ormQuery.getProfileLocation(); + this.label = ormQuery.label(); + this.profileLocation = ormQuery.profileLocation(); } /** @@ -68,7 +68,7 @@ public String planKey() { } @Override - public DtoQueryPlan getQueryPlan(Object planKey) { + public DtoQueryPlan queryPlan(Object planKey) { return descriptor.queryPlan(planKey); } @@ -205,17 +205,17 @@ public String toString() { } @Override - public Class getType() { + public Class type() { return descriptor.type(); } @Override - public SpiQuery getOrmQuery() { + public SpiQuery ormQuery() { return ormQuery; } @Override - public Transaction getTransaction() { + public Transaction transaction() { return transaction; } @@ -243,7 +243,7 @@ public String getLabel() { @Nullable @Override - public String getPlanLabel() { + public String planLabel() { if (label != null) { return label; } @@ -267,7 +267,7 @@ public DtoQuery setProfileLocation(ProfileLocation profileLocation) { } @Override - public ProfileLocation getProfileLocation() { + public ProfileLocation profileLocation() { return profileLocation; } 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 1b5dbff220..dce828bcff 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 @@ -189,7 +189,7 @@ public final UpdateQuery asUpdate() { } @Override - public final BeanDescriptor getBeanDescriptor() { + public final BeanDescriptor descriptor() { return beanDescriptor; } @@ -222,8 +222,8 @@ public final String profileEventId() { } @Override - public final String getProfileId() { - return getPlanLabel(); + public final String profileId() { + return planLabel(); } @Override @@ -233,12 +233,12 @@ public final Query setProfileLocation(ProfileLocation profileLocation) { } @Override - public final String getLabel() { + public final String label() { return label; } @Override - public final String getPlanLabel() { + public final String planLabel() { if (label != null) { return label; } @@ -291,7 +291,7 @@ public final void addSoftDeletePredicate(String softDeletePredicate) { } @Override - public final List getSoftDeletePredicates() { + public final List softDeletePredicates() { return softDeletePredicates; } @@ -364,7 +364,7 @@ public final String getDocIndexName() { } @Override - public final SpiRawSql getRawSql() { + public final SpiRawSql rawSql() { return rawSql; } @@ -384,7 +384,7 @@ public final String getOriginKey() { } @Override - public final int getLazyLoadBatchSize() { + public final int lazyLoadBatchSize() { return lazyLoadBatchSize; } @@ -395,7 +395,7 @@ public final Query setLazyLoadBatchSize(int lazyLoadBatchSize) { } @Override - public final String getLazyLoadProperty() { + public final String lazyLoadProperty() { return lazyLoadProperty; } @@ -432,7 +432,7 @@ private void createExtraJoinsToSupportManyWhereClause() { * Return the extra joins required to support the where clause for 'Many' properties. */ @Override - public final ManyWhereJoins getManyWhereJoins() { + public final ManyWhereJoins manyWhereJoins() { return manyWhereJoins; } @@ -524,7 +524,7 @@ public final void setTenantId(Object tenantId) { } @Override - public final Object getTenantId() { + public final Object tenantId() { return tenantId; } @@ -539,7 +539,7 @@ public final boolean tuneFetchProperties(OrmQueryDetail tunedDetail) { } @Override - public final OrmQueryDetail getDetail() { + public final OrmQueryDetail detail() { return detail; } @@ -617,7 +617,7 @@ public final boolean isSingleAttribute() { } @Override - public final CountDistinctOrder getCountDistinctOrder() { + public final CountDistinctOrder countDistinctOrder() { return countDistinctOrder; } @@ -634,7 +634,7 @@ public final CacheIdLookup cacheIdLookup() { if (whereExpressions == null) { return null; } - List underlyingList = whereExpressions.getUnderlyingList(); + List underlyingList = whereExpressions.underlyingList(); if (underlyingList.isEmpty()) { if (id != null) { return new CacheIdLookupSingle<>(id); @@ -664,7 +664,7 @@ public final NaturalKeyQueryData naturalKey() { } NaturalKeyQueryData data = new NaturalKeyQueryData<>(naturalKey); - for (SpiExpression expression : whereExpressions.getUnderlyingList()) { + for (SpiExpression expression : whereExpressions.underlyingList()) { // must be eq or in if (!expression.naturalKey(data)) { return null; @@ -674,10 +674,10 @@ public final NaturalKeyQueryData naturalKey() { } @Override - public final NaturalKeyBindParam getNaturalKeyBindParam() { + public final NaturalKeyBindParam naturalKeyBindParam() { NaturalKeyBindParam namedBind = null; if (bindParams != null) { - namedBind = bindParams.getNaturalKeyBindParam(); + namedBind = bindParams.naturalKeyBindParam(); if (namedBind == null) { return null; } @@ -765,12 +765,12 @@ public final Query setPersistenceContextScope(PersistenceContextScope scope) } @Override - public final PersistenceContextScope getPersistenceContextScope() { + public final PersistenceContextScope persistenceContextScope() { return persistenceContextScope; } @Override - public final Type getType() { + public final Type type() { return type; } @@ -780,12 +780,12 @@ public final void setType(Type type) { } @Override - public final String getLoadDescription() { + public final String loadDescription() { return loadDescription; } @Override - public final String getLoadMode() { + public final String loadMode() { return loadMode; } @@ -803,7 +803,7 @@ public final void setLoadDescription(String loadMode, String loadDescription) { *

*/ @Override - public final PersistenceContext getPersistenceContext() { + public final PersistenceContext persistenceContext() { return persistenceContext; } @@ -825,7 +825,7 @@ public final void setLazyLoadForParents(BeanPropertyAssocMany many) { } @Override - public final BeanPropertyAssocMany getLazyLoadMany() { + public final BeanPropertyAssocMany lazyLoadMany() { return lazyLoadForParentsProperty; } @@ -913,7 +913,7 @@ public final LockType getForUpdateLockType() { } @Override - public final ProfilingListener getProfilingListener() { + public final ProfilingListener profilingListener() { return profilingListener; } @@ -936,12 +936,12 @@ public final QueryType getQueryType() { } @Override - public final Mode getMode() { + public final Mode mode() { return mode; } @Override - public final TemporalMode getTemporalMode() { + public final TemporalMode temporalMode() { return temporalMode; } @@ -981,7 +981,7 @@ public final void setParentNode(ObjectGraphNode parentNode) { } @Override - public final ObjectGraphNode getParentNode() { + public final ObjectGraphNode parentNode() { return parentNode; } @@ -1113,12 +1113,12 @@ public final boolean isNativeSql() { } @Override - public final String getNativeSql() { + public final String nativeSql() { return nativeSql; } @Override - public final Object getQueryPlanKey() { + public final Object queryPlanKey() { return queryPlanKey; } @@ -1197,7 +1197,7 @@ public final boolean isRawSql() { * Return the timeout. */ @Override - public final int getTimeout() { + public final int timeout() { return timeout; } @@ -1212,12 +1212,12 @@ public final boolean isVersionsBetween() { } @Override - public final Timestamp getVersionStart() { + public final Timestamp versionStart() { return versionsStart; } @Override - public final Timestamp getVersionEnd() { + public final Timestamp versionEnd() { return versionsEnd; } @@ -1255,12 +1255,12 @@ public final void resetBeanCacheAutoMode(boolean findOne) { } @Override - public final CacheMode getUseBeanCache() { + public final CacheMode beanCacheMode() { return useBeanCache; } @Override - public final CacheMode getUseQueryCache() { + public final CacheMode queryCacheMode() { return useQueryCache; } @@ -1701,7 +1701,7 @@ public final String toString() { } @Override - public final TableJoin getM2mIncludeJoin() { + public final TableJoin m2mIncludeJoin() { return m2mIncludeJoin; } @@ -1744,7 +1744,7 @@ public final Query setMaxRows(int maxRows) { } @Override - public final String getMapKey() { + public final String mapKey() { return mapKey; } @@ -1769,7 +1769,7 @@ public final Query setId(Object id) { } @Override - public final BindParams getBindParams() { + public final BindParams bindParams() { return bindParams; } @@ -1826,17 +1826,17 @@ public final ExpressionList having() { } @Override - public final SpiExpressionList getHavingExpressions() { + public final SpiExpressionList havingExpressions() { return havingExpressions; } @Override - public final SpiExpressionList getWhereExpressions() { + public final SpiExpressionList whereExpressions() { return whereExpressions; } @Override - public final SpiExpressionList getTextExpression() { + public final SpiExpressionList textExpression() { return textExpressions; } @@ -1881,7 +1881,7 @@ public final Query setBufferFetchSizeHint(int bufferFetchSizeHint) { } @Override - public final int getBufferFetchSizeHint() { + public final int bufferFetchSizeHint() { return bufferFetchSizeHint; } @@ -1912,7 +1912,7 @@ public final void setFutureFetchAudit(ReadEvent event) { } @Override - public final ReadEvent getFutureFetchAudit() { + public final ReadEvent futureFetchAudit() { return futureFetchAudit; } @@ -1923,7 +1923,7 @@ public final Query setBaseTable(String baseTable) { } @Override - public final String getBaseTable() { + public final String baseTable() { return baseTable; } @@ -1934,7 +1934,7 @@ public final Query alias(String alias) { } @Override - public final String getAlias() { + public final String alias() { return rootTableAlias; } @@ -1966,7 +1966,7 @@ public final Set validate(BeanType desc) { validation.validate(property.getProperty()); } } - return validation.getUnknownProperties(); + return validation.unknownProperties(); } final void setUpdateProperties(OrmUpdateProperties updateProperties) { @@ -1974,12 +1974,12 @@ final void setUpdateProperties(OrmUpdateProperties updateProperties) { } @Override - public final OrmUpdateProperties getUpdateProperties() { + public final OrmUpdateProperties updateProperties() { return updateProperties; } @Override - public final ProfileLocation getProfileLocation() { + public final ProfileLocation profileLocation() { return profileLocation; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java index 3f0d306e8e..c35e3adefd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java @@ -51,7 +51,7 @@ public DefaultOrmUpdate setTimeout(int secs) { } @Override - public Class getBeanType() { + public Class beanType() { return beanType; } @@ -59,7 +59,7 @@ public Class getBeanType() { * Return the timeout in seconds. */ @Override - public int getTimeout() { + public int timeout() { return timeout; } @@ -127,12 +127,12 @@ public Update setLabel(String label) { } @Override - public String getLabel() { + public String label() { return label; } @Override - public String getUpdateStatement() { + public String updateStatement() { return updateStatement; } @@ -188,7 +188,7 @@ public DefaultOrmUpdate setNullParameter(String name, int jdbcType) { * Return the bind parameters. */ @Override - public BindParams getBindParams() { + public BindParams bindParams() { return bindParams; } @@ -203,12 +203,12 @@ public void setGeneratedSql(String generatedSql) { } @Override - public String getBaseTable() { + public String baseTable() { return baseTable; } @Override - public OrmUpdateType getOrmUpdateType() { + public OrmUpdateType ormUpdateType() { return type; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java index 2f062632d8..62e385cecd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java @@ -19,7 +19,7 @@ public final class DefaultUpdateQuery implements UpdateQuery { public DefaultUpdateQuery(DefaultOrmQuery query) { this.query = query; - this.descriptor = query.getBeanDescriptor(); + this.descriptor = query.descriptor(); query.setUpdateProperties(values); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java index 98864e7442..8b41ae8b0e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java @@ -231,7 +231,7 @@ public void configureBeanQuery(SpiQuery query) { if (filterMany != null) { filterMany.applyRowLimits(query); SpiExpressionList trimPath = filterMany.trimPath(path.length() + 1); - for (SpiExpression spiExpression : trimPath.getUnderlyingList()) { + for (SpiExpression spiExpression : trimPath.underlyingList()) { query.where().add(spiExpression); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java index 4d2a94b1c9..75372c7bcf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java @@ -24,7 +24,7 @@ final class OrmQuerySecondary implements SpiQuerySecondary { * Return a list of path/properties that are query join loaded. */ @Override - public List getQueryJoins() { + public List queryJoins() { return queryJoins; } @@ -32,7 +32,7 @@ public List getQueryJoins() { * Return the list of path/properties that are lazy loaded. */ @Override - public List getLazyJoins() { + public List lazyJoins() { return lazyJoins; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java index 55e4eb0f56..03756be484 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java @@ -30,7 +30,7 @@ protected void deactivate() { } @Override - public Connection getInternalConnection() { + public Connection internalConnection() { throw new RuntimeException("not supported on DocStoreTransaction"); } 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 f665662f6c..d2121b316c 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 @@ -80,7 +80,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve } @Override - public long getStartNanoTime() { + public long startNanoTime() { // not used on read only transaction return startNanos; } @@ -101,7 +101,7 @@ public void setLabel(String label) { } @Override - public String getLabel() { + public String label() { return null; } @@ -131,7 +131,7 @@ public void setProfileLocation(ProfileLocation profileLocation) { } @Override - public ProfileLocation getProfileLocation() { + public ProfileLocation profileLocation() { return profileLocation; } @@ -175,7 +175,7 @@ public void setDocStoreBatchSize(int docStoreBatchSize) { } @Override - public DocStoreMode getDocStoreMode() { + public DocStoreMode docStoreMode() { return null; } @@ -362,7 +362,7 @@ public boolean checkBatchEscalationOnCascade(PersistRequestBean request) { } @Override - public BatchControl getBatchControl() { + public BatchControl batchControl() { return null; } @@ -387,7 +387,7 @@ public void flush() { * Return the persistence context associated with this transaction. */ @Override - public SpiPersistenceContext getPersistenceContext() { + public SpiPersistenceContext persistenceContext() { return persistenceContext; } @@ -407,7 +407,7 @@ public void setPersistenceContext(SpiPersistenceContext context) { } @Override - public TransactionEvent getEvent() { + public TransactionEvent event() { throw new IllegalStateException(notExpectedMessage); } @@ -448,7 +448,7 @@ public void logTxn(String msg, Object... args) { * Return the transaction id. */ @Override - public String getId() { + public String id() { return null; } @@ -458,7 +458,7 @@ public void setTenantId(Object tenantId) { } @Override - public Object getTenantId() { + public Object tenantId() { return tenantId; } @@ -466,7 +466,7 @@ public Object getTenantId() { * Return the underlying connection for internal use. */ @Override - public Connection getInternalConnection() { + public Connection internalConnection() { if (!active) { throw new IllegalStateException(illegalStateMessage); } @@ -478,7 +478,7 @@ public Connection getInternalConnection() { */ @Override public Connection connection() { - return getInternalConnection(); + return internalConnection(); } private void deactivate() { @@ -608,7 +608,7 @@ public void addModification(String tableName, boolean inserts, boolean updates, } @Override - public DocStoreTransaction getDocStoreTransaction() { + public DocStoreTransaction docStoreTransaction() { throw new IllegalStateException(notExpectedMessage); } 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 a432a54d46..92c2efb4a2 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 @@ -136,12 +136,12 @@ public final void setLabel(String label) { } @Override - public final String getLabel() { + public final String label() { return label; } @Override - public final long getStartNanoTime() { + public final long startNanoTime() { return startNanos; } @@ -173,7 +173,7 @@ public final void setProfileLocation(ProfileLocation profileLocation) { } @Override - public final ProfileLocation getProfileLocation() { + public final ProfileLocation profileLocation() { return profileLocation; } @@ -300,7 +300,7 @@ public final void setDocStoreBatchSize(int docStoreBatchSize) { } @Override - public final DocStoreMode getDocStoreMode() { + public final DocStoreMode docStoreMode() { return docStoreMode; } @@ -609,7 +609,7 @@ public final boolean checkBatchEscalationOnCascade(PersistRequestBean request } @Override - public final BatchControl getBatchControl() { + public final BatchControl batchControl() { return batchControl; } @@ -667,7 +667,7 @@ private void internalBatchFlush() { * Return the persistence context associated with this transaction. */ @Override - public final SpiPersistenceContext getPersistenceContext() { + public final SpiPersistenceContext persistenceContext() { return persistenceContext; } @@ -687,7 +687,7 @@ public final void setPersistenceContext(SpiPersistenceContext context) { * Return the underlying TransactionEvent. */ @Override - public final TransactionEvent getEvent() { + public final TransactionEvent event() { queryOnly = false; if (event == null) { event = new TransactionEvent(); @@ -732,7 +732,7 @@ public void logTxn(String msg, Object... args) { * Return the transaction id. */ @Override - public final String getId() { + public final String id() { return id; } @@ -742,7 +742,7 @@ public final void setTenantId(Object tenantId) { } @Override - public final Object getTenantId() { + public final Object tenantId() { return tenantId; } @@ -750,7 +750,7 @@ public final Object getTenantId() { * Return the underlying connection for internal use. */ @Override - public Connection getInternalConnection() { + public Connection internalConnection() { return connection; } @@ -760,7 +760,7 @@ public Connection getInternalConnection() { @Override public Connection connection() { queryOnly = false; - return getInternalConnection(); + return internalConnection(); } void deactivate() { @@ -1085,11 +1085,11 @@ public final void setPersistCascade(boolean persistCascade) { @Override public final void addModification(String tableName, boolean inserts, boolean updates, boolean deletes) { - getEvent().add(tableName, inserts, updates, deletes); + event().add(tableName, inserts, updates, deletes); } @Override - public final DocStoreTransaction getDocStoreTransaction() { + public final DocStoreTransaction docStoreTransaction() { if (docStoreTxn == null) { queryOnly = false; docStoreTxn = manager.createDocStoreTransaction(docStoreBatchSize); 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 c4027ff048..f4b15b77e1 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 @@ -89,7 +89,7 @@ public Object getCurrentTransaction() { SpiTransaction currentEbeanTransaction = scope.inScope(); if (currentEbeanTransaction != null) { // NOT expecting this so log WARNING - log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.getId()); + log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.id()); return currentEbeanTransaction; } @@ -182,25 +182,25 @@ public void beforeCompletion() { public void afterCompletion(int status) { switch (status) { case Status.STATUS_COMMITTED: - log.log(DEBUG, "Jta Txn [{0}] committed", transaction.getId()); + log.log(DEBUG, "Jta Txn [{0}] committed", transaction.id()); transaction.postCommit(); // Remove this transaction object as it is completed transactionManager.scope().clearExternal(); break; case Status.STATUS_ROLLEDBACK: - log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.getId()); + log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.id()); transaction.postRollback(null); // Remove this transaction object as it is completed transactionManager.scope().clearExternal(); break; default: - log.log(DEBUG, "Jta Txn [{0}] status:{1}", transaction.getId(), status); + log.log(DEBUG, "Jta Txn [{0}] status:{1}", transaction.id(), status); } // No matter the completion status of the transaction, we release the connection we got from the pool. - JdbcClose.close(transaction.getInternalConnection()); + JdbcClose.close(transaction.internalConnection()); } } 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 b0ee596df5..76228f1f1a 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 @@ -41,7 +41,7 @@ public void setLabel(String label) { } @Override - public String getLabel() { + public String label() { return null; } @@ -56,7 +56,7 @@ public void setNestedUseSavepoint() { } @Override - public long getStartNanoTime() { + public long startNanoTime() { // not used return System.nanoTime(); } @@ -168,7 +168,7 @@ public boolean isRegisteredBean(Object bean) { } @Override - public String getId() { + public String id() { return null; } @@ -178,7 +178,7 @@ public Boolean isUpdateAllLoadedProperties() { } @Override - public DocStoreMode getDocStoreMode() { + public DocStoreMode docStoreMode() { return null; } @@ -317,7 +317,7 @@ public boolean isExplicit() { } @Override - public TransactionEvent getEvent() { + public TransactionEvent event() { return null; } @@ -332,7 +332,7 @@ public boolean isBatchThisRequest() { } @Override - public BatchControl getBatchControl() { + public BatchControl batchControl() { return null; } @@ -341,7 +341,7 @@ public void setBatchControl(BatchControl control) { } @Override - public SpiPersistenceContext getPersistenceContext() { + public SpiPersistenceContext persistenceContext() { return null; } @@ -350,7 +350,7 @@ public void setPersistenceContext(SpiPersistenceContext context) { } @Override - public Connection getInternalConnection() { + public Connection internalConnection() { return null; } @@ -398,7 +398,7 @@ public void sendChangeLog(ChangeSet changeSet) { } @Override - public DocStoreTransaction getDocStoreTransaction() { + public DocStoreTransaction docStoreTransaction() { return null; } @@ -407,7 +407,7 @@ public void setTenantId(Object tenantId) { } @Override - public Object getTenantId() { + public Object tenantId() { return null; } @@ -434,7 +434,7 @@ public void setProfileLocation(ProfileLocation profileLocation) { } @Override - public ProfileLocation getProfileLocation() { + public ProfileLocation profileLocation() { return null; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java index f36dd7edef..ae9cd2ba20 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java @@ -46,8 +46,8 @@ final class PostCommitProcessing { this.txnDocStoreMode = DocStoreMode.IGNORE; this.txnDocStoreBatchSize = 0; this.event = event; - this.deleteByIdMap = event.getDeleteByIdMap(); - this.listenerNotify = event.getListenerNotify(); + this.deleteByIdMap = event.deleteByIdMap(); + this.listenerNotify = event.listenerNotify(); this.remoteTransactionEvent = createRemoteTransactionEvent(); } @@ -58,11 +58,11 @@ final class PostCommitProcessing { this.clusterManager = clusterManager; this.manager = manager; this.serverName = manager.name(); - this.txnDocStoreMode = transaction.getDocStoreMode(); + this.txnDocStoreMode = transaction.docStoreMode(); this.txnDocStoreBatchSize = transaction.getDocStoreBatchSize(); - this.event = transaction.getEvent(); - this.deleteByIdMap = event.getDeleteByIdMap(); - this.listenerNotify = event.getListenerNotify(); + this.event = transaction.event(); + this.deleteByIdMap = event.deleteByIdMap(); + this.listenerNotify = event.listenerNotify(); this.remoteTransactionEvent = createRemoteTransactionEvent(); } @@ -149,7 +149,7 @@ private void localPersistListenersNotify() { request.notifyLocalPersistListener(); } } - TransactionEventTable eventTables = event.getEventTables(); + TransactionEventTable eventTables = event.eventTables(); if (eventTables != null && !eventTables.isEmpty()) { BulkEventListenerMap map = manager.bulkEventListenerMap(); for (TableIUD tableIUD : eventTables.values()) { @@ -183,7 +183,7 @@ private RemoteTransactionEvent createRemoteTransactionEvent() { if (deleteByIdMap != null) { remoteTransactionEvent.setDeleteByIdMap(deleteByIdMap); } - TransactionEventTable eventTables = event.getEventTables(); + TransactionEventTable eventTables = event.eventTables(); if (eventTables != null && !eventTables.isEmpty()) { for (TableIUD tableIUD : eventTables.values()) { remoteTransactionEvent.addTableIUD(tableIUD); 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 b9e3f8b8a7..85ef1e8a92 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 @@ -30,7 +30,7 @@ final class SavepointTransaction extends SpiTransactionProxy { SavepointTransaction(SpiTransaction transaction, TransactionManager manager) throws SQLException { this.manager = manager; this.transaction = transaction; - this.connection = transaction.getInternalConnection(); + this.connection = transaction.internalConnection(); this.savepoint = connection.setSavepoint(); if (transaction.isLogSql()) { int savepointId = manager.isSupportsSavepointId() ? savepoint.getSavepointId() : 0; @@ -41,7 +41,7 @@ final class SavepointTransaction extends SpiTransactionProxy { } @Override - public TransactionEvent getEvent() { + public TransactionEvent event() { if (event == null) { event = new TransactionEvent(); } 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 dcd6e73ea8..f8eeba38a0 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 @@ -35,7 +35,7 @@ abstract class TransactionFactory { */ final SpiTransaction setIsolationLevel(SpiTransaction t, boolean explicit, int isolationLevel) { if (isolationLevel > -1) { - Connection connection = t.getInternalConnection(); + Connection connection = t.internalConnection(); try { connection.setTransactionIsolation(isolationLevel); } catch (SQLException e) { 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 442a25ff89..bfaf8cfb5f 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 @@ -334,7 +334,7 @@ public final void notifyOfCommit(SpiTransaction transaction) { public final void externalModification(TransactionEventTable tableEvent) { SpiTransaction t = active(); if (t != null) { - t.getEvent().add(tableEvent); + t.event().add(tableEvent); } else { externalModificationEvent(tableEvent); } 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 d08d2a1367..bda5577460 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 @@ -61,7 +61,7 @@ private BindParamsParser(BindParams params, String sql, BeanDescriptor beanDe */ private String parseSql() { if (params.isSameBindHash()) { - String preparedSql = params.getPreparedSql(); + String preparedSql = params.preparedSql(); if (preparedSql != null && !preparedSql.isEmpty()) { // the sql has already been parsed and positionedParameters are set in order return preparedSql; @@ -117,7 +117,7 @@ private void parseNamedParams(int startPos, OrderedList orderedList) { Param param = extractNamedParam(paramName); orderedList.appendSql(sql.substring(startPos, nameParamStart)); - Object inValue = param.getInValue(); + Object inValue = param.inValue(); if (inValue instanceof Collection) { addCollectionParams(orderedList, param, (Collection) inValue); } else { @@ -139,7 +139,7 @@ private Param extractNamedParam(String paramName) { if (paramName.startsWith(ENCRYPTKEY_PREFIX)) { param = addEncryptKeyParam(paramName); } else { - param = params.getParameter(paramName); + param = params.parameter(paramName); } if (param == null) { throw new PersistenceException("Bind value is not set or null for " + paramName + " in " + sql); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index aedbb29a9a..460a532dea 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -27,7 +27,7 @@ OrmQueryRequest queryRequest(Query query) { } OrmQueryDetail detail(Query query) { - return queryRequest(query).query().getDetail(); + return queryRequest(query).query().detail(); } @Test @@ -124,7 +124,7 @@ public void testJoinOrder_when_fetchJoins_expect_detailJoinsPreserveOrder() { .fetch("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer", "details"); } @@ -138,7 +138,7 @@ public void testJoinOrder_when_fetchJoinsAndWhere_expect_fetchJoinsOnlyInFetchPa .where().eq("customer.name", "rob").query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("details"); } @@ -152,7 +152,7 @@ public void testJoinOrder_when_queryFetch_expect_getFetchPaths_doesNotIncludeQue .fetchQuery("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -166,7 +166,7 @@ public void testJoinOrder_when_queryFetch_expect_getFetchPaths_doesNotIncludeQue .fetchQuery("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -180,7 +180,7 @@ public void testJoinOrder_when_lazyFetch_expect_getFetchPaths_doesNotIncludeQuer .fetch("details", FetchConfig.ofLazy()); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -194,7 +194,7 @@ public void testJoinOrder_when_lazyFetch_expect_getFetchPaths_doesNotIncludeQuer .fetchLazy("details"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -209,7 +209,7 @@ public void testJoinOrder_when_lazyFetchAndHasChildren_expect_getFetchPaths_does .fetch("details.product"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -224,7 +224,7 @@ public void testJoinOrder_when_fetchMany_expect_getFetchPaths_containsAllInOrder .fetch("customer", "name"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer"); } @@ -239,7 +239,7 @@ public void testJoinOrder_when_queryJoin_expect_getFetchPaths_excludesQueryJoinA .fetch("customer", "name"); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -254,7 +254,7 @@ public void test_removeJoinToMany_when_multipleManyPaths() { .fetch("customer.contacts"); // second many path OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer"); } @@ -270,7 +270,7 @@ public void test_removeAllJoinToMany_when_firstRow() { .fetch("customer.contacts"); // many path OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -286,7 +286,7 @@ public void test_removeAllJoinToMany_when_maxRows() { .fetch("customer.contacts"); // many path OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer"); } @@ -303,7 +303,7 @@ public void test_filterMany_included() { .query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer"); } @@ -320,7 +320,7 @@ public void test_filterMany_excludedByOrdering() { .query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts"); } @@ -337,7 +337,7 @@ public void test_filterMany_excludedExplicitly() { .query(); OrmQueryRequest queryRequest = queryRequest(query); - OrmQueryDetail detail = queryRequest.query().getDetail(); + OrmQueryDetail detail = queryRequest.query().detail(); assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts"); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index c9be844369..fbe4866e30 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -25,7 +25,7 @@ public void prepare() throws Exception { DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); - List underlyingList = exp.getUnderlyingList(); + List underlyingList = exp.underlyingList(); assertEquals(underlyingList.size(), 1); assertEquals(exp.allDocNestedPath, "details"); } @@ -43,7 +43,7 @@ public void prepare_when_multipleOfSamePath() throws Exception { DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); - List underlyingList = exp.getUnderlyingList(); + List underlyingList = exp.underlyingList(); assertEquals(underlyingList.size(), 2); assertEquals(exp.allDocNestedPath, "details"); } @@ -62,7 +62,7 @@ public void prepare_when_mixed() throws Exception { DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); - List underlyingList = exp.getUnderlyingList(); + List underlyingList = exp.underlyingList(); assertEquals(underlyingList.size(), 2); assertNull(exp.allDocNestedPath); @@ -84,12 +84,12 @@ public void prepare_when_nestedJunction() throws Exception { DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); - List underlyingList = exp.getUnderlyingList(); + List underlyingList = exp.underlyingList(); assertEquals(underlyingList.size(), 1); assertNull(exp.allDocNestedPath); JunctionExpression junction = (JunctionExpression) underlyingList.get(0); - List junctionUnderlying = junction.exprList.getUnderlyingList(); + List junctionUnderlying = junction.exprList.underlyingList(); JunctionExpression nestedNestedPath = (JunctionExpression) junctionUnderlying.get(1); assertEquals(nestedNestedPath.exprList.allDocNestedPath, "details"); } @@ -107,7 +107,7 @@ public void prepare_when_nestedMultiple() throws Exception { DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); - List underlyingList = exp.getUnderlyingList(); + List underlyingList = exp.underlyingList(); assertEquals(underlyingList.size(), 2); assertNull(exp.allDocNestedPath); @@ -135,7 +135,7 @@ public void prepare_when_manyMixed() throws Exception { DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); - List underlyingList = exp.getUnderlyingList(); + List underlyingList = exp.underlyingList(); assertEquals(underlyingList.size(), 5); assertNull(exp.allDocNestedPath); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index 6563886dc3..cd61df7db7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -20,20 +20,20 @@ public void when_forUpdate_then_excludeFromBeanCache() { DefaultOrmQuery q1 = (DefaultOrmQuery) DB.find(Customer.class) .forUpdate().where().eq("id", 42).query(); - assertThat(q1.getUseBeanCache()).isSameAs(CacheMode.OFF); + assertThat(q1.beanCacheMode()).isSameAs(CacheMode.OFF); } @Test public void checkForId_when_eqId_then_translatedTo_setId() { DefaultOrmQuery q1 = (DefaultOrmQuery) DB.find(Order.class).where().eq("id", 42).query(); - assertThat(q1.getWhereExpressions()).isNotNull(); + assertThat(q1.whereExpressions()).isNotNull(); assertThat(q1.getId()).isNull(); assertThat(q1.isFindById()).isTrue(); assertThat(q1.getId()).isEqualTo(42); - assertThat(q1.getWhereExpressions()).isNull(); + assertThat(q1.whereExpressions()).isNull(); } @Test diff --git a/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java b/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java index 365e5dc864..40b754357e 100644 --- a/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java +++ b/ebean-querybean/src/test/java/io/ebean/typequery/PBooleanTest.java @@ -85,7 +85,7 @@ public void eq_false() throws Exception { private SimpleExpression getExpression(QCustomer customer) { DefaultExpressionList where = (DefaultExpressionList)customer.query().where(); - return (SimpleExpression)where.getUnderlyingList().get(0); + return (SimpleExpression)where.underlyingList().get(0); } 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 8375acf7ca..482222ab59 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 @@ -145,12 +145,12 @@ public void beforeCommit(boolean readOnly) { public void afterCompletion(int status) { switch (status) { case STATUS_COMMITTED: - log.log(DEBUG, "Spring Txn [{0}] committed", transaction.getId()); + log.log(DEBUG, "Spring Txn [{0}] committed", transaction.id()); transaction.postCommit(); break; case STATUS_ROLLED_BACK: - log.log(DEBUG, "Spring Txn [{0}] rollback", transaction.getId()); + log.log(DEBUG, "Spring Txn [{0}] rollback", transaction.id()); transaction.postRollback(null); break; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java index beea174a28..dba70b4348 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java @@ -17,7 +17,7 @@ public void test_hash() { List ids = Arrays.asList("1", "2", "3"); bindParams.setParameter("ids", ids); - BindParams.Param param = bindParams.getParameter("ids"); + BindParams.Param param = bindParams.parameter("ids"); assertEquals(3, param.queryBindCount()); assertFalse(bindParams.isSameBindHash()); bindParams.updateHash(); diff --git a/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java index b5a136a2ad..d088740510 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java @@ -166,7 +166,7 @@ public void docStoreApplyPath() { SpiQuery orderQuery = (SpiQuery) db.find(Order.class); beanType(Order.class).docStore().applyPath(orderQuery); - OrmQueryDetail detail = orderQuery.getDetail(); + OrmQueryDetail detail = orderQuery.detail(); assertThat(detail.getChunk("customer", false).getIncluded()).containsExactly("id", "name"); } 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 98b7462406..2f338368b4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -165,7 +165,7 @@ void testPcScopes_with_weakReferences() throws InterruptedException { lastBean[0] = customer; }); - SpiPersistenceContext pc = ((SpiTransaction) txn).getPersistenceContext(); + SpiPersistenceContext pc = ((SpiTransaction) txn).persistenceContext(); // the first 100 customers using strong references assertThat(pc.toString()).contains("Customer=size:5000 (4900 weak)"); assertThat(pc.toString()).contains("Order=size:100 (100 weak)"); 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 0ba7340926..f0506ed58e 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -70,7 +70,7 @@ public void no_cascade() { // detail assertThat(sql.get(3)).contains("insert into t_detail_with_other_namexxxyy"); - assertThat(((SpiTransaction)transaction).getLabel()).isEqualTo("TestBatchInsertFlush.no_cascade"); + assertThat(((SpiTransaction)transaction).label()).isEqualTo("TestBatchInsertFlush.no_cascade"); } finally { transaction.end(); 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 d9501c7316..5750e30a18 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -96,7 +96,7 @@ protected void testBatchOnCascadeIsExceptionSafe(Database server, Runnable faili Assertions.fail("PersistenceException expected"); } catch (PersistenceException e) { assertThat(txn.isBatchMode()).as("batch mode").isFalse(); // should not have changed - BatchControl bc = ((SpiTransaction) txn).getBatchControl(); + BatchControl bc = ((SpiTransaction) txn).batchControl(); assertThat(bc == null || bc.isEmpty()).as("batch emtpy").isTrue(); } finally { txn.end(); diff --git a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index 3b9874f4b3..9364d22174 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -51,7 +51,7 @@ private void runQuery() { } SpiQuery sq = (SpiQuery) q; - ObjectGraphNode parentNode = sq.getParentNode(); + ObjectGraphNode parentNode = sq.parentNode(); ObjectGraphOrigin origin = parentNode.origin(); assertThat(origin).isNotNull(); // MetaAutoFetchStatistic metaAutoFetchStatistic = diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java index 95bebbe254..ee63a1818d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java @@ -123,7 +123,7 @@ public void persistenceContext_scope() { .findList(); SpiTransaction spiTxn = (SpiTransaction) transaction; - PersistenceContext pc = spiTxn.getPersistenceContext(); + PersistenceContext pc = spiTxn.persistenceContext(); assertThat(pc.size(Customer.class)).isEqualTo(customerList.size()); LoggedSql.start(); diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java index cdfc0af5bc..5124584418 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java @@ -119,7 +119,7 @@ public void test_trim_leadingSpaces_eventFound() { update.execute(); transaction.commit(); - assertFalse(((SpiTransaction) transaction).getEvent().getEventTables().isEmpty()); + assertFalse(((SpiTransaction) transaction).event().eventTables().isEmpty()); } finally { transaction.end(); diff --git a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index 936babbd20..0d10b7e234 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -29,12 +29,12 @@ public void testDeleteBean() { // same instance from PersistenceContext assertSame(bean2, bean3); - Object bean4 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); + Object bean4 = transaction.persistenceContext().get(EBasicVer.class, bean.getId()); assertSame(bean2, bean4); DB.delete(bean2); - Object bean5 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); + Object bean5 = transaction.persistenceContext().get(EBasicVer.class, bean.getId()); assertNull(bean5); DB.commitTransaction(); diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index f1b1cb16e8..1952a07152 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -108,13 +108,13 @@ public void nestedUseSavepoint_doubleNested_rollbackCommit() { server.save(bean); - TransactionEvent event0 = ((SpiTransaction) txn0).getEvent(); + TransactionEvent event0 = ((SpiTransaction) txn0).event(); try (Transaction txn1 = server.beginTransaction()) { bean.setName("updateNested"); server.save(bean); - TransactionEvent event1 = ((SpiTransaction) txn1).getEvent(); + TransactionEvent event1 = ((SpiTransaction) txn1).event(); assertThat(event1).isNotSameAs(event0); try (Transaction txn2 = server.beginTransaction()) { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java index 06e2cb8262..ff656fc2e2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -28,7 +28,7 @@ public void test() { try { ResetBasicData.createOrderCustAndOrder("testPc"); SpiTransaction spiTxn = (SpiTransaction) t; - PersistenceContext pc = spiTxn.getPersistenceContext(); + PersistenceContext pc = spiTxn.persistenceContext(); // no orders or customers in the PC assertEquals(0, pc.size(Order.class)); 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 52c3238840..8d5e87505f 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -341,7 +341,7 @@ private List simulateTransparentPersist(Transaction transaction) { private List getDirtyBeansFromPersistenceContext(Transaction transaction) { final SpiBeanTypeManager mgr = Mockito.mock(SpiBeanTypeManager.class); - return ((SpiTransaction)transaction).getPersistenceContext().dirtyBeans(mgr); + return ((SpiTransaction)transaction).persistenceContext().dirtyBeans(mgr); } } From d27d20dd1cea364aa64b0fe754f92401c35f970a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 2 Jun 2023 09:03:29 +1200 Subject: [PATCH 022/161] Refactor ebean-core internal API - getters -> accessors --- .../server/core/DefaultServer.java | 2 +- .../server/core/DtoQueryRequest.java | 4 +- .../core/MultiTenantDbCatalogSupplier.java | 8 +- .../core/MultiTenantDbSchemaSupplier.java | 8 +- .../server/core/MultiTenantDbSupplier.java | 8 +- .../server/core/PersistRequestBean.java | 12 +- .../server/core/RelationalQueryRequest.java | 6 +- .../server/core/SimpleDataSourceProvider.java | 8 +- .../server/core/SpiResultSet.java | 4 +- .../server/deploy/BeanDescriptor.java | 4 +- .../server/dto/DtoBeanDescriptor.java | 2 +- .../server/el/ElComparatorCompound.java | 3 - .../server/el/ElComparatorProperty.java | 4 - .../io/ebeaninternal/server/el/ElFilter.java | 104 ++++-------------- .../server/el/ElMatchBuilder.java | 2 - .../server/el/ElPropertyChain.java | 6 +- .../server/el/ElPropertyChainBuilder.java | 2 +- .../expression/DefaultExampleExpression.java | 2 - .../server/persist/DefaultPersister.java | 2 +- .../server/persist/dml/InsertHandler.java | 2 +- .../query/DefaultRelationalQueryEngine.java | 6 +- .../transaction/DataSourceSupplier.java | 8 +- .../transaction/TransactionFactoryBasic.java | 2 +- .../TransactionFactoryBasicWithRead.java | 2 +- .../TransactionFactoryBuilder.java | 2 +- .../transaction/TransactionFactoryTenant.java | 2 +- .../TransactionFactoryTenantWithRead.java | 2 +- .../transaction/TransactionManager.java | 6 +- 28 files changed, 75 insertions(+), 148 deletions(-) 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 8841349f43..d7b54ff69e 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 @@ -889,7 +889,7 @@ public DtoQuery findDto(Class dtoType, String sql) { @Override public DtoQuery createNamedDtoQuery(Class dtoType, String namedQuery) { DtoBeanDescriptor descriptor = dtoBeanManager.descriptor(dtoType); - String sql = descriptor.getNamedRawSql(namedQuery); + String sql = descriptor.namedRawSql(namedQuery); if (sql == null) { throw new PersistenceException("No named query called " + namedQuery + " for bean:" + dtoType.getName()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java index 5ca74e9f91..413074c493 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java @@ -53,9 +53,9 @@ public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException { query.setCancelableQuery(ormQuery); // execute the underlying ORM query returning the ResultSet SpiResultSet result = server.findResultSet(ormQuery, transaction); - this.pstmt = result.getStatement(); + this.pstmt = result.statement(); this.sql = ormQuery.getGeneratedSql(); - setResultSet(result.getResultSet(), ormQuery.queryPlanKey()); + setResultSet(result.resultSet(), ormQuery.queryPlanKey()); } else { // native SQL query execution 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 386d4c3831..9ab4b86a52 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 @@ -41,22 +41,22 @@ public Object currentTenantId() { } @Override - public DataSource getDataSource() { + public DataSource dataSource() { return catalogDataSource; } @Override - public DataSource getReadOnlyDataSource() { + public DataSource readOnlyDataSource() { return readOnly; } @Override - public Connection getConnection(Object tenantId) throws SQLException { + public Connection connection(Object tenantId) throws SQLException { return catalogDataSource.getConnectionForTenant(tenantId); } @Override - public Connection getReadOnlyConnection(Object tenantId) throws SQLException { + public Connection readOnlyConnection(Object tenantId) throws SQLException { return readOnly.getConnectionForTenant(tenantId); } 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 eca06a8934..806a90d050 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 @@ -41,22 +41,22 @@ public Object currentTenantId() { } @Override - public DataSource getDataSource() { + public DataSource dataSource() { return schemaDataSource; } @Override - public DataSource getReadOnlyDataSource() { + public DataSource readOnlyDataSource() { return readOnly; } @Override - public Connection getConnection(Object tenantId) throws SQLException { + public Connection connection(Object tenantId) throws SQLException { return schemaDataSource.getConnectionForTenant(tenantId); } @Override - public Connection getReadOnlyConnection(Object tenantId) throws SQLException { + public Connection readOnlyConnection(Object tenantId) throws SQLException { return readOnly.getConnectionForTenant(tenantId); } 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 c0e810eff4..5eeefded3f 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 @@ -27,23 +27,23 @@ public Object currentTenantId() { } @Override - public DataSource getReadOnlyDataSource() { + public DataSource readOnlyDataSource() { // read only datasource not supported with DB per tenant at this stage return null; } @Override - public DataSource getDataSource() { + public DataSource dataSource() { return dataSourceProvider.dataSource(tenantProvider.currentId()); } @Override - public Connection getConnection(Object tenantId) throws SQLException { + public Connection connection(Object tenantId) throws SQLException { return dataSourceProvider.dataSource(tenantId).getConnection(); } @Override - public Connection getReadOnlyConnection(Object tenantId) throws SQLException { + public Connection readOnlyConnection(Object tenantId) throws SQLException { throw new SQLException("Not currently supported"); } 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 f4a41c25d0..32da95dab1 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 @@ -547,7 +547,7 @@ public void unRegisterBean() { *

* Takes into account the class type and id value. */ - private Integer getBeanHash() { + private Integer beanHash() { if (beanHash == null) { Object id = beanDescriptor.getId(entityBean); int hc = 92821 * bean.getClass().getName().hashCode(); @@ -560,7 +560,7 @@ private Integer getBeanHash() { } public void registerDeleteBean() { - Integer hash = getBeanHash(); + Integer hash = beanHash(); transaction.registerDeleteBean(hash); } @@ -568,7 +568,7 @@ public boolean isRegisteredForDeleteBean() { if (transaction == null) { return false; } else { - Integer hash = getBeanHash(); + Integer hash = beanHash(); return transaction.isRegisteredDeleteBean(hash); } } @@ -712,7 +712,7 @@ public boolean isDirtyProperty(BeanProperty prop) { /** * Return the original / old value for the given property. */ - public Object getOrigValue(BeanProperty prop) { + public Object origValue(BeanProperty prop) { return intercept.origValue(prop.propertyIndex()); } @@ -1360,7 +1360,7 @@ public void addBeanUpdate(CacheChangeSet changeSet) { * Set an orphan bean that needs to be deleted AFTER the request has persisted. */ public void setImportedOrphanForRemoval(BeanPropertyAssocOne prop) { - Object orphan = getOrigValue(prop); + Object orphan = origValue(prop); if (orphan instanceof EntityBean) { orphanBean = (EntityBean) orphan; } @@ -1373,7 +1373,7 @@ public EntityBean importedOrphanForRemoval() { /** * Return the SQL used to fetch the last inserted id value. */ - public String getSelectLastInsertedId() { + public String selectLastInsertedId() { return beanDescriptor.selectLastInsertedId(publish); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java index 8b5002b450..b2e33e57e9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java @@ -30,7 +30,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest { @Override protected void setResultSet(ResultSet resultSet, Object planKey) throws SQLException { this.resultSet = resultSet; - this.propertyNames = getPropertyNames(); + this.propertyNames = propertyNames(); // calculate the initialCapacity of the Map to reduce rehashing float initCap = (propertyNames.length) / 0.7f; this.estimateCapacity = (int) initCap + 1; @@ -95,7 +95,7 @@ public List findList() { /** * Build the list of property names. */ - private String[] getPropertyNames() throws SQLException { + private String[] propertyNames() throws SQLException { ResultSetMetaData metaData = resultSet.getMetaData(); int columnsPlusOne = metaData.getColumnCount() + 1; ArrayList propNames = new ArrayList<>(columnsPlusOne - 1); @@ -127,7 +127,7 @@ public void logSummary() { } } - public ResultSet getResultSet() { + public ResultSet resultSet() { return resultSet; } 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 03640dc90e..0d544045e4 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 @@ -26,22 +26,22 @@ public Object currentTenantId() { } @Override - public DataSource getDataSource() { + public DataSource dataSource() { return dataSource; } @Override - public DataSource getReadOnlyDataSource() { + public DataSource readOnlyDataSource() { return readOnlyDataSource; } @Override - public Connection getConnection(Object tenantId) throws SQLException { + public Connection connection(Object tenantId) throws SQLException { return dataSource.getConnection(); } @Override - public Connection getReadOnlyConnection(Object tenantId) throws SQLException { + public Connection readOnlyConnection(Object tenantId) throws SQLException { return readOnlyDataSource.getConnection(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java index ed114375b6..6f9c21077f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java @@ -19,11 +19,11 @@ public SpiResultSet(PreparedStatement statement, ResultSet resultSet) { this.resultSet = resultSet; } - public PreparedStatement getStatement() { + public PreparedStatement statement() { return statement; } - public ResultSet getResultSet() { + public ResultSet resultSet() { return resultSet; } } 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 c34a79a709..73bb1c126c 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 @@ -2355,7 +2355,7 @@ ElPropertyValue buildElGetValue(String propName, ElPropertyChainBuilder chain, b ElPropertyDeploy fk = elDeployCache.get(propName); if (fk instanceof BeanFkeyProperty) { // propertyDeploy chain for foreign key column - return ((BeanFkeyProperty) fk).create(chain.getExpression(), chain.isContainsMany()); + return ((BeanFkeyProperty) fk).create(chain.expression(), chain.isContainsMany()); } } int basePos = propName.indexOf('.'); @@ -2375,7 +2375,7 @@ ElPropertyValue buildElGetValue(String propName, ElPropertyChainBuilder chain, b return property; } if (property == null) { - throw new PersistenceException("No property found for [" + propName + "] in expression " + chain.getExpression()); + throw new PersistenceException("No property found for [" + propName + "] in expression " + chain.expression()); } if (property.containsMany()) { chain.setContainsMany(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java index a56a00186c..c9720308a7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoBeanDescriptor.java @@ -46,7 +46,7 @@ public void visit(MetricVisitor visitor) { /** * Return the named RawSql query. */ - public String getNamedRawSql(String name) { + public String namedRawSql(String name) { return namedQueries.get(name); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java index dc4dd6eeb5..bf94c534dc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java @@ -20,7 +20,6 @@ public ElComparatorCompound(ElComparator[] array) { @Override public int compare(T o1, T o2) { - for (ElComparator anArray : array) { int ret = anArray.compare(o1, o2); if (ret != 0) { @@ -33,14 +32,12 @@ public int compare(T o1, T o2) { @Override public int compareValue(Object value, T o2) { - for (ElComparator anArray : array) { int ret = anArray.compareValue(value, o2); if (ret != 0) { return ret; } } - return 0; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java index bddcf53107..253737ed9a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java @@ -23,7 +23,6 @@ public ElComparatorProperty(ElPropertyValue elGetValue, boolean ascending, boole @Override public int compare(T o1, T o2) { - Object val1 = elGetValue.pathGet(o1); Object val2 = elGetValue.pathGet(o2); return compareValues(val1, val2); @@ -31,14 +30,12 @@ public int compare(T o1, T o2) { @Override public int compareValue(Object value, T o2) { - Object val2 = elGetValue.pathGet(o2); return compareValues(value, val2); } @SuppressWarnings({"unchecked", "rawtypes"}) public int compareValues(Object val1, Object val2) { - if (val1 == null) { return val2 == null ? 0 : nullOrder; } @@ -55,5 +52,4 @@ public int compareValues(Object val1, Object val2) { return asc * c.compareTo(val2); } - } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java index 105dff3811..e658f841ac 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java @@ -30,13 +30,11 @@ private Object convertValue(String propertyName, Object value) { return elGetValue.convert(value); } - private ElComparator getElComparator(String propertyName) { - + private ElComparator elComparator(String propertyName) { return beanDescriptor.elComparator(propertyName); } - private ElPropertyValue getElGetValue(String propertyName) { - + private ElPropertyValue elGetValue(String propertyName) { return beanDescriptor.elGetValue(propertyName); } @@ -55,119 +53,80 @@ boolean isMatch(T bean) { return true; } - @Override public Filter in(String propertyName, Set matchingValues) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - - matches.add(new ElMatchBuilder.InSet<>(matchingValues, elGetValue)); + matches.add(new ElMatchBuilder.InSet<>(matchingValues, elGetValue(propertyName))); return this; } @Override public Filter eq(String propertyName, Object value) { - value = convertValue(propertyName, value); - ElComparator comparator = getElComparator(propertyName); - - matches.add(new ElMatchBuilder.Eq<>(value, comparator)); + matches.add(new ElMatchBuilder.Eq<>(value, elComparator(propertyName))); return this; } - @Override public Filter ne(String propertyName, Object value) { - value = convertValue(propertyName, value); - ElComparator comparator = getElComparator(propertyName); - - matches.add(new ElMatchBuilder.Ne<>(value, comparator)); + matches.add(new ElMatchBuilder.Ne<>(value, elComparator(propertyName))); return this; } @Override public Filter between(String propertyName, Object min, Object max) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); + ElPropertyValue elGetValue = elGetValue(propertyName); min = elGetValue.convert(min); max = elGetValue.convert(max); - ElComparator elComparator = getElComparator(propertyName); - - matches.add(new ElMatchBuilder.Between<>(min, max, elComparator)); + matches.add(new ElMatchBuilder.Between<>(min, max, elComparator(propertyName))); return this; } @Override public Filter gt(String propertyName, Object value) { - value = convertValue(propertyName, value); - ElComparator comparator = getElComparator(propertyName); - - matches.add(new ElMatchBuilder.Gt<>(value, comparator)); + matches.add(new ElMatchBuilder.Gt<>(value, elComparator(propertyName))); return this; } @Override public Filter ge(String propertyName, Object value) { - value = convertValue(propertyName, value); - ElComparator comparator = getElComparator(propertyName); - - matches.add(new ElMatchBuilder.Ge<>(value, comparator)); + matches.add(new ElMatchBuilder.Ge<>(value, elComparator(propertyName))); return this; } @Override public Filter ieq(String propertyName, String value) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - - matches.add(new ElMatchBuilder.Ieq<>(elGetValue, value)); + matches.add(new ElMatchBuilder.Ieq<>(elGetValue(propertyName), value)); return this; } - @Override public Filter isNotNull(String propertyName) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - - matches.add(new ElMatchBuilder.IsNotNull<>(elGetValue)); + matches.add(new ElMatchBuilder.IsNotNull<>(elGetValue(propertyName))); return this; } - @Override public Filter isNull(String propertyName) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - - matches.add(new ElMatchBuilder.IsNull<>(elGetValue)); + matches.add(new ElMatchBuilder.IsNull<>(elGetValue(propertyName))); return this; } - @Override public Filter le(String propertyName, Object value) { - value = convertValue(propertyName, value); - ElComparator comparator = getElComparator(propertyName); - - matches.add(new ElMatchBuilder.Le<>(value, comparator)); + matches.add(new ElMatchBuilder.Le<>(value, elComparator(propertyName))); return this; } - @Override public Filter lt(String propertyName, Object value) { - value = convertValue(propertyName, value); - ElComparator comparator = getElComparator(propertyName); - - matches.add(new ElMatchBuilder.Lt<>(value, comparator)); + matches.add(new ElMatchBuilder.Lt<>(value, elComparator(propertyName))); return this; } @@ -176,63 +135,45 @@ public Filter regex(String propertyName, String regEx) { } public Filter regex(String propertyName, String regEx, int options) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - - matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue, regEx, options)); + matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue(propertyName), regEx, options)); return this; } @Override public Filter contains(String propertyName, String value) { - String quote = ".*" + Pattern.quote(value) + ".*"; - - ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue, quote, 0)); + matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue(propertyName), quote, 0)); return this; } @Override public Filter icontains(String propertyName, String value) { - String quote = ".*" + Pattern.quote(value) + ".*"; - - ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue, quote, Pattern.CASE_INSENSITIVE)); + matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue(propertyName), quote, Pattern.CASE_INSENSITIVE)); return this; } - @Override public Filter endsWith(String propertyName, String value) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.EndsWith<>(elGetValue, value)); + matches.add(new ElMatchBuilder.EndsWith<>(elGetValue(propertyName), value)); return this; } @Override public Filter startsWith(String propertyName, String value) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.StartsWith<>(elGetValue, value)); + matches.add(new ElMatchBuilder.StartsWith<>(elGetValue(propertyName), value)); return this; } @Override public Filter iendsWith(String propertyName, String value) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.IEndsWith<>(elGetValue, value)); + matches.add(new ElMatchBuilder.IEndsWith<>(elGetValue(propertyName), value)); return this; } @Override public Filter istartsWith(String propertyName, String value) { - - ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.IStartsWith<>(elGetValue, value)); + matches.add(new ElMatchBuilder.IStartsWith<>(elGetValue(propertyName), value)); return this; } @@ -244,7 +185,6 @@ public Filter maxRows(int maxRows) { @Override public List filter(List list) { - if (sortByClause != null) { // create shallow copy and sort list = new ArrayList<>(list); @@ -252,7 +192,6 @@ public List filter(List list) { } ArrayList filterList = new ArrayList<>(); - for (T t : list) { if (isMatch(t)) { filterList.add(t); @@ -261,7 +200,6 @@ public List filter(List list) { } } } - return filterList; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java index 66e966cfbf..ea371a7b58 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java @@ -76,7 +76,6 @@ static final class IStartsWith implements ElMatcher { @Override public boolean isMatch(T bean) { - String v = (String) elGetValue.pathGet(bean); return charMatch.startsWith(v); } @@ -97,7 +96,6 @@ static final class IEndsWith implements ElMatcher { @Override public boolean isMatch(T bean) { - String v = (String) elGetValue.pathGet(bean); return charMatch.endsWith(v); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index b04bacb24f..12d376bed0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java @@ -67,8 +67,8 @@ public ElPropertyChain(boolean containsMany, boolean embedded, String expression this.scalarType = null; } this.lastElPropertyValue = chain[chain.length - 1]; - this.placeHolder = getElPlaceHolder(prefix, lastElPropertyValue, false); - this.placeHolderEncrypted = getElPlaceHolder(prefix, lastElPropertyValue, true); + this.placeHolder = placeHolder(prefix, lastElPropertyValue, false); + this.placeHolderEncrypted = placeHolder(prefix, lastElPropertyValue, true); } @Override @@ -86,7 +86,7 @@ public boolean isAggregation() { return false; } - private String getElPlaceHolder(String prefix, ElPropertyValue lastElPropertyValue, boolean encrypted) { + private String placeHolder(String prefix, ElPropertyValue lastElPropertyValue, boolean encrypted) { if (prefix == null) { return lastElPropertyValue.elPlaceholder(encrypted); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java index fd69bdd9c0..409f17bc70 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java @@ -36,7 +36,7 @@ public void setContainsMany() { this.containsMany = true; } - public String getExpression() { + public String expression() { return expression; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java index 7087928527..83c3052247 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -206,7 +206,6 @@ public void addBindValues(SpiExpressionRequest request) { */ @Override public void addSql(SpiExpressionRequest request) { - if (list.isEmpty()) { request.append(SQL_TRUE); } else { @@ -270,7 +269,6 @@ private ArrayList buildExpressions(BeanDescriptor beanDescript * Add expressions to the list for all the non-null properties (and do this recursively). */ private void addExpressions(ArrayList list, BeanDescriptor beanDescriptor, EntityBean bean, String prefix) { - for (BeanProperty beanProperty : beanDescriptor.propertiesAll()) { if (!beanProperty.isTransient()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 3d54c01673..7f1dcc1fc2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -1077,7 +1077,7 @@ private void saveAssocOne(PersistRequestBean request) { } private void deleteOrphan(PersistRequestBean request, BeanPropertyAssocOne prop) { - Object origValue = request.getOrigValue(prop); + Object origValue = request.origValue(prop); if (origValue instanceof EntityBean) { delete((EntityBean) origValue, request.transaction(), false); } 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 399cae8d15..9859901bb1 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 @@ -148,7 +148,7 @@ private void fetchGeneratedKeyUsingSelect() throws SQLException { PreparedStatement stmt = null; ResultSet rset = null; try { - stmt = transaction.connection().prepareStatement(persistRequest.getSelectLastInsertedId()); + stmt = transaction.connection().prepareStatement(persistRequest.selectLastInsertedId()); rset = stmt.executeQuery(); setGeneratedKey(rset); } finally { 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 047b9f696b..3ffb1ae6ba 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 @@ -130,7 +130,7 @@ public T findSingleAttribute(RelationalQueryRequest request, Class cls) { ScalarType scalarType = (ScalarType) binder.getScalarType(cls); try { request.executeSql(binder, SpiQuery.Type.ATTRIBUTE); - final DataReader dataReader = binder.createDataReader(request.getResultSet()); + final DataReader dataReader = binder.createDataReader(request.resultSet()); T value = null; if (dataReader.next()) { value = scalarType.read(dataReader); @@ -152,7 +152,7 @@ public List findSingleAttributeList(RelationalQueryRequest request, Class ScalarType scalarType = (ScalarType) binder.getScalarType(cls); try { request.executeSql(binder, SpiQuery.Type.ATTRIBUTE); - final DataReader dataReader = binder.createDataReader(request.getResultSet()); + final DataReader dataReader = binder.createDataReader(request.resultSet()); List rows = new ArrayList<>(); while (dataReader.next()) { rows.add(scalarType.read(dataReader)); @@ -174,7 +174,7 @@ public void findSingleAttributeEach(RelationalQueryRequest request, Class ScalarType scalarType = (ScalarType) binder.getScalarType(cls); try { request.executeSql(binder, SpiQuery.Type.ATTRIBUTE); - final DataReader dataReader = binder.createDataReader(request.getResultSet()); + final DataReader dataReader = binder.createDataReader(request.resultSet()); while (dataReader.next()) { consumer.accept(scalarType.read(dataReader)); } 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 da100b546b..cc9c88f53f 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 @@ -17,7 +17,7 @@ public interface DataSourceSupplier { *

* This should take into account multi-tenancy and the current tenantId. */ - DataSource getDataSource(); + DataSource dataSource(); /** * Return the read only DataSource to use for the current request. @@ -25,7 +25,7 @@ public interface DataSourceSupplier { * This can return null meaning that no read only DataSource (with autoCommit) * is available for use so normal transactions with explicit commit should be used. */ - DataSource getReadOnlyDataSource(); + DataSource readOnlyDataSource(); /** * Obtain the current TenantId *IF* it is required for the DataSource. @@ -38,7 +38,7 @@ public interface DataSourceSupplier { * @param tenantId Most often null but well supplied indicates a multi-tenant lazy loading query * @return the connection to use */ - Connection getConnection(Object tenantId) throws SQLException; + Connection connection(Object tenantId) throws SQLException; /** * Return a connection from the read only DataSource taking into account a tenantId for multi-tenant lazy loading. @@ -46,7 +46,7 @@ public interface DataSourceSupplier { * @param tenantId Most often null but well supplied indicates a multi-tenant lazy loading query * @return the connection to use */ - Connection getReadOnlyConnection(Object tenantId) throws SQLException; + Connection readOnlyConnection(Object tenantId) throws SQLException; /** * Shutdown the datasource de-registering the JDBC driver if requested. 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 a190cf64e2..181646cf84 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 @@ -17,7 +17,7 @@ class TransactionFactoryBasic extends TransactionFactory { TransactionFactoryBasic(TransactionManager manager, DataSourceSupplier dataSourceSupplier) { super(manager); - this.dataSource = dataSourceSupplier.getDataSource(); + this.dataSource = dataSourceSupplier.dataSource(); } @Override 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 d843614804..c0ca58dd01 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 @@ -22,7 +22,7 @@ final class TransactionFactoryBasicWithRead extends TransactionFactoryBasic { TransactionFactoryBasicWithRead(TransactionManager manager, DataSourceSupplier dataSourceSupplier) { super(manager, dataSourceSupplier); - this.readOnlyDataSource = dataSourceSupplier.getReadOnlyDataSource(); + this.readOnlyDataSource = dataSourceSupplier.readOnlyDataSource(); } @Override 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 b2b7e875ff..24c76c29cd 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 @@ -12,7 +12,7 @@ final class TransactionFactoryBuilder { */ static TransactionFactory build(TransactionManager manager, DataSourceSupplier dataSourceSupplier, CurrentTenantProvider tenantProvider) { - boolean hasReadOnlyDataSource = dataSourceSupplier.getReadOnlyDataSource() != null; + boolean hasReadOnlyDataSource = dataSourceSupplier.readOnlyDataSource() != null; if (tenantProvider == null) { if (hasReadOnlyDataSource) { return new TransactionFactoryBasicWithRead(manager, dataSourceSupplier); 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 64c9c9511d..c29a12b427 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 @@ -41,7 +41,7 @@ private SpiTransaction create(boolean explicit, Object tenantId) { // tenantId not set (by lazy loading) so get current tenantId tenantId = tenantProvider.currentId(); } - connection = dataSourceSupplier.getConnection(tenantId); + connection = dataSourceSupplier.connection(tenantId); SpiTransaction transaction = manager.createTransaction(explicit, connection); transaction.setTenantId(tenantId); return transaction; 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 d4feba7b56..7c63f685a1 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 @@ -30,7 +30,7 @@ public SpiTransaction createReadOnlyTransaction(Object tenantId) { // obtain the tenantId if the DataSource requires it tenantId = dataSourceSupplier.currentTenantId(); } - connection = dataSourceSupplier.getReadOnlyConnection(tenantId); + connection = dataSourceSupplier.readOnlyConnection(tenantId); 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 bfaf8cfb5f..7d4293af52 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 @@ -248,17 +248,17 @@ public final String name() { @Override public final Connection queryPlanConnection() throws SQLException { - return dataSourceSupplier.getConnection(null); + return dataSourceSupplier.connection(null); } @Override public final DataSource dataSource() { - return dataSourceSupplier.getDataSource(); + return dataSourceSupplier.dataSource(); } @Override public final DataSource readOnlyDataSource() { - return dataSourceSupplier.getReadOnlyDataSource(); + return dataSourceSupplier.readOnlyDataSource(); } /** From 462d30bbb7e8d392ca1ea4c60fceb08654516daa Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 7 Jun 2023 17:56:19 +1200 Subject: [PATCH 023/161] Version 13.19.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-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 | 6 ++-- querybean-generator/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 6 ++-- 47 files changed, 194 insertions(+), 194 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index 9f7098beb8..5d9b0aa6d5 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-clickhouse @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-clickhouse - 13.18.0 + 13.19.0 diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index 53ba7d7504..7fe6a427a4 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-cockroach @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-postgres - 13.18.0 + 13.19.0 diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 6ab12676b3..cb75c17306 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-db2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-db2 - 13.18.0 + 13.19.0 diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 4510a8ae5a..4e5620fd4e 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-h2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-h2 - 13.18.0 + 13.19.0 diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index 7b10af0277..175eb9d3ef 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-hana @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-hana - 13.18.0 + 13.19.0 diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 5c149d0b23..e497d933b5 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-mariadb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-mariadb - 13.18.0 + 13.19.0 diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index 73202114b4..25d1aba27e 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-mysql @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-mysql - 13.18.0 + 13.19.0 diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index 6e85c244db..b3522f1355 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-nuodb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-nuodb - 13.18.0 + 13.19.0 diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index f760b81642..a8cb4113f4 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-oracle @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-oracle - 13.18.0 + 13.19.0 diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index efddb430fe..ae23f2c087 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-postgres @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-postgres - 13.18.0 + 13.19.0 diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index 127ff2fbe2..e55913c27d 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-sqlite @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-sqlite - 13.18.0 + 13.19.0 diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 911d8e98c1..4410d9815e 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-sqlserver @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-sqlserver - 13.18.0 + 13.19.0 diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index a212aac2b5..adb4893f33 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean-yugabyte @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-postgres - 13.18.0 + 13.19.0 diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 2a739de63f..4a0cf436ab 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.18.0 + 13.19.0 ebean (all platforms) @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 @@ -40,7 +40,7 @@ io.ebean ebean-jackson-mapper - 13.18.0 + 13.19.0 @@ -59,13 +59,13 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean ebean-platform-all - 13.18.0 + 13.19.0 diff --git a/composites/pom.xml b/composites/pom.xml index 521d44f6fe..b82d0cfe84 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index cd7c581ecc..3d351c7760 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 14307a097d..eeac8eb62c 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.18.0 + 13.19.0 io.ebean ebean-api - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 io.ebean ebean-core-type - 13.18.0 + 13.19.0 @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.18.0 + 13.19.0 io.ebean ebean-ddl-generator - 13.18.0 + 13.19.0 @@ -155,46 +155,46 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 io.ebean querybean-generator - 13.18.0 + 13.19.0 provided io.ebean kotlin-querybean-generator - 13.18.0 + 13.19.0 provided io.ebean ebean-test - 13.18.0 + 13.19.0 test io.ebean ebean-postgis - 13.18.0 + 13.19.0 io.ebean ebean-redis - 13.18.0 + 13.19.0 io.ebean ebean-spring-txn - 13.18.0 + 13.19.0 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.18.0 + 13.19.0 io.ebean ebean-db2 - 13.18.0 + 13.19.0 io.ebean ebean-h2 - 13.18.0 + 13.19.0 io.ebean ebean-hana - 13.18.0 + 13.19.0 io.ebean ebean-mariadb - 13.18.0 + 13.19.0 io.ebean ebean-mysql - 13.18.0 + 13.19.0 io.ebean ebean-nuodb - 13.18.0 + 13.19.0 io.ebean ebean-oracle - 13.18.0 + 13.19.0 io.ebean ebean-postgres - 13.18.0 + 13.19.0 io.ebean ebean-sqlite - 13.18.0 + 13.19.0 io.ebean ebean-sqlserver - 13.18.0 + 13.19.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 393fb33092..a30311c155 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 4a9de2da0d..f15601533c 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.18.0 + 13.19.0 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.18.0 + 13.19.0 test io.ebean ebean-platform-postgres - 13.18.0 + 13.19.0 test io.ebean ebean-platform-sqlserver - 13.18.0 + 13.19.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e6a01b5f21..f3c20994c9 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.18.0 + 13.19.0 provided io.ebean ebean-core - 13.18.0 + 13.19.0 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.18.0 + 13.19.0 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index acd5a2790b..ee7ac3b4f5 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.18.0 + 13.19.0 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 030ccec7af..a17295e7df 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.18.0 + 13.19.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index aba033c797..a2b35bc925 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.18.0 + 13.19.0 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.18.0 + 13.19.0 test io.ebean querybean-generator - 13.18.0 + 13.19.0 test io.ebean ebean-test - 13.18.0 + 13.19.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index ceb140695c..d5ee93c45d 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 provided io.ebean ebean-core - 13.18.0 + 13.19.0 provided io.ebean ebean-querybean - 13.18.0 + 13.19.0 test io.ebean querybean-generator - 13.18.0 + 13.19.0 test io.ebean ebean-test - 13.18.0 + 13.19.0 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 9764159227..dd6bbd0dc0 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.18.0 + 13.19.0 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.18.0 + 13.19.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index ed70e511bc..a67d02c05a 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.18.0 + 13.19.0 io.ebean ebean-core - 13.18.0 + 13.19.0 provided io.ebean ebean-ddl-generator - 13.18.0 + 13.19.0 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.18.0 + 13.19.0 test io.ebean ebean-platform-all - 13.18.0 + 13.19.0 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 9f291657a9..679ba33b43 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.18.0 + 13.19.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.18.0 + 13.19.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.18.0 + 13.19.0 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.18.0 + 13.19.0 test io.ebean ebean-ddl-generator - 13.18.0 + 13.19.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 682e20deb4..dd133a9e0a 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.18.0 + 13.19.0 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.18.0 + 13.19.0 io.ebean ebean-platform-clickhouse - 13.18.0 + 13.19.0 io.ebean ebean-platform-db2 - 13.18.0 + 13.19.0 io.ebean ebean-platform-hana - 13.18.0 + 13.19.0 io.ebean ebean-platform-hsqldb - 13.18.0 + 13.19.0 io.ebean ebean-platform-mysql - 13.18.0 + 13.19.0 io.ebean ebean-platform-mariadb - 13.18.0 + 13.19.0 io.ebean ebean-platform-nuodb - 13.18.0 + 13.19.0 io.ebean ebean-platform-oracle - 13.18.0 + 13.19.0 io.ebean ebean-platform-postgres - 13.18.0 + 13.19.0 io.ebean ebean-platform-sqlanywhere - 13.18.0 + 13.19.0 io.ebean ebean-platform-sqlite - 13.18.0 + 13.19.0 io.ebean ebean-platform-sqlserver - 13.18.0 + 13.19.0 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 43dfa54e45..d6f34e52e9 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.18.0 + 13.19.0 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 24128afb6d..8712af4dc0 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.18.0 + 13.19.0 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 76bb2cceab..a8b59600ce 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.18.0 + 13.19.0 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.18.0 + 13.19.0 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.19.0 + 13.20.0 io.ebean ebean-db2 - 13.19.0 + 13.20.0 io.ebean ebean-h2 - 13.19.0 + 13.20.0 io.ebean ebean-hana - 13.19.0 + 13.20.0 io.ebean ebean-mariadb - 13.19.0 + 13.20.0 io.ebean ebean-mysql - 13.19.0 + 13.20.0 io.ebean ebean-nuodb - 13.19.0 + 13.20.0 io.ebean ebean-oracle - 13.19.0 + 13.20.0 io.ebean ebean-postgres - 13.19.0 + 13.20.0 io.ebean ebean-sqlite - 13.19.0 + 13.20.0 io.ebean ebean-sqlserver - 13.19.0 + 13.20.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index a30311c155..9a967cd3bc 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.19.0 + 13.20.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index f15601533c..4f24361ffd 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.19.0 + 13.20.0 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.19.0 + 13.20.0 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.19.0 + 13.20.0 test io.ebean ebean-platform-postgres - 13.19.0 + 13.20.0 test io.ebean ebean-platform-sqlserver - 13.19.0 + 13.20.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index f3c20994c9..a90539fdff 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.19.0 + 13.20.0 provided io.ebean ebean-core - 13.19.0 + 13.20.0 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.19.0 + 13.20.0 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index ee7ac3b4f5..fc728e4db5 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.19.0 + 13.20.0 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index a17295e7df..ca347bf375 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.19.0 + 13.20.0 io.ebean ebean-core - 13.19.0 + 13.20.0 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.19.0 + 13.20.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index a2b35bc925..5946f3537e 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.19.0 + 13.20.0 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.19.0 + 13.20.0 test io.ebean querybean-generator - 13.19.0 + 13.20.0 test io.ebean ebean-test - 13.19.0 + 13.20.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d5ee93c45d..88721b1779 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.19.0 + 13.20.0 provided io.ebean ebean-core - 13.19.0 + 13.20.0 provided io.ebean ebean-querybean - 13.19.0 + 13.20.0 test io.ebean querybean-generator - 13.19.0 + 13.20.0 test io.ebean ebean-test - 13.19.0 + 13.20.0 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index dd6bbd0dc0..784e0e0ebc 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.19.0 + 13.20.0 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.19.0 + 13.20.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index a67d02c05a..26ec577986 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.19.0 + 13.20.0 io.ebean ebean-core - 13.19.0 + 13.20.0 provided io.ebean ebean-ddl-generator - 13.19.0 + 13.20.0 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.19.0 + 13.20.0 test io.ebean ebean-platform-all - 13.19.0 + 13.20.0 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 679ba33b43..96b462921e 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.19.0 + 13.20.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.19.0 + 13.20.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.19.0 + 13.20.0 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.19.0 + 13.20.0 test io.ebean ebean-ddl-generator - 13.19.0 + 13.20.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index dd133a9e0a..0b06ad75f3 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.19.0 + 13.20.0 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.19.0 + 13.20.0 io.ebean ebean-platform-clickhouse - 13.19.0 + 13.20.0 io.ebean ebean-platform-db2 - 13.19.0 + 13.20.0 io.ebean ebean-platform-hana - 13.19.0 + 13.20.0 io.ebean ebean-platform-hsqldb - 13.19.0 + 13.20.0 io.ebean ebean-platform-mysql - 13.19.0 + 13.20.0 io.ebean ebean-platform-mariadb - 13.19.0 + 13.20.0 io.ebean ebean-platform-nuodb - 13.19.0 + 13.20.0 io.ebean ebean-platform-oracle - 13.19.0 + 13.20.0 io.ebean ebean-platform-postgres - 13.19.0 + 13.20.0 io.ebean ebean-platform-sqlanywhere - 13.19.0 + 13.20.0 io.ebean ebean-platform-sqlite - 13.19.0 + 13.20.0 io.ebean ebean-platform-sqlserver - 13.19.0 + 13.20.0 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index d6f34e52e9..e8f2f36d43 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.19.0 + 13.20.0 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.19.0 + 13.20.0 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 8712af4dc0..7b0bff191e 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.19.0 + 13.20.0 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.19.0 + 13.20.0 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index a8b59600ce..def1f2b03f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.19.0 + 13.20.0 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.19.0 + 13.20.0 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-db2 - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-h2 - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-hana - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-mariadb - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-mysql - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-nuodb - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-oracle - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-postgres - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-sqlite - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-sqlserver - 13.20.0 + 13.20.1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 9a967cd3bc..a2841ea884 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.0 + 13.20.1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 4f24361ffd..bebfcfc81a 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.20.0 + 13.20.1-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.0 + 13.20.1-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index a90539fdff..74df0cb426 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.0 + 13.20.1-SNAPSHOT provided io.ebean ebean-core - 13.20.0 + 13.20.1-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index fc728e4db5..4cf1de4c6c 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.0 + 13.20.1-SNAPSHOT provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index ca347bf375..49ea99ec8a 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-core - 13.20.0 + 13.20.1-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5946f3537e..1418e317a8 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.0 + 13.20.1-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean querybean-generator - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean ebean-test - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 88721b1779..db24a8a6d9 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.0 + 13.20.1-SNAPSHOT provided io.ebean ebean-core - 13.20.0 + 13.20.1-SNAPSHOT provided io.ebean ebean-querybean - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean querybean-generator - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean ebean-test - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 784e0e0ebc..0872b4609f 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.0 + 13.20.1-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 26ec577986..54a42da76c 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-core - 13.20.0 + 13.20.1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.20.0 + 13.20.1-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean ebean-platform-all - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 96b462921e..e99e24e0d7 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.0 + 13.20.1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.0 + 13.20.1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.0 + 13.20.1-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.0 + 13.20.1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.20.0 + 13.20.1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 0b06ad75f3..dfcc20fe72 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-db2 - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-hana - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-mysql - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-oracle - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.20.0 + 13.20.1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.20.0 + 13.20.1-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index e8f2f36d43..a19da7a83e 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.0 + 13.20.1-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 7b0bff191e..b3207a18c2 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.0 + 13.20.1-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index def1f2b03f..d00e9831c8 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.0 + 13.20.1-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.0 + 13.20.1-SNAPSHOT @@ -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 156/161] 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 157/161] 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 158/161] 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 159/161] 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 160/161] 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 161/161] 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: