Version 13.23.2-jakarta

Upgrade ANTLR4 from version 4.8-1 to 4.13.1

.github/workflows/build.yml

@@ -17,14 +17,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/db2luw.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/h2database.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/jdk-ea.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
       uses: oracle-actions/setup-java@v1
       with:
         website: jdk.java.net
         release: ${{ matrix.java_version }}
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/mariadb.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/multi-db-platform.yml

@@ -17,14 +17,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/multi-jdk-build.yml

@@ -16,24 +16,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11, 17]
+        java_version: [11, 17, 21]
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:
         path:
           ~/.m2
         key: build-${{ env.cache-name }}
+    - name: Maven version
+      run: mvn --version
     - name: Build with Maven
       run: mvn package
 

.github/workflows/mysql.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/oracle.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/postgres.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/sqlserver-2019.yml

@@ -17,14 +17,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/sqlserver.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/yugabyte.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.gitignore

@@ -11,6 +11,7 @@ ebean-profiling*.xml
 /db
 /mydb.db
 profiling/
+.DS_Store
 
 # Intellij project files
 *.iml

CONFIGURATION.md

@@ -4,13 +4,13 @@ Overview of ebean.properties file
 
 ### DbMigration options
 
-You can set individual values for different platforms when generating migrations
+You can set individual values for different platforms when generating migrations.
 
 `dbmigration.platform.<PLATFORM>.databaseSequenceBatchSize`
 For DB's using sequences this is the number of sequence values prefetched.
  
 `dbmigration.platform.<PLATFORM>.dbuuid`
-Control, how UUID generation should work - it affects DDL which column type is generated. Possible values:
+Control, how UUID generation should work - it affects which column type is generated in DDL. Possible values:
 - BINARY enforces binary UUID 
 - VARCHAR enforces varchar UUID
 - BINARY_OPTIMIZED enforces binary-optimized UUID (makes sense only with Type1 ID)
@@ -19,7 +19,7 @@ Control, how UUID generation should work - it affects DDL which column type is g
 - AUTO_VARCHAR (default) use varchar when platform does not support UUID 
 
 `dbmigration.platform.<PLATFORM>.uuidStoreAsBinary`
-Same as setting dbuuid to BINARY
+Same as setting dbuuid to BINARY.
 
 `dbmigration.platform.<PLATFORM>.geometrySRID`
 The Geometry SRID value (default 4326).
@@ -30,7 +30,6 @@ The ID type (IDENTITY, SEQUENCE, GENERATOR, EXTERNAL)
 `dbmigration.platform.<PLATFORM>.mapping`
 Adjust the mapping. For example `BOOLEAN=integer(32);BIT=tinyint(3)`
 
-
 `ebean.migration.applyPrefix`
 Set this to "V" to be compatible with FlywayDB.
 
@@ -50,7 +49,7 @@ Set to true if the DB migration should be generated on server start.
 The version of a pending drop that should be generated as the next migration.
 
 `ebean.migration.includeGeneratedFileComment`
-TODO
+Adds the header about the migration files being generated when true. Reading 'THIS IS A GENERATED FILE - DO NOT MODIFY'
 
 `ebean.migration.metaTable`
 For running migration the DB table that holds migration execution status. Default 'db_migration'
@@ -65,17 +64,17 @@ Subdirectory the model xml files go into. Default 'model'
 Suffix. Default '.model.xml' 
 
 `ebean.migration.name`
-Description text that can be appended to the version to become the ddl script file name
+Description text that can be appended to the version to become the ddl script file name.
  
 `ebean.migration.patchInsertOn`
-migration versions that should be added to history without running.
+Migration versions that should be added to history without running.
 
 `ebean.migration.patchResetChecksumOn`
 migration versions that should have their checksum reset and not run.
 Use this if you get a 'Checksum mismatch' error.
 
 `ebean.migration.placeholders`
-A comma and equals delimited placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
+A comma and equals delimited map of placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
 
 `ebean.migration.platform`
 The database platform to generate migration DDL for.
@@ -90,7 +89,7 @@ The migration version name (typically FlywayDb compatible). Example: 1.1.1_2
 ### Ebean UUID options
 
 `ebean.uuidVersion`
-Controls, how the UUIDs are generated. Possible values
+Controls how the UUIDs are generated. Possible values:
 - VERSION4 (default) generate random V4 UUIDs,
 - VERSION1 generate rfc4122 compliant Type 1 UUIDs (requires a state file)
 - VERSION1RND generate fake Type 1 UUIDs
@@ -98,7 +97,7 @@ Controls, how the UUIDs are generated. Possible values
 Note, that V1 UUIDs in conjunction with AUTO_BINARY_OPTIMIZED will give you the best index performance, but you MUST understand how this works to avoid collisions.
 
 `ebean.uuidStateFile`
-The state file that is Required to generate V1 UUIDs
+The state file that is required to generate V1 UUIDs.
 
 
 ### DocStoreConfig
@@ -107,7 +106,7 @@ The state file that is Required to generate V1 UUIDs
 True when the Document store integration is active/on.
 
 `ebean.docstore.allowAllCertificates`
-Set to true such that the client allows connections to invalid/self signed SSL certificates.
+Set to true such that the client allows connections to invalid/self-signed SSL certificates.
 
 `ebean.docstore.bulkBatchSize`
 The default batch size to use for the Bulk API calls.
@@ -192,7 +191,7 @@ Suffix appended to the base table to derive the view that contains the union of
 Set to true if the DataSource uses autoCommit. Indicates that Ebean should use autoCommit friendly Transactions and TransactionManager.
 
 `ebean.autoReadOnlyDataSource`
-When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig
+When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig.
 
 `ebean.autostart`
 Should the server start all

README.md

@@ -120,3 +120,4 @@ To set this option as the global default for IntelliJ use:
 `Run - Edit Configurations -> Edit configuration templates -> JUnit -> modify options - Do not use module-path option`
 
 
+end

composites/ebean-clickhouse/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-nuodb/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgis/pom.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <name>ebean-postgis</name>
+  <description>ebean-postgis composite</description>
+  <artifactId>ebean-postgis</artifactId>
+
+  <properties>
+    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
+    <postgres.jdbc.version>42.6.0</postgres.jdbc.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-postgis-types</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgres.jdbc.version}</version>
+      <exclusions>
+        <!-- exclude unnecessary checker framework -->
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>${postgis.jdbc.version}</version>
+    </dependency>
+
+  </dependencies>
+</project>

composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.postgis.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-postgis/src/main/java/module-info.java

@@ -0,0 +1,10 @@
+module io.ebean.postgis {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.postgres;
+  // requires transitive io.ebean.postgis.types;
+
+}

composites/ebean-postgres/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -31,17 +32,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,31 +17,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.13.1</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.13.1</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
@@ -49,17 +50,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.13.1</version>
+      <version>13.23.2-jakarta</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
   </parent>
 
   <artifactId>composites</artifactId>
@@ -23,6 +23,7 @@
     <module>ebean-nuodb</module>
     <module>ebean-oracle</module>
     <module>ebean-postgres</module>
+    <module>ebean-postgis</module>
 <!--    <module>sqlanywhere</module>-->
     <module>ebean-sqlite</module>
     <module>ebean-sqlserver</module>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1</version>
+    <version>13.23.2-jakarta</version>
   </parent>
 
   <name>ebean api</name>
@@ -26,12 +26,6 @@
       <version>1.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-config</artifactId>
-      <version>2.4</version>
-    </dependency>
-
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -42,9 +36,15 @@
       <version>1.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-config</artifactId>
+      <version>3.9</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>persistence-api</artifactId>
+      <artifactId>jakarta-persistence-api</artifactId>
       <version>${ebean-persistence-api.version}</version>
     </dependency>
 
@@ -90,29 +90,22 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- JAVAX-DEPENDENCY-START -->
+    <!-- JAVAX-DEPENDENCY-START ___
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <version>3.1.0</version>
       <optional>true</optional>
     </dependency>
-    <!-- JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START ___
+    ____ JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START -->
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
       <version>6.0.0</version>
       <optional>true</optional>
     </dependency>
-    ____ JAKARTA-DEPENDENCY-END -->
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
+    <!-- JAKARTA-DEPENDENCY-END -->
 
   </dependencies>
 

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.

ebean-api/src/main/java/io/ebean/BeanFinder.java

@@ -33,11 +33,6 @@ import java.util.Optional;
 @NonNullApi
 public abstract class BeanFinder<I,T> {
 
-  /**
-   * Migrate to using database rather than server.
-   */
-  @Deprecated
-  protected final Database server;
   protected final Database database;
   protected final Class<T> type;
 
@@ -50,7 +45,6 @@ public abstract class BeanFinder<I,T> {
   protected BeanFinder(Class<T> type, Database database) {
     this.type = type;
     this.database = database;
-    this.server = database;
   }
 
   /**

ebean-api/src/main/java/io/ebean/DB.java

@@ -7,8 +7,8 @@ import io.ebean.cache.ServerCacheManager;
 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;
@@ -267,15 +267,21 @@ public final class DB {
   }
 
   /**
+   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
+   * <p>
    * Commit the current transaction.
    */
+  @Deprecated(forRemoval = true)
   public static void commitTransaction() {
     getDefault().commitTransaction();
   }
 
   /**
+   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
+   * <p>
    * Rollback the current transaction.
    */
+  @Deprecated(forRemoval = true)
   public static void rollbackTransaction() {
     getDefault().rollbackTransaction();
   }

ebean-api/src/main/java/io/ebean/DInTuples.java

@@ -0,0 +1,49 @@
+package io.ebean;
+
+import io.ebean.service.SpiInTuples;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Default implementation of SpiInTuples.
+ */
+final class DInTuples implements SpiInTuples {
+
+  private final String[] properties;
+  private final int propertyCount;
+  private final List<Object[]> entries = new ArrayList<>();
+
+
+  DInTuples(String[] properties) {
+    this.properties = properties;
+    this.propertyCount = properties.length;
+  }
+
+  @Override
+  public InTuples add(Object... values) {
+    if (values.length != propertyCount) {
+      throw new IllegalArgumentException("Require " + propertyCount + " values but got " + values.length);
+    }
+    entries.add(values);
+    return this;
+  }
+
+  /**
+   * Return the first property name.
+   */
+  @Override
+  public String[] properties() {
+    return properties;
+  }
+
+  /**
+   * Return all the value pairs.
+   */
+  @Override
+  public List<Object[]> entries() {
+    return Collections.unmodifiableList(entries);
+  }
+
+}

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.

ebean-api/src/main/java/io/ebean/Database.java

@@ -11,8 +11,8 @@ import io.ebean.plugin.Property;
 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;
@@ -35,7 +35,7 @@ import java.util.concurrent.Callable;
  * <h5>The 'default' Database</h5>
  * <p>
  * One Database can be designated as the 'default' or 'primary' Database
- * (see {@link DatabaseConfig#setDefaultServer(boolean)}. Many methods on DB
+ * (see {@link DatabaseConfig#setDefaultServer(boolean)}). Many methods on DB
  * such as {@link DB#find(Class)} etc are actually just a convenient way to
  * call methods on the 'default/primary' Database.
  *
@@ -166,7 +166,7 @@ public interface Database {
   /**
    * Return the BeanState for a given entity bean.
    * <p>
-   * This will return null if the bean is not an enhanced entity bean.
+   * This will throw an IllegalArgumentException if the bean is not an enhanced entity bean.
    */
   BeanState beanState(Object bean);
 
@@ -650,13 +650,19 @@ public interface Database {
   void flush();
 
   /**
+   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
+   * <p>
    * Commit the current transaction.
    */
+  @Deprecated(forRemoval = true)
   void commitTransaction();
 
   /**
+   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
+   * <p>
    * Rollback the current transaction.
    */
+  @Deprecated(forRemoval = true)
   void rollbackTransaction();
 
   /**

ebean-api/src/main/java/io/ebean/DatabaseFactory.java

@@ -5,7 +5,7 @@ import io.ebean.config.DatabaseConfig;
 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;

ebean-api/src/main/java/io/ebean/DbContext.java

@@ -3,7 +3,7 @@ package io.ebean;
 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;
@@ -38,12 +38,15 @@ final class DbContext {
         }
       }
     } catch (BeanNotEnhancedException e) {
+      String msg = "Bean is not enhanced? See https://ebean.io/docs/trouble-shooting#not-enhanced";
+      log.log(ERROR, msg, e);
       throw e;
 
     } catch (DataSourceConfigurationException e) {
       String msg = "Configuration error creating DataSource for the default Database." +
         " This typically means a missing application-test.yaml or missing ebean-test dependency." +
         " See https://ebean.io/docs/trouble-shooting#datasource";
+      log.log(ERROR, msg, e);
       throw new DataSourceConfigurationException(msg, e);
 
     } catch (Throwable e) {

ebean-api/src/main/java/io/ebean/DtoQuery.java

@@ -205,4 +205,16 @@ public interface DtoQuery<T> extends CancelableQuery {
    * Use the explicit transaction to execute the query.
    */
   DtoQuery<T> usingTransaction(Transaction transaction);
+
+  /**
+   * Ensure that the master DataSource is used if there is a read only data source
+   * being used (that is using a read replica database potentially with replication lag).
+   * <p>
+   * When the database is configured with a read-only DataSource via
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
+   * by default when a query is run without an active transaction, it uses the read-only data
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
+   * against the master data source.
+   */
+  DtoQuery<T> usingMaster();
 }

ebean-api/src/main/java/io/ebean/Expr.java

@@ -41,14 +41,14 @@ public final class Expr {
    * 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 final class Expr {
    * 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 final class Expr {
    * </p>
    */
   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 final class Expr {
    * 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 final class Expr {
    * 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 final class Expr {
    * 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 final class Expr {
    * 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 final class Expr {
    * 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 final class Expr {
    * 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 final class Expr {
    * 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 final class Expr {
    * }</pre>
    */
   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 final class Expr {
    * @param propertyMap a map keyed by property names.
    */
   public static Expression allEq(Map<String, Object> propertyMap) {
-    return DB.expressionFactory().allEq(propertyMap);
+    return factory().allEq(propertyMap);
   }
 
   /**
@@ -310,7 +310,7 @@ public final class Expr {
    * </p>
    */
   public static Expression raw(String raw, Object value) {
-    return DB.expressionFactory().raw(raw, value);
+    return factory().raw(raw, value);
   }
 
   /**
@@ -321,48 +321,48 @@ public final class Expr {
    * </p>
    */
   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 <T> Junction<T> conjunction(Query<T> query) {
-    return DB.expressionFactory().conjunction(query);
+    return factory().conjunction(query);
   }
 
   /**
    * Return a list of expressions that will be joined by OR's.
    */
   public static <T> Junction<T> disjunction(Query<T> query) {
-    return DB.expressionFactory().disjunction(query);
+    return factory().disjunction(query);
   }
 }

ebean-api/src/main/java/io/ebean/ExpressionFactory.java

@@ -1,10 +1,6 @@
 package io.ebean;
 
-import io.ebean.search.Match;
-import io.ebean.search.MultiMatch;
-import io.ebean.search.TextCommonTerms;
-import io.ebean.search.TextQueryString;
-import io.ebean.search.TextSimple;
+import io.ebean.search.*;
 
 import java.util.Collection;
 import java.util.Map;
@@ -40,6 +36,11 @@ import java.util.Map;
  */
 public interface ExpressionFactory {
 
+  /**
+   * Return a new ExpressionList.
+   */
+  <T> ExpressionList<T> expressionList();
+
   /**
    * Path exists - for the given path in a JSON document.
    */
@@ -373,6 +374,11 @@ public interface ExpressionFactory {
    */
   Expression inPairs(Pairs pairs);
 
+  /**
+   * In expression using multiple columns.
+   */
+  Expression inTuples(InTuples pairs);
+
   /**
    * In - property has a value in the array of values.
    */
@@ -423,6 +429,94 @@ public interface ExpressionFactory {
    */
   Expression inOrEmpty(String propertyName, Collection<?> values);
 
+  /**
+   * EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression exists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression notExists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
   /**
    * Not In - property has a value in the array of values.
    */

ebean-api/src/main/java/io/ebean/ExpressionList.java

@@ -4,7 +4,7 @@ import io.avaje.lang.NonNullApi;
 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.*;
@@ -54,14 +54,12 @@ public interface ExpressionList<T> {
   Query<T> orderById(boolean orderById);
 
   /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * 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<T> order(String orderByClause);
+  @Deprecated(since = "13.19", forRemoval = true)
+  default ExpressionList<T> 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<T> {
   ExpressionList<T> orderBy(String orderBy);
 
   /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * <p>
-   * This is the same as <code>orderBy()</code>
+   * Deprecated migrate to orderBy().
    */
-  OrderBy<T> order();
+  @Deprecated(forRemoval = true)
+  default OrderBy<T> order() {
+    return orderBy();
+  }
 
   /**
    * Return the OrderBy so that you can append an ascending or descending
@@ -95,12 +90,6 @@ public interface ExpressionList<T> {
    */
   OrderBy<T> orderBy();
 
-  /**
-   * Deprecated migrate to {@link #orderBy(String)}
-   */
-  @Deprecated
-  Query<T> setOrderBy(String orderBy);
-
   /**
    * Apply the path properties to the query replacing the select and fetch clauses.
    */
@@ -404,6 +393,7 @@ public interface ExpressionList<T> {
    *
    * }</pre>
    */
+  @Nullable
   default <A> A findSingleAttribute() {
     List<A> list = findSingleAttributeList();
     return !list.isEmpty() ? list.get(0) : null;
@@ -518,6 +508,8 @@ public interface ExpressionList<T> {
   ExpressionList<T> filterMany(String manyProperty);
 
   /**
+   * Deprecated for removal - migrate to filterManyRaw()
+   * <p>
    * Add filter expressions to the many property.
    *
    * <pre>{@code
@@ -534,8 +526,29 @@ public interface ExpressionList<T> {
    * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
    * @param params       Bind parameters used in the expressions
    */
+  @Deprecated(forRemoval = true)
   ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);
 
+  /**
+   * Add filter expressions for the many path. The expressions can include SQL functions if
+   * desired and the property names are translated to column names.
+   * <p>
+   * The expressions can contain placeholders for bind values using <code>?</code> or <code>?1</code> style.
+   *
+   * <pre>{@code
+   *
+   *     new QCustomer()
+   *       .name.startsWith("Postgres")
+   *       .contacts.filterManyRaw("status = ? and firstName like ?", Contact.Status.NEW, "Rob%")
+   *       .findList();
+   *
+   * }</pre>
+   *
+   * @param rawExpressions The raw expressions which can include ? and ?1 style bind parameter placeholders
+   * @param params The parameter values to bind
+   */
+  ExpressionList<T> filterManyRaw(String manyProperty, String rawExpressions, Object... params);
+
   /**
    * Specify specific properties to fetch on the main/root bean (aka partial
    * object).
@@ -1141,6 +1154,99 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> inPairs(Pairs pairs);
 
+  /**
+   * In expression using multiple columns.
+   */
+  ExpressionList<T> inTuples(InTuples pairs);
+
+  /**
+   * EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> exists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> notExists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
   /**
    * In - using a subQuery.
    */

ebean-api/src/main/java/io/ebean/ExtendedServer.java

@@ -1,26 +1,9 @@
 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.
- * <p>
- * Deprecated in favour of using {@link Query#usingTransaction(Transaction)} instead.
- * <p>
- * This provides the finder methods that take an explicit transaction rather than obtaining
- * the transaction from the usual mechanism (which is ThreadLocal based).
- * <p>
- * 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 {
 
@@ -35,162 +18,4 @@ public interface ExtendedServer {
   @Deprecated
   void setClock(Clock clock);
 
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> boolean exists(Query<T> ormQuery, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> int findCount(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <A, T> List<A> findIds(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> Stream<T> findStream(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> List<T> findList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> Set<T> findSet(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <A, T> Set<A> findSingleAttributeSet(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  @Nullable
-  <T> T findOne(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> int delete(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> int update(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  List<SqlRow> findList(SqlQuery query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link SqlQuery#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  @Nullable
-  SqlRow findOne(SqlQuery query, Transaction transaction);
-
 }

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;

ebean-api/src/main/java/io/ebean/InTuples.java

@@ -0,0 +1,36 @@
+package io.ebean;
+
+/**
+ * IN expression using multiple columns.
+ * <p>
+ * Currently this is not supported with SQLServer or DB2.
+ * <p>
+ * Produces SQL expression in the form of (A,B,C) IN ((a0,b0,c0), (a1,b1,c1), ... )
+ * where A,B,C are the properties in the tuples.
+ */
+public interface InTuples {
+
+  /**
+   * Create given the properties in the tuples.
+   */
+  static InTuples of(String... properties) {
+    return new DInTuples(properties);
+  }
+
+  /**
+   * Create given the properties in the tuples.
+   */
+  static InTuples of(Query.Property<?>... properties) {
+    String[] props = new String[properties.length];
+    for (int i = 0; i < properties.length; i++) {
+      props[i] = properties[i].toString();
+    }
+    return new DInTuples(props);
+  }
+
+  /**
+   * Add a tuple entry. All values must be non-null.
+   */
+  InTuples add(Object... values);
+
+}

ebean-api/src/main/java/io/ebean/Lists.java

@@ -0,0 +1,42 @@
+package io.ebean;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Helper methods for Lists.
+ */
+public final class Lists {
+
+  private Lists() {
+  }
+
+  /**
+   * Partition the source List into sub-lists with a maximum size.
+   * <p>
+   * The sub-lists will all be the max size except for the last sub-list
+   * which can potentially be smaller.
+   *
+   * @param source The source list
+   * @param max    The max size of each partition
+   * @param <T>    The list element type
+   * @return List of sub-list partitions
+   */
+  public static <T> List<List<T>> partition(List<T> source, int max) {
+    final int totalCount = source.size();
+    if (totalCount == 0) {
+      return Collections.emptyList();
+    } else if (totalCount <= max) {
+      return List.of(source);
+    }
+    final int numOfPartitions = (totalCount + max - 1) / max;  // round up
+    final var dest = new ArrayList<List<T>>(numOfPartitions);
+    for (int i = 0; i < numOfPartitions; i++) {
+      final int from = i * max;
+      final int to = Math.min(from + max, totalCount);
+      dest.add(source.subList(from, to));
+    }
+    return dest;
+  }
+}

ebean-api/src/main/java/io/ebean/OrderBy.java

@@ -333,10 +333,10 @@ public class OrderBy<T> implements Serializable {
           sb.append(property);
         }
         if (!ascending) {
-          sb.append(" ").append("desc");
+          sb.append(' ').append("desc");
         }
         if (nulls != null) {
-          sb.append(" ").append(nulls).append(" ").append(highLow);
+          sb.append(' ').append(nulls).append(' ').append(highLow);
         }
         return sb.toString();
       }

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.

ebean-api/src/main/java/io/ebean/ProfileLocation.java

@@ -30,23 +30,6 @@ public interface ProfileLocation {
     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.
    */

ebean-api/src/main/java/io/ebean/Query.java

@@ -3,13 +3,15 @@ package io.ebean;
 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;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -670,6 +672,16 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> apply(FetchPath fetchPath);
 
+  /**
+   * Apply changes to the query conditional on the supplied predicate.
+   * <p>
+   * Typically, the changes are extra predicates etc.
+   *
+   * @param predicate The predicate which when true the changes are applied
+   * @param apply The changes to apply to the query
+   */
+  Query<T> alsoIf(BooleanSupplier predicate, Consumer<Query<T>> apply);
+
   /**
    * Execute the query using the given transaction.
    */
@@ -685,6 +697,18 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> usingDatabase(Database database);
 
+  /**
+   * Ensure that the master DataSource is used if there is a read only data source
+   * being used (that is using a read replica database potentially with replication lag).
+   * <p>
+   * When the database is configured with a read-only DataSource via
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
+   * by default when a query is run without an active transaction, it uses the read-only data
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
+   * against the master data source.
+   */
+  Query<T> usingMaster();
+
   /**
    * Execute the query returning the list of Id's.
    * <p>
@@ -1372,13 +1396,9 @@ public interface Query<T> extends CancelableQuery {
   Query<T> orderBy(String orderByClause);
 
   /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * 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", forRemoval = true)
   default Query<T> order(String orderByClause) {
     return orderBy(orderByClause);
   }
@@ -1395,14 +1415,9 @@ public interface Query<T> extends CancelableQuery {
   OrderBy<T> orderBy();
 
   /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * <p>
-   * This is the same as <code>orderBy()</code>
+   * Deprecated migrate to orderBy().
    */
+  @Deprecated(since = "13.19", forRemoval = true)
   default OrderBy<T> order() {
     return orderBy();
   }
@@ -1413,8 +1428,9 @@ public interface Query<T> extends CancelableQuery {
   Query<T> setOrderBy(OrderBy<T> orderBy);
 
   /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
+   * Deprecated migrate to setOrderBy().
    */
+  @Deprecated(since = "13.19", forRemoval = true)
   default Query<T> setOrder(OrderBy<T> orderBy) {
     return setOrderBy(orderBy);
   }
@@ -1579,14 +1595,6 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> setReadOnly(boolean readOnly);
 
-  /**
-   * Deprecated - migrate to use setBeanCacheMode(CacheMode.PUT) or other CacheMode.
-   * <p>
-   * When set to true all the beans from this query are loaded into the bean cache.
-   */
-  @Deprecated
-  Query<T> setLoadBeanCache(boolean loadBeanCache);
-
   /**
    * Set a timeout on this query.
    * <p>

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.

ebean-api/src/main/java/io/ebean/SqlQuery.java

@@ -45,6 +45,18 @@ public interface SqlQuery extends Serializable, CancelableQuery {
    */
   SqlQuery usingTransaction(Transaction transaction);
 
+  /**
+   * Ensure that the master DataSource is used if there is a read only data source
+   * being used (that is using a read replica database potentially with replication lag).
+   * <p>
+   * When the database is configured with a read-only DataSource via
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
+   * by default when a query is run without an active transaction, it uses the read-only data
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
+   * against the master data source.
+   */
+  SqlQuery usingMaster();
+
   /**
    * Execute the query returning a list.
    */

ebean-api/src/main/java/io/ebean/StdOperators.java

@@ -9,7 +9,6 @@ import java.util.Collection;
  * <p>
  * This is currently deemed to be experimental and subject to change.
  */
-@Deprecated(since = "experimental")
 public final class StdOperators {
 
   // ---- Functions ---- //
@@ -77,9 +76,9 @@ public final class StdOperators {
     StringBuilder expression = new StringBuilder(50);
     expression.append("concat(").append(property.toString());
     for (Object value : values) {
-      expression.append(",").append(sqlConcatString(value));
+      expression.append(',').append(sqlConcatString(value));
     }
-    expression.append(")");
+    expression.append(')');
     return Property.of(expression.toString());
   }
 

ebean-api/src/main/java/io/ebean/Transaction.java

@@ -5,7 +5,7 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DocStoreConfig;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 
 /**

ebean-api/src/main/java/io/ebean/bean/BeanCollection.java

@@ -77,12 +77,12 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Return the bean that owns this collection.
    */
-  EntityBean getOwnerBean();
+  EntityBean owner();
 
   /**
    * Return the bean property name this collection represents.
    */
-  String getPropertyName();
+  String propertyName();
 
   /**
    * Check after the lazy load that the underlying collection is not null
@@ -99,7 +99,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
    * This is so that the filter can be applied on refresh.
    * </p>
    */
-  ExpressionList<?> getFilterMany();
+  ExpressionList<?> filterMany();
 
   /**
    * Set the filter that was used in building this collection.
@@ -154,7 +154,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Returns the underlying collection of beans from the Set, Map or List.
    */
-  Collection<E> getActualDetails();
+  Collection<E> actualDetails();
 
   /**
    * Returns the underlying entries so for Maps this is a collection of
@@ -162,7 +162,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
    * <p>
    * For maps this returns the entrySet as we need the keys of the map.
    */
-  Collection<?> getActualEntries();
+  Collection<?> actualEntries();
 
   /**
    * return true if there are real rows held. Return false is this is using
@@ -195,7 +195,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Return the current modify listening mode. Can be null for on newly created beans.
    */
-  ModifyListenMode getModifyListening();
+  ModifyListenMode modifyListening();
 
   /**
    * Add an object to the additions list.
@@ -217,13 +217,13 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
    * Return the list of objects added to the list set or map. These will used to
    * insert rows into the intersection table of a ManyToMany.
    */
-  Set<E> getModifyAdditions();
+  Set<E> modifyAdditions();
 
   /**
    * Return the list of objects removed from the list set or map. These will
    * used to delete rows from the intersection table of a ManyToMany.
    */
-  Set<E> getModifyRemovals();
+  Set<E> modifyRemovals();
 
   /**
    * Reset the set of additions and deletions. This is called after the
@@ -239,5 +239,5 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Return a shallow copy of this collection that is modifiable.
    */
-  BeanCollection<E> getShallowCopy();
+  BeanCollection<E> shallowCopy();
 }

ebean-api/src/main/java/io/ebean/bean/BeanLoader.java

@@ -13,7 +13,7 @@ public interface BeanLoader {
   /**
    * Return the name of the associated Database.
    */
-  String getName();
+  String name();
 
   /**
    * Invoke the lazy loading for this bean.

ebean-api/src/main/java/io/ebean/bean/CallOrigin.java

@@ -8,15 +8,15 @@ public interface CallOrigin {
   /**
    * Return the top element. Typically the top stack element with class and line.
    */
-  String getTopElement();
+  String top();
 
   /**
    * Return the full description of the call origin.
    */
-  String getFullDescription();
+  String description();
 
   /**
    * Compute and return an origin key based on the query hash.
    */
-  String getOriginKey(int queryHash);
+  String key(int queryHash);
 }

ebean-api/src/main/java/io/ebean/bean/CallStack.java

@@ -41,14 +41,14 @@ public final class CallStack implements Serializable, CallOrigin {
   public CallStack(List<StackWalker.StackFrame> frames) {
     this.callStack = frames.toArray(new Object[0]);
     this.hc = computeHashCode();
-    this.zeroHash = enc(callStack[0].hashCode());
+    this.zeroHash = enc(callStack[0].toString().hashCode());
     this.pathHash = enc(hc);
   }
 
   private int computeHashCode() {
     int hc = 0;
     for (Object element : callStack) {
-      hc = 92821 * hc + element.hashCode();
+      hc = 92821 * hc + element.toString().hashCode();
     }
     return hc;
   }
@@ -79,7 +79,7 @@ public final class CallStack implements Serializable, CallOrigin {
    * Return the first element of the call stack.
    */
   @Override
-  public String getTopElement() {
+  public String top() {
     return callStack[0].toString();
   }
 
@@ -87,7 +87,7 @@ public final class CallStack implements Serializable, CallOrigin {
    * Return the call stack lines appended with the given newLine string.
    */
   @Override
-  public String getFullDescription() {
+  public String description() {
     StringBuilder sb = new StringBuilder(400);
     for (int i = 0; i < callStack.length; i++) {
       if (i > 0) {
@@ -99,7 +99,7 @@ public final class CallStack implements Serializable, CallOrigin {
   }
 
   @Override
-  public String getOriginKey(int queryHash) {
+  public String key(int queryHash) {
     return enc(queryHash) + "." + zeroHash + "." + pathHash;
   }
 

ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java

@@ -17,12 +17,12 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the 'owning' entity bean.
    */
-  EntityBean getOwner();
+  EntityBean owner();
 
   /**
    * Return the persistenceContext.
    */
-  PersistenceContext getPersistenceContext();
+  PersistenceContext persistenceContext();
 
   /**
    * Set the persistenceContext.
@@ -37,7 +37,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the ownerId (IdClass).
    */
-  Object getOwnerId();
+  Object ownerId();
 
   /**
    * Set the ownerId (IdClass).
@@ -47,12 +47,12 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the owning bean for an embedded bean.
    */
-  Object getEmbeddedOwner();
+  Object embeddedOwner();
 
   /**
    * Return the property index (for the parent) of this embedded bean.
    */
-  int getEmbeddedOwnerIndex();
+  int embeddedOwnerIndex();
 
   /**
    * Clear the getter callback.
@@ -229,7 +229,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the original value that was changed via an update.
    */
-  Object getOrigValue(int propertyIndex);
+  Object origValue(int propertyIndex);
 
   /**
    * Finds the index position of a given property. Returns -1 if the
@@ -240,12 +240,12 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the property name for the given property.
    */
-  String getProperty(int propertyIndex);
+  String property(int propertyIndex);
 
   /**
    * Return the number of properties.
    */
-  int getPropertyLength();
+  int propertyLength();
 
   /**
    * Set the loaded state of the property given it's name.
@@ -321,17 +321,17 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the set of property names for a partially loaded bean.
    */
-  Set<String> getLoadedPropertyNames();
+  Set<String> loadedPropertyNames();
 
   /**
    * Return the array of flags indicating the dirty properties.
    */
-  boolean[] getDirtyProperties();
+  boolean[] dirtyProperties();
 
   /**
    * Return the set of dirty properties.
    */
-  Set<String> getDirtyPropertyNames();
+  Set<String> dirtyPropertyNames();
 
   /**
    * Recursively add dirty properties.
@@ -346,7 +346,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return a map of dirty properties with their new and old values.
    */
-  Map<String, ValuePair> getDirtyValues();
+  Map<String, ValuePair> dirtyValues();
 
   /**
    * Recursively add dirty properties.
@@ -361,7 +361,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return a dirty property hash taking into account embedded beans.
    */
-  StringBuilder getDirtyPropertyKey();
+  StringBuilder dirtyPropertyKey();
 
   /**
    * Add and return a dirty property hash.
@@ -371,22 +371,22 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return a loaded property hash.
    */
-  StringBuilder getLoadedPropertyKey();
+  StringBuilder loadedPropertyKey();
 
   /**
    * Return the loaded state for all the properties.
    */
-  boolean[] getLoaded();
+  boolean[] loaded();
 
   /**
    * Return the index of the property that triggered the lazy load.
    */
-  int getLazyLoadPropertyIndex();
+  int lazyLoadPropertyIndex();
 
   /**
    * Return the property that triggered the lazy load.
    */
-  String getLazyLoadProperty();
+  String lazyLoadProperty();
 
   /**
    * Load the bean when it is a reference.
@@ -497,7 +497,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the sort order value for an order column.
    */
-  int getSortOrder();
+  int sortOrder();
 
   /**
    * Set the sort order value for an order column.
@@ -522,7 +522,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Returns the loadErrors.
    */
-  Map<String, Exception> getLoadErrors();
+  Map<String, Exception> loadErrors();
 
   /**
    * Return true if the property has its changed state set.

ebean-api/src/main/java/io/ebean/bean/InterceptReadOnly.java

@@ -25,12 +25,17 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public EntityBean getOwner() {
+  public String toString() {
+    return "InterceptReadOnly{" + owner + '}';
+  }
+
+  @Override
+  public EntityBean owner() {
     return owner;
   }
 
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
     return null;
   }
 
@@ -45,7 +50,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOwnerId() {
+  public Object ownerId() {
     return null;
   }
 
@@ -55,12 +60,12 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getEmbeddedOwner() {
+  public Object embeddedOwner() {
     return null;
   }
 
   @Override
-  public int getEmbeddedOwnerIndex() {
+  public int embeddedOwnerIndex() {
     return 0;
   }
 
@@ -225,7 +230,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOrigValue(int propertyIndex) {
+  public Object origValue(int propertyIndex) {
     return null;
   }
 
@@ -235,12 +240,12 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public String getProperty(int propertyIndex) {
+  public String property(int propertyIndex) {
     return null;
   }
 
   @Override
-  public int getPropertyLength() {
+  public int propertyLength() {
     return 0;
   }
 
@@ -315,17 +320,17 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Set<String> getLoadedPropertyNames() {
+  public Set<String> loadedPropertyNames() {
     return Collections.emptySet();
   }
 
   @Override
-  public boolean[] getDirtyProperties() {
+  public boolean[] dirtyProperties() {
     return new boolean[0];
   }
 
   @Override
-  public Set<String> getDirtyPropertyNames() {
+  public Set<String> dirtyPropertyNames() {
     return Collections.emptySet();
   }
 
@@ -340,7 +345,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, ValuePair> getDirtyValues() {
+  public Map<String, ValuePair> dirtyValues() {
     return Collections.emptyMap();
   }
 
@@ -355,7 +360,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public StringBuilder getDirtyPropertyKey() {
+  public StringBuilder dirtyPropertyKey() {
     return null;
   }
 
@@ -365,22 +370,22 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public StringBuilder getLoadedPropertyKey() {
+  public StringBuilder loadedPropertyKey() {
     return null;
   }
 
   @Override
-  public boolean[] getLoaded() {
+  public boolean[] loaded() {
     return new boolean[0];
   }
 
   @Override
-  public int getLazyLoadPropertyIndex() {
+  public int lazyLoadPropertyIndex() {
     return 0;
   }
 
   @Override
-  public String getLazyLoadProperty() {
+  public String lazyLoadProperty() {
     return null;
   }
 
@@ -490,7 +495,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public int getSortOrder() {
+  public int sortOrder() {
     return 0;
   }
 
@@ -515,7 +520,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, Exception> getLoadErrors() {
+  public Map<String, Exception> loadErrors() {
     return null;
   }
 

ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java

@@ -4,8 +4,8 @@ import io.ebean.DB;
 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;
@@ -47,7 +47,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
    */
   private static final byte FLAG_MUTABLE_HASH_SET = 16;
 
-  private transient final ReentrantLock lock = new ReentrantLock();
+  private final ReentrantLock lock = new ReentrantLock();
   private transient NodeUsageCollector nodeUsageCollector;
   private transient PersistenceContext persistenceContext;
   private transient BeanLoader beanLoader;
@@ -114,12 +114,30 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public EntityBean getOwner() {
+  public String toString() {
+    return "InterceptReadWrite@" + hashCode() + "{state=" + state +
+      (dirty ? " dirty;" : "") +
+      (forceUpdate ? " forceUpdate;" : "") +
+      (readOnly ? " readOnly;" : "") +
+      (disableLazyLoad ? " disableLazyLoad;" : "") +
+      (lazyLoadFailure ? " lazyLoadFailure;" : "") +
+      (fullyLoadedBean ? " fullyLoadedBean;" : "") +
+      (loadedFromCache ? " loadedFromCache;" : "") +
+      ", pc=" + System.identityHashCode(persistenceContext) +
+      ", flags=" + Arrays.toString(flags) +
+      (lazyLoadProperty > -1 ? (", lazyLoadProperty=" + lazyLoadProperty) : "") +
+      ", loader=" + beanLoader +
+      (ownerId != null ? (", ownerId=" + ownerId) : "") +
+      '}';
+  }
+
+  @Override
+  public EntityBean owner() {
     return owner;
   }
 
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
     return persistenceContext;
   }
 
@@ -134,7 +152,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOwnerId() {
+  public Object ownerId() {
     return ownerId;
   }
 
@@ -144,12 +162,12 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getEmbeddedOwner() {
+  public Object embeddedOwner() {
     return embeddedOwner;
   }
 
   @Override
-  public int getEmbeddedOwnerIndex() {
+  public int embeddedOwnerIndex() {
     return embeddedOwnerIndex;
   }
 
@@ -173,13 +191,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   public void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx) {
     this.beanLoader = beanLoader;
     this.persistenceContext = ctx;
-    this.ebeanServerName = beanLoader.getName();
+    this.ebeanServerName = beanLoader.name();
   }
 
   @Override
   public void setBeanLoader(BeanLoader beanLoader) {
     this.beanLoader = beanLoader;
-    this.ebeanServerName = beanLoader.getName();
+    this.ebeanServerName = beanLoader.name();
   }
 
   @Override
@@ -362,8 +380,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   @Override
   public void setEmbeddedLoaded(Object embeddedBean) {
     if (embeddedBean instanceof EntityBean) {
-      EntityBean eb = (EntityBean) embeddedBean;
-      eb._ebean_getIntercept().setLoaded();
+      ((EntityBean) embeddedBean)._ebean_getIntercept().setLoaded();
     }
   }
 
@@ -383,7 +400,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOrigValue(int propertyIndex) {
+  public Object origValue(int propertyIndex) {
     if ((flags[propertyIndex] & (FLAG_ORIG_VALUE_SET | FLAG_MUTABLE_HASH_SET)) == FLAG_MUTABLE_HASH_SET) {
       // mutable hash set, but not ORIG_VALUE
       setOriginalValue(propertyIndex, mutableInfo[propertyIndex].get());
@@ -396,7 +413,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
 
   @Override
   public int findProperty(String propertyName) {
-    String[] names = owner._ebean_getPropertyNames();
+    final String[] names = owner._ebean_getPropertyNames();
     for (int i = 0; i < names.length; i++) {
       if (names[i].equals(propertyName)) {
         return i;
@@ -406,7 +423,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public String getProperty(int propertyIndex) {
+  public String property(int propertyIndex) {
     if (propertyIndex == -1) {
       return null;
     }
@@ -414,13 +431,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public int getPropertyLength() {
+  public int propertyLength() {
     return flags.length;
   }
 
   @Override
   public void setPropertyLoaded(String propertyName, boolean loaded) {
-    int position = findProperty(propertyName);
+    final int position = findProperty(propertyName);
     if (position == -1) {
       throw new IllegalArgumentException("Property " + propertyName + " not found");
     }
@@ -514,23 +531,23 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Set<String> getLoadedPropertyNames() {
+  public Set<String> loadedPropertyNames() {
     if (fullyLoadedBean) {
       return null;
     }
-    Set<String> props = new LinkedHashSet<>();
+    final Set<String> props = new LinkedHashSet<>();
     for (int i = 0; i < flags.length; i++) {
       if ((flags[i] & FLAG_LOADED_PROP) != 0) {
-        props.add(getProperty(i));
+        props.add(property(i));
       }
     }
     return props;
   }
 
   @Override
-  public boolean[] getDirtyProperties() {
-    int len = getPropertyLength();
-    boolean[] dirties = new boolean[len];
+  public boolean[] dirtyProperties() {
+    final int len = propertyLength();
+    final boolean[] dirties = new boolean[len];
     for (int i = 0; i < len; i++) {
       // this, or an embedded property has been changed - recurse
       dirties[i] = (flags[i] & (FLAG_CHANGED_PROP + FLAG_EMBEDDED_DIRTY)) != 0;
@@ -539,31 +556,31 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Set<String> getDirtyPropertyNames() {
-    Set<String> props = new LinkedHashSet<>();
+  public Set<String> dirtyPropertyNames() {
+    final Set<String> props = new LinkedHashSet<>();
     addDirtyPropertyNames(props, null);
     return props;
   }
 
   @Override
   public void addDirtyPropertyNames(Set<String> props, String prefix) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         // the property has been changed on this bean
-        props.add((prefix == null ? getProperty(i) : prefix + getProperty(i)));
+        props.add((prefix == null ? property(i) : prefix + property(i)));
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
-        embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, getProperty(i) + ".");
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, property(i) + ".");
       }
     }
   }
 
   @Override
   public boolean hasDirtyProperty(Set<String> propertyNames) {
-    String[] names = owner._ebean_getPropertyNames();
-    int len = getPropertyLength();
+    final String[] names = owner._ebean_getPropertyNames();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         if (propertyNames.contains(names[i])) {
@@ -579,46 +596,46 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, ValuePair> getDirtyValues() {
-    Map<String, ValuePair> dirtyValues = new LinkedHashMap<>();
+  public Map<String, ValuePair> dirtyValues() {
+    final Map<String, ValuePair> dirtyValues = new LinkedHashMap<>();
     addDirtyPropertyValues(dirtyValues, null);
     return dirtyValues;
   }
 
   @Override
   public void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         // the property has been changed on this bean
-        String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
-        Object newVal = owner._ebean_getField(i);
-        Object oldVal = getOrigValue(i);
+        final String propName = (prefix == null ? property(i) : prefix + property(i));
+        final Object newVal = owner._ebean_getField(i);
+        final Object oldVal = origValue(i);
         if (notEqual(oldVal, newVal)) {
           dirtyValues.put(propName, new ValuePair(newVal, oldVal));
         }
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
-        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(dirtyValues, getProperty(i) + ".");
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(dirtyValues, property(i) + ".");
       }
     }
   }
 
   @Override
   public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         // the property has been changed on this bean
-        Object newVal = owner._ebean_getField(i);
-        Object oldVal = getOrigValue(i);
+        final Object newVal = owner._ebean_getField(i);
+        final Object oldVal = origValue(i);
         if (notEqual(oldVal, newVal)) {
           visitor.visit(i, newVal, oldVal);
         }
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         visitor.visitPush(i);
         embeddedBean._ebean_getIntercept().addDirtyPropertyValues(visitor);
         visitor.visitPop();
@@ -627,8 +644,8 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public StringBuilder getDirtyPropertyKey() {
-    StringBuilder sb = new StringBuilder();
+  public StringBuilder dirtyPropertyKey() {
+    final StringBuilder sb = new StringBuilder();
     addDirtyPropertyKey(sb);
     return sb;
   }
@@ -638,24 +655,23 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
     if (sortOrder > 0) {
       sb.append("s,");
     }
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if ((flags[i] & FLAG_CHANGED_PROP) != 0) { // we do not check against mutablecontent here.
         sb.append(i).append(',');
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         sb.append(i).append('[');
-        embeddedBean._ebean_getIntercept().addDirtyPropertyKey(sb);
+        ((EntityBean) owner._ebean_getField(i))._ebean_getIntercept().addDirtyPropertyKey(sb);
         sb.append(']');
       }
     }
   }
 
   @Override
-  public StringBuilder getLoadedPropertyKey() {
-    StringBuilder sb = new StringBuilder();
-    int len = getPropertyLength();
+  public StringBuilder loadedPropertyKey() {
+    final StringBuilder sb = new StringBuilder();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isLoadedProperty(i)) {
         sb.append(i).append(',');
@@ -665,8 +681,8 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public boolean[] getLoaded() {
-    boolean[] ret = new boolean[flags.length];
+  public boolean[] loaded() {
+    final boolean[] ret = new boolean[flags.length];
     for (int i = 0; i < ret.length; i++) {
       ret[i] = (flags[i] & FLAG_LOADED_PROP) != 0;
     }
@@ -674,13 +690,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public int getLazyLoadPropertyIndex() {
+  public int lazyLoadPropertyIndex() {
     return lazyLoadProperty;
   }
 
   @Override
-  public String getLazyLoadProperty() {
-    return getProperty(lazyLoadProperty);
+  public String lazyLoadProperty() {
+    return property(lazyLoadProperty);
   }
 
   @Override
@@ -690,7 +706,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
       if (beanLoader == null) {
         final Database database = DB.byName(ebeanServerName);
         if (database == null) {
-          throw new PersistenceException("Database [" + ebeanServerName + "] was not found?");
+          throw new PersistenceException(ebeanServerName == null ? "No registered default server" : "Database [" + ebeanServerName + "] is not registered");
         }
         // For stand alone reference bean or after deserialisation lazy load
         // using the ebeanServer. Synchronise only on the bean.
@@ -718,7 +734,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
     }
     if (lazyLoadFailure) {
       // failed when batch lazy loaded by another bean in the batch
-      throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted");
+      throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted. BeanLoader: " + beanLoader);
     }
     if (lazyLoadProperty == -1) {
       lazyLoadProperty = loadProperty;
@@ -820,7 +836,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
       loadBean(propertyIndex);
     }
     if (nodeUsageCollector != null) {
-      nodeUsageCollector.addUsed(getProperty(propertyIndex));
+      nodeUsageCollector.addUsed(property(propertyIndex));
     }
   }
 
@@ -969,7 +985,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public int getSortOrder() {
+  public int sortOrder() {
     return sortOrder;
   }
 
@@ -998,19 +1014,19 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, Exception> getLoadErrors() {
+  public Map<String, Exception> loadErrors() {
     if (loadErrors == null) {
       return Collections.emptyMap();
     }
     Map<String, Exception> ret = null;
-    int len = getPropertyLength();
+    int len = propertyLength();
     for (int i = 0; i < len; i++) {
-      Exception loadError = loadErrors[i];
+      final Exception loadError = loadErrors[i];
       if (loadError != null) {
         if (ret == null) {
           ret = new LinkedHashMap<>();
         }
-        ret.put(getProperty(i), loadError);
+        ret.put(property(i), loadError);
       }
     }
     return ret;

ebean-api/src/main/java/io/ebean/bean/ObjectGraphNode.java

@@ -8,7 +8,6 @@ import java.util.Objects;
  * <p>
  * It represents a location relative to the root of an object graph and specific
  * to a query and call stack hash.
- * </p>
  */
 public final class ObjectGraphNode implements Serializable {
 
@@ -17,7 +16,7 @@ public final class ObjectGraphNode implements Serializable {
   /**
    * Identifies the origin.
    */
-  private final ObjectGraphOrigin originQueryPoint;
+  private final ObjectGraphOrigin origin;
 
   /**
    * The path relative to the root.
@@ -28,26 +27,26 @@ public final class ObjectGraphNode implements Serializable {
    * Create at a sub level.
    */
   public ObjectGraphNode(ObjectGraphNode parent, String path) {
-    this.originQueryPoint = parent.getOriginQueryPoint();
-    this.path = parent.getChildPath(path);
+    this.origin = parent.origin();
+    this.path = parent.childPath(path);
   }
 
   /**
    * Create an the root level.
    */
-  public ObjectGraphNode(ObjectGraphOrigin originQueryPoint, String path) {
-    this.originQueryPoint = originQueryPoint;
+  public ObjectGraphNode(ObjectGraphOrigin origin, String path) {
+    this.origin = origin;
     this.path = path;
   }
 
   /**
    * Return the origin query point.
    */
-  public ObjectGraphOrigin getOriginQueryPoint() {
-    return originQueryPoint;
+  public ObjectGraphOrigin origin() {
+    return origin;
   }
 
-  private String getChildPath(String childPath) {
+  private String childPath(String childPath) {
     if (path == null) {
       return childPath;
     } else if (childPath == null) {
@@ -60,18 +59,18 @@ public final class ObjectGraphNode implements Serializable {
   /**
    * Return the path relative to the root.
    */
-  public String getPath() {
+  public String path() {
     return path;
   }
 
   @Override
   public String toString() {
-    return "origin:" + originQueryPoint + " path[" + path + "]";
+    return "origin:" + origin + " path[" + path + "]";
   }
 
   @Override
   public int hashCode() {
-    int hc = 92821 * originQueryPoint.hashCode();
+    int hc = 92821 * origin.hashCode();
     hc = 92821 * hc + (path == null ? 0 : path.hashCode());
     return hc;
   }
@@ -87,6 +86,6 @@ public final class ObjectGraphNode implements Serializable {
 
     ObjectGraphNode e = (ObjectGraphNode) obj;
     return (Objects.equals(e.path, path))
-      && e.originQueryPoint.equals(originQueryPoint);
+      && e.origin.equals(origin);
   }
 }

ebean-api/src/main/java/io/ebean/bean/ObjectGraphOrigin.java

@@ -28,38 +28,38 @@ public final class ObjectGraphOrigin implements Serializable {
     this.callOrigin = callOrigin;
     this.beanType = beanType;
     this.queryHash = queryHash;
-    this.key = callOrigin.getOriginKey(queryHash);
+    this.key = callOrigin.key(queryHash);
   }
 
   /**
    * The key includes the queryPlan hash and the callStack hash. This becomes
    * the unique identifier for a query point.
    */
-  public String getKey() {
+  public String key() {
     return key;
   }
 
   /**
    * The type of bean the query is fetching.
    */
-  public String getBeanType() {
+  public String beanType() {
     return beanType;
   }
 
   /**
    * The call stack involved.
    */
-  public CallOrigin getCallOrigin() {
+  public CallOrigin callOrigin() {
     return callOrigin;
   }
 
-  public String getTopElement() {
-    return callOrigin.getTopElement();
+  public String top() {
+    return callOrigin.top();
   }
 
   @Override
   public String toString() {
-    return "key[" + key + "] type[" + beanType + "] " + callOrigin.getTopElement();
+    return "key[" + key + "] type[" + beanType + "] " + callOrigin.top();
   }
 
   @Override

ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java

@@ -19,7 +19,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
   }
 
   @Override
-  public String getName() {
+  public String name() {
     return database.name();
   }
 

ebean-api/src/main/java/io/ebean/bean/ToStringBuilder.java

@@ -1,7 +1,5 @@
 package io.ebean.bean;
 
-import io.ebean.common.BeanMap;
-
 import java.util.Collection;
 import java.util.IdentityHashMap;
 import java.util.Map;
@@ -47,7 +45,7 @@ public final class ToStringBuilder {
       id.putIfAbsent(bean, 0);
     }
     if (counter <= MAX) {
-      sb.append(bean.getClass().getSimpleName()).append("@").append(counter).append("(");
+      sb.append(bean.getClass().getSimpleName()).append('@').append(counter).append('(');
     }
   }
 
@@ -79,7 +77,7 @@ public final class ToStringBuilder {
    */
   public void end() {
     if (counter <= MAX) {
-      sb.append(")");
+      sb.append(')');
     }
   }
 
@@ -92,7 +90,7 @@ public final class ToStringBuilder {
     } else {
       sb.append(", ");
     }
-    sb.append(name).append(":");
+    sb.append(name).append(':');
   }
 
   private void value(Object value) {
@@ -112,7 +110,7 @@ public final class ToStringBuilder {
     } else {
       String content = String.valueOf(value);
       if (content.length() > TRIM_LENGTH) {
-        content = content.substring(0, TRIM_LENGTH) + " <trimmed>";
+        content = content.substring(0, TRIM_LENGTH) + " (trimmed)";
       }
       sb.append(content);
       if (sb.length() >= MAX_TOTAL_CONTENT) {
@@ -127,20 +125,20 @@ public final class ToStringBuilder {
       sb.append("{}");
     } else {
       boolean firstElement = true;
-      sb.append("{");
+      sb.append('{');
       for (Map.Entry<?, ?> entry : map.entrySet()) {
         if (firstElement) {
           firstElement = false;
         } else {
           sb.append(", ");
         }
-        sb.append(entry.getKey()).append(":");
+        sb.append(entry.getKey()).append(':');
         value(entry.getValue());
         if (counter > MAX) {
           return;
         }
       }
-      sb.append("}");
+      sb.append('}');
     }
   }
 
@@ -153,7 +151,7 @@ public final class ToStringBuilder {
       return;
     }
     boolean firstElement = true;
-    sb.append("[");
+    sb.append('[');
     for (Object o : c) {
       if (firstElement) {
         firstElement = false;
@@ -165,7 +163,7 @@ public final class ToStringBuilder {
         return;
       }
     }
-    sb.append("]");
+    sb.append(']');
   }
 
   private boolean push(Object bean) {
@@ -180,7 +178,7 @@ public final class ToStringBuilder {
     Integer idx = id.putIfAbsent(bean, counter++);
     if (idx != null) {
       --counter;
-      sb.append(bean.getClass().getSimpleName()).append("@").append(idx);
+      sb.append(bean.getClass().getSimpleName()).append('@').append(idx);
       return false;
     }
     first = true;

ebean-api/src/main/java/io/ebean/cache/TenantAwareKey.java

@@ -69,7 +69,7 @@ public class TenantAwareKey {
     public String toString() {
       StringBuilder sb = new StringBuilder(key.toString());
       if (tenantId != null) {
-        sb.append(":").append(tenantId);
+        sb.append(':').append(tenantId);
       }
       return sb.toString();
     }

ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java

@@ -59,17 +59,17 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public EntityBean getOwnerBean() {
+  public EntityBean owner() {
     return ownerBean;
   }
 
   @Override
-  public String getPropertyName() {
+  public String propertyName() {
     return propertyName;
   }
 
   @Override
-  public ExpressionList<?> getFilterMany() {
+  public ExpressionList<?> filterMany() {
     return filterMany;
   }
 
@@ -129,7 +129,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public ModifyListenMode getModifyListening() {
+  public ModifyListenMode modifyListening() {
     return modifyListenMode;
   }
 
@@ -182,7 +182,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public Set<E> getModifyAdditions() {
+  public Set<E> modifyAdditions() {
     if (modifyHolder == null) {
       return null;
     } else {
@@ -191,7 +191,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public Set<E> getModifyRemovals() {
+  public Set<E> modifyRemovals() {
     if (modifyHolder == null) {
       return null;
     } else {
@@ -213,7 +213,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   /**
-   * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
+   * Copies all relevant properties for a clone. See {@link #shallowCopy()}
    */
   protected void setFromOriginal(AbstractBeanCollection<E> other) {
     this.disableLazyLoad = other.disableLazyLoad;

ebean-api/src/main/java/io/ebean/common/BeanList.java

@@ -3,12 +3,7 @@ package io.ebean.common;
 import io.ebean.bean.*;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
+import java.util.*;
 
 /**
  * List capable of lazy loading and modification awareness.
@@ -73,7 +68,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
     if (list == null) {
       list = new ArrayList<>();
     }
-    list.addAll((Collection<? extends E>) other.getActualDetails());
+    list.addAll((Collection<? extends E>) other.actualDetails());
   }
 
   @Override
@@ -159,17 +154,17 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   /**
    * Return the actual underlying list.
    */
-  public List<E> getActualList() {
+  public List<E> actualList() {
     return list;
   }
 
   @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
     return list;
   }
 
   @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
     return list;
   }
 
@@ -538,7 +533,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   }
 
   @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
     BeanList<E> copy = new BeanList<>(new CopyOnFirstWriteList<>(list));
     copy.setFromOriginal(this);
     return copy;

ebean-api/src/main/java/io/ebean/common/BeanMap.java

@@ -5,11 +5,7 @@ import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.ToStringBuilder;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Map capable of lazy loading and modification aware.
@@ -71,7 +67,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   public void loadFrom(BeanCollection<?> other) {
     BeanMap<K, E> otherMap = (BeanMap<K, E>) other;
     internalPutNull();
-    map.putAll(otherMap.getActualMap());
+    map.putAll(otherMap.actualMap());
   }
 
   public void internalPutNull() {
@@ -175,7 +171,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   /**
    * Return the actual underlying map.
    */
-  public Map<K, E> getActualMap() {
+  public Map<K, E> actualMap() {
     return map;
   }
 
@@ -183,7 +179,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
    * Returns the collection of beans (map values).
    */
   @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
     return map.values();
   }
 
@@ -191,7 +187,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
    * Returns the map entrySet.
    */
   @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
     return map.entrySet();
   }
 
@@ -346,7 +342,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
     BeanMap<K, E> copy = new BeanMap<>(new LinkedHashMap<>(map));
     copy.setFromOriginal(this);
     return copy;

ebean-api/src/main/java/io/ebean/common/BeanSet.java

@@ -67,7 +67,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     if (set == null) {
       set = new LinkedHashSet<>();
     }
-    set.addAll((Collection<? extends E>) other.getActualDetails());
+    set.addAll((Collection<? extends E>) other.actualDetails());
   }
 
   @Override
@@ -119,7 +119,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     try {
       if (set == null) {
         if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(true);
+          lazyLoadCollection(false);
         } else {
           set = new LinkedHashSet<>();
         }
@@ -136,7 +136,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
         if (disableLazyLoad) {
           set = new LinkedHashSet<>();
         } else {
-          lazyLoadCollection(true);
+          lazyLoadCollection(false);
         }
       }
     } finally {
@@ -155,17 +155,17 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   /**
    * Return the actual underlying set.
    */
-  public Set<E> getActualSet() {
+  public Set<E> actualSet() {
     return set;
   }
 
   @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
     return set;
   }
 
   @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
     return set;
   }
 
@@ -382,7 +382,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   }
 
   @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
     BeanSet<E> copy = new BeanSet<>(new LinkedHashSet<>(set));
     copy.setFromOriginal(this);
     return copy;

ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java

@@ -3,9 +3,9 @@ package io.ebean.config;
 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;
 
@@ -228,7 +228,7 @@ public abstract class AbstractNamingConvention implements NamingConvention {
   public TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable) {
     StringBuilder buffer = new StringBuilder();
     buffer.append(unQuote(lhsTable.getName()));
-    buffer.append("_");
+    buffer.append('_');
 
     String rhsTableName = unQuote(rhsTable.getName());
     if (rhsTableName.indexOf('_') < rhsPrefixLength) {
@@ -271,10 +271,10 @@ public abstract class AbstractNamingConvention implements NamingConvention {
   public String getTableName(String catalog, String schema, String name) {
     StringBuilder sb = new StringBuilder();
     if (!isNull(catalog)) {
-      sb.append(quoteIdentifiers(catalog)).append(".");
+      sb.append(quoteIdentifiers(catalog)).append('.');
     }
     if (!isNull(schema)) {
-      sb.append(quoteIdentifiers(schema)).append(".");
+      sb.append(quoteIdentifiers(schema)).append('.');
     }
     return sb.append(quoteIdentifiers(name)).toString();
   }

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

@@ -19,7 +19,7 @@ import io.ebean.event.readaudit.ReadAuditPrepare;
 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;
@@ -123,10 +123,10 @@ public class DatabaseConfig {
   private boolean loadModuleInfo = true;
 
   /**
-   * List of interesting classes such as entities, embedded, ScalarTypes,
-   * Listeners, Finders, Controllers etc.
+   * Interesting classes such as entities, embedded, ScalarTypes,
+   * Listeners, Finders, Controllers, AttributeConverters etc.
    */
-  private List<Class<?>> classes = new ArrayList<>();
+  private Set<Class<?>> classes = new HashSet<>();
 
   /**
    * The packages that are searched for interesting classes. Only used when
@@ -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 class DatabaseConfig {
     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.
    * <p>
@@ -2320,19 +2299,15 @@ public class DatabaseConfig {
   }
 
   /**
-   * Programmatically add classes (typically entities) that this server should
-   * use.
+   * Programmatically add classes (typically entities) that this server should use.
    * <p>
    * The class can be an Entity, Embedded type, ScalarType, BeanPersistListener,
    * BeanFinder or BeanPersistController.
    * <p>
    * If no classes are specified then the classes are found automatically via
    * searching the class path.
-   * <p>
-   * 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.
+   * @param cls the entity type (or other type) that should be registered by this database.
    */
   public void addClass(Class<?> cls) {
     classes.add(cls);
@@ -2341,7 +2316,7 @@ public class DatabaseConfig {
   /**
    * Register all the classes (typically entity classes).
    */
-  public void addAll(List<Class<?>> classList) {
+  public void addAll(Collection<Class<?>> classList) {
     if (classList != null && !classList.isEmpty()) {
       classes.addAll(classList);
     }
@@ -2383,15 +2358,26 @@ public class DatabaseConfig {
    * <p>
    * Alternatively the classes can contain added via {@link #addClass(Class)}.
    */
-  public void setClasses(List<Class<?>> classes) {
-    this.classes = classes;
+  public void setClasses(Collection<Class<?>> classes) {
+    this.classes = new HashSet<>(classes);
   }
 
   /**
-   * Return the classes registered for this database. Typically this includes
+   * Return the classes registered for this database. Typically, this includes
    * entities and perhaps listeners.
    */
-  public List<Class<?>> getClasses() {
+  public Set<Class<?>> classes() {
+    return classes;
+  }
+
+  /**
+   * Deprecated - migrate to classes().
+   * <p>
+   * Sorry if returning Set rather than List breaks code but it feels safer to
+   * do that than a subtle change to return a shallow copy which you will not detect.
+   */
+  @Deprecated(forRemoval = true)
+  public Set<Class<?>> getClasses() {
     return classes;
   }
 
@@ -2760,8 +2746,6 @@ public class DatabaseConfig {
     this.classLoadConfig = classLoadConfig;
   }
 
-
-
   /**
    * Load settings from application.properties, application.yaml and other sources.
    * <p>
@@ -2906,7 +2890,7 @@ public class DatabaseConfig {
     serverCachePlugin = p.createInstance(ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin);
 
     String packagesProp = p.get("search.packages", p.get("packages", null));
-    packages = getSearchList(packagesProp, packages);
+    packages = searchList(packagesProp, packages);
 
     skipCacheAfterWrite = p.getBoolean("skipCacheAfterWrite", skipCacheAfterWrite);
     updateAllPropertiesInBatch = p.getBoolean("updateAllPropertiesInBatch", updateAllPropertiesInBatch);
@@ -2935,7 +2919,6 @@ public class DatabaseConfig {
     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);
@@ -2982,10 +2965,10 @@ public class DatabaseConfig {
     tenantCatalogProvider = p.createInstance(TenantCatalogProvider.class, "tenant.catalogProvider", tenantCatalogProvider);
     tenantSchemaProvider = p.createInstance(TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
     tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
-    classes = getClasses(p);
+    classes = readClasses(p);
 
     String mappingsProp = p.get("mappingLocations", null);
-    mappingLocations = getSearchList(mappingsProp, mappingLocations);
+    mappingLocations = searchList(mappingsProp, mappingLocations);
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
@@ -2999,13 +2982,13 @@ public class DatabaseConfig {
    * @param properties the properties
    * @return the classes
    */
-  private List<Class<?>> getClasses(PropertiesWrapper properties) {
+  private Set<Class<?>> readClasses(PropertiesWrapper properties) {
     String classNames = properties.get("classes", null);
     if (classNames == null) {
       return classes;
     }
 
-    List<Class<?>> classList = new ArrayList<>();
+    Set<Class<?>> classList = new HashSet<>();
     String[] split = StringHelper.splitNames(classNames);
     for (String cn : split) {
       if (!"class".equalsIgnoreCase(cn)) {
@@ -3020,7 +3003,7 @@ public class DatabaseConfig {
     return classList;
   }
 
-  private List<String> getSearchList(String searchNames, List<String> defaultValue) {
+  private List<String> searchList(String searchNames, List<String> defaultValue) {
     if (searchNames != null) {
       String[] entries = StringHelper.splitNames(searchNames);
       List<String> hitList = new ArrayList<>(entries.length);
@@ -3399,8 +3382,16 @@ public class DatabaseConfig {
    * When false we either register entity classes via application code or use classpath
    * scanning to find and register entity classes.
    */
+  public boolean isLoadModuleInfo() {
+    return loadModuleInfo;
+  }
+
+  /**
+   * Deprecated - migrate to isLoadModuleInfo().
+   */
+  @Deprecated(forRemoval = true)
   public boolean isAutoLoadModuleInfo() {
-    return loadModuleInfo && classes.isEmpty();
+    return loadModuleInfo;
   }
 
   /**

ebean-api/src/main/java/io/ebean/config/DbConstraintNaming.java

@@ -135,16 +135,16 @@ public class DbConstraintNaming {
    */
   protected String joinColumnNames(String[] columns) {
     if (columns.length == 1) {
-      return normaliseColumn(columns[0]);
+      return normaliseColumn(columns[0]).replace(" ", "_");
     }
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < columns.length; i++) {
       if (i > 0) {
-        sb.append("_");
+        sb.append('_');
       }
       sb.append(normaliseColumn(columns[i]));
     }
-    return sb.toString();
+    return sb.toString().replace(" ", "_");
   }
 
   /**

ebean-api/src/main/java/io/ebean/config/DbConstraintNormalise.java

@@ -27,7 +27,6 @@ public class DbConstraintNormalise {
    * quoted identifier characters (",',[,] etc).
    */
   public String normaliseTable(String tableName) {
-
     tableName = trimQuotes(tableName);
     int lastPeriod = tableName.lastIndexOf('.');
     if (lastPeriod > -1) {
@@ -59,7 +58,6 @@ public class DbConstraintNormalise {
    * Trim off the platform quoted identifier quotes like [ ' and ".
    */
   public String trimQuotes(String identifier) {
-
     if (identifier == null) {
       return "";
     }

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
  * <p>
  * In general AttributeConverter should be used in preference to this
  * ScalarTypeConverter as it is JPA standard and offers the same functionality.

ebean-api/src/main/java/io/ebean/config/TableName.java

@@ -117,12 +117,12 @@ public final class TableName {
     // Add schema
     if (schema != null) {
       if (buffer.length() > 0) {
-        buffer.append(".");
+        buffer.append('.');
       }
       buffer.append(schema);
     }
     if (buffer.length() > 0) {
-      buffer.append(".");
+      buffer.append('.');
     }
     return buffer.append(name).toString();
   }

ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java

@@ -23,11 +23,11 @@ public class BasicSqlLimitOffset implements BasicSqlLimiter {
     sb.append(dbSql);
 
     if (maxRows > 0) {
-      sb.append(" ").append(LIMIT);
-      sb.append(" ").append(maxRows);
+      sb.append(' ').append(LIMIT);
+      sb.append(' ').append(maxRows);
     }
     if (firstRow > 0) {
-      sb.append(" ").append(OFFSET).append(" ");
+      sb.append(' ').append(OFFSET).append(' ');
       sb.append(firstRow);
     }
     return sb.toString();

ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java

@@ -9,7 +9,7 @@ import io.ebean.config.CustomDbTypeMapping;
 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.*;
 
@@ -673,7 +673,7 @@ public class DatabasePlatform {
 
   protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // silently assume the database does not support the "for update" clause.
-    log.log(INFO, "it seems your database does not support the 'for update' clause");
+    log.log(INFO, "it seems your database does not support the ''for update'' clause");
     return sql;
   }
 

ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java

@@ -28,6 +28,16 @@ public class DbPlatformType implements ExtraDbTypes {
    */
   private final boolean canHaveLength;
 
+  /**
+   * The maximum length supported by this platform type. If length is too big, fallback is used.
+   */
+  private final int maxLength;
+
+  /**
+   * Use this platform type if length exceedes
+   */
+  private final DbPlatformType fallback;
+
   /**
    * Parse a type definition into a DbPlatformType.
    * <p>
@@ -53,6 +63,41 @@ public class DbPlatformType implements ExtraDbTypes {
     this(name, defaultLength, 0);
   }
 
+  /**
+   * Construct without length, but with a max length limit and a fallback type, that is used if maxLength is exceeded.
+   * This can be used to use <ul>
+   * <li>"longtext" for unspecified length</li>
+   * <li>"text" for length up to 2^16-1</li>
+   * <li>"mediumtext" for length up to 2^24-1</li>
+   * <li>"longtext" else</li>
+   * </ul>
+   */
+  public DbPlatformType(String name, int maxLength, DbPlatformType fallback) {
+    this.name = name;
+    this.defaultLength = 0;
+    this.defaultScale = 0;
+    this.canHaveLength = false;
+    this.maxLength = maxLength;
+    this.fallback = fallback;
+  }
+
+  /**
+   * Construct with a given default length, a max length limit and a fallback type, that is used if maxLength is exceeded.
+   * This can be used to use <ul>
+   * <li>"varchar(255)" for unspecified length</li>
+   * <li>"varchar(N)" for N <= maxLength</li>
+   * <li>"varchar(max)" else</li>
+   * </ul>
+   */
+  public DbPlatformType(String name, int defaultPrecision, int maxLength, DbPlatformType fallback) {
+    this.name = name;
+    this.defaultLength = defaultPrecision;
+    this.defaultScale = 0;
+    this.canHaveLength = true;
+    this.maxLength = maxLength;
+    this.fallback = fallback;
+  }
+
   /**
    * Construct for Decimal with precision and scale.
    */
@@ -61,6 +106,8 @@ public class DbPlatformType implements ExtraDbTypes {
     this.defaultLength = defaultPrecision;
     this.defaultScale = defaultScale;
     this.canHaveLength = true;
+    this.maxLength = Integer.MAX_VALUE;
+    this.fallback = null;
   }
 
   /**
@@ -74,6 +121,8 @@ public class DbPlatformType implements ExtraDbTypes {
     this.defaultLength = 0;
     this.defaultScale = 0;
     this.canHaveLength = canHaveLength;
+    this.maxLength = Integer.MAX_VALUE;
+    this.fallback = null;
   }
 
   /**
@@ -124,33 +173,33 @@ public class DbPlatformType implements ExtraDbTypes {
    */
   public String renderType(int deployLength, int deployScale, boolean strict) {
 
-    StringBuilder sb = new StringBuilder();
-    sb.append(name);
-    if (canHaveLength || !strict) {
-      renderLengthScale(deployLength, deployScale, sb);
-    }
+    int len = deployLength != 0 ? deployLength : defaultLength;
+    if (len > maxLength) {
+      return fallback.renderType(deployLength, deployScale, strict);
+    } else {
+      StringBuilder sb = new StringBuilder();
+      sb.append(name);
+      if ((canHaveLength || !strict) && len > 0) {
+        renderLengthScale(len, deployScale, sb);
+      }
 
-    return sb.toString();
+      return sb.toString();
+    }
   }
 
   /**
    * Render the length and scale part of the column definition.
    */
-  protected void renderLengthScale(int deployLength, int deployScale, StringBuilder sb) {
+  protected void renderLengthScale(int len, int deployScale, StringBuilder sb) {
     // see if there is a precision/scale to add (or not)
-    int len = deployLength != 0 ? deployLength : defaultLength;
-    if (len == Integer.MAX_VALUE) {
-      sb.append("(max)"); // TODO: this is sqlserver specific
-    } else if (len > 0) {
-      sb.append("(");
-      sb.append(len);
-      int scale = deployScale != 0 ? deployScale : defaultScale;
-      if (scale > 0) {
-        sb.append(",");
-        sb.append(scale);
-      }
-      sb.append(")");
+    sb.append('(');
+    sb.append(len);
+    int scale = deployScale != 0 ? deployScale : defaultScale;
+    if (scale > 0) {
+      sb.append(',');
+      sb.append(scale);
     }
+    sb.append(')');
   }
 
   /**

ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java

@@ -5,7 +5,7 @@ import io.ebean.BackgroundExecutor;
 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;

ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java

@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
 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;

ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java

@@ -5,7 +5,7 @@ import io.ebean.DataIntegrityException;
 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;

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;
 
 /**

ebean-api/src/main/java/io/ebean/event/ServletContextListener.java

@@ -1,8 +1,11 @@
 package io.ebean.event;
 
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
 
 /**
+ * Deprecated for removal - no intention to replace. Create your own copy of this
+ * ServletContextListener if needed for your application.
+ * <p>
  * Listens for webserver server starting and stopping events.
  * <p>
  * This should be used when the deployment is into a servlet container where the webapp
@@ -15,7 +18,8 @@ import javax.servlet.ServletContextEvent;
  * hook that Ebean registers.
  * </p>
  */
-public class ServletContextListener implements javax.servlet.ServletContextListener {
+@Deprecated(forRemoval = true)
+public class ServletContextListener implements jakarta.servlet.ServletContextListener {
 
   /**
    * The servlet container is stopping.

ebean-api/src/main/java/io/ebean/event/ShutdownManager.java

@@ -143,7 +143,7 @@ public final class ShutdownManager {
       }
       // shutdown any registered servers that have not
       // already been shutdown manually
-      for (Database server : databases) {
+      for (Database server : new ArrayList<>(databases)) {
         try {
           server.shutdown();
         } catch (Exception ex) {

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<MetricData> collectMetricsAsData() {
-    return collectMetrics().asData();
-  }
-
   /**
    * Visit the metrics resetting and collecting/reporting as desired.
    */

ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java

@@ -2,6 +2,8 @@ package io.ebean.meta;
 
 import io.ebean.ProfileLocation;
 
+import java.time.Instant;
+
 /**
  * Meta data for captured query plan.
  */
@@ -51,4 +53,14 @@ public interface MetaQueryPlan {
    * Return the total count of times bind capture has occurred.
    */
   long captureCount();
+
+  /**
+   * Return the time taken to capture this plan in microseconds.
+   */
+  long captureMicros();
+
+  /**
+   * Return the instant when the bind values were captured.
+   */
+  Instant whenCaptured();
 }

ebean-api/src/main/java/io/ebean/meta/MetricsAsJson.java

@@ -118,28 +118,28 @@ final class MetricsAsJson implements ServerMetricsAsJson {
 
   private void objStart() throws IOException {
     objKeyCounter = 0;
-    writer.append("{");
+    writer.append('{');
   }
 
   private void objEnd() throws IOException {
-    writer.append("}");
+    writer.append('}');
   }
 
   private void listStart() throws IOException {
     listCounter = 0;
-    writer.append("[");
+    writer.append('[');
     writer.append(newLine);
   }
 
   private void listEnd() throws IOException {
-    writer.append("]");
+    writer.append(']');
   }
 
   private void key(String key) throws IOException {
     if (objKeyCounter++ > 0) {
       writer.append(", ");
     }
-    writer.append("\"").append(key).append("\":");
+    writer.append('"').append(key).append("\":");
   }
 
   private void val(long count) throws IOException {
@@ -147,12 +147,12 @@ final class MetricsAsJson implements ServerMetricsAsJson {
   }
 
   private void val(String val) throws IOException {
-    writer.append("\"").append(val).append("\"");
+    writer.append('"').append(val).append('"');
   }
 
   private void metricStart(MetaMetric metric) throws IOException {
     if (listCounter++ > 0) {
-      writer.append(",").append(newLine);
+      writer.append(',').append(newLine);
     }
     objStart();
     key("name");
@@ -187,11 +187,22 @@ final class MetricsAsJson implements ServerMetricsAsJson {
     }
     if (isIncludeDetail(metric)) {
       append("loc", metric.location());
-      append("sql", metric.sql());
+      append("sql", escape(metric.sql()));
     }
     metricEnd();
   }
 
+  static String escape(String sql) {
+    return sql == null ? null : sql
+      .replace("\\", "\\\\")
+      .replace("\"", "\\\"")
+      .replace("\b", "\\b")
+      .replace("\f", "\\f")
+      .replace("\n", "\\n")
+      .replace("\r", "\\r")
+      .replace("\t", "\\t");
+  }
+
   private boolean isIncludeDetail(MetaTimedMetric metric) {
     return includeExtraAttributes == 2 || includeExtraAttributes == 1 && metric.initialCollection();
   }

ebean-api/src/main/java/io/ebean/service/SpiInTuples.java

@@ -0,0 +1,22 @@
+package io.ebean.service;
+
+import io.ebean.InTuples;
+
+import java.util.List;
+
+/**
+ * Internal extension to InTuples.
+ */
+public interface SpiInTuples extends InTuples {
+
+  /**
+   * Return the properties of the tuples.
+   */
+  String[] properties();
+
+  /**
+   * Return all the tuple entries.
+   */
+  List<Object[]> entries();
+
+}

ebean-api/src/main/java/io/ebean/stylesheet.css

@@ -1,91 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body {
-  background-color: #FFFFFF;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-}
-
-pre.code {
-  padding: 1em;
-  margin-left: 2em;
-  border: 1px solid #ccc;
-  background-color: #eee;
-}
-
-/* Headings */
-h1 {
-  font-size: 14pt
-}
-
-#overviewexamples h3 {
-  font-size: 10pt
-}
-
-/* Table colors */
-.TableHeadingColor {
-  background: #CCCCFF
-}
-
-/* Dark mauve */
-.TableSubHeadingColor {
-  background: #EEEEFF
-}
-
-/* Light mauve */
-.TableRowColor {
-  background: #FFFFFF
-}
-
-/* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont {
-  font-size: 12pt;
-  font-family: Helvetica, Arial, sans-serif
-}
-
-.FrameHeadingFont {
-  font-size: 10pt;
-  font-family: Helvetica, Arial, sans-serif
-}
-
-.FrameItemFont {
-  font-size: 10pt;
-  font-family: Helvetica, Arial, sans-serif
-}
-
-/* Navigation bar fonts and colors */
-.NavBarCell1 {
-  background-color: #EEEEFF;
-}
-
-/* Light mauve */
-.NavBarCell1Rev {
-  background-color: #00008B;
-}
-
-/* Dark Blue */
-.NavBarFont1 {
-  font-family: Arial, Helvetica, sans-serif;
-  color: #000000;
-}
-
-.NavBarFont1Rev {
-  font-family: Arial, Helvetica, sans-serif;
-  color: #FFFFFF;
-}
-
-.NavBarCell2 {
-  font-family: Arial, Helvetica, sans-serif;
-  background-color: #FFFFFF;
-}
-
-.NavBarCell3 {
-  font-family: Arial, Helvetica, sans-serif;
-  background-color: #FFFFFF;
-}
-

ebean-api/src/main/java/io/ebean/text/PathProperties.java

@@ -205,7 +205,7 @@ public class PathProperties implements FetchPath {
         sb.append(it.next());
         hasNext = it.hasNext();
         if (hasNext) {
-          sb.append(",");
+          sb.append(',');
         }
       }
       return sb.toString();

ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java

@@ -25,14 +25,14 @@ public final class CamelCaseHelper {
         lastUpper = i;
       } else if (Character.isDigit(c)) {
         if (i > lastUpper + 1 && !digitsCompressed) {
-          sb.append("_");
+          sb.append('_');
           lastUpper = i;
         }
         sb.append(c);
 
       } else if (Character.isUpperCase(c)) {
         if (i > lastUpper + 1) {
-          sb.append("_");
+          sb.append('_');
         }
         sb.append(Character.toLowerCase(c));
         lastUpper = i;

ebean-api/src/main/java/io/ebean/util/StackWalkFilter.java

@@ -22,6 +22,7 @@ public final class StackWalkFilter {
     public boolean test(StackWalker.StackFrame stackFrame) {
       return !stackFrame.getClassName().startsWith("io.ebean")
         && !stackFrame.getClassName().startsWith("jdk.")
+        && !stackFrame.getClassName().startsWith("java.")
         && !stackFrame.getMethodName().startsWith("_ebean_");
     }
   }

ebean-api/src/main/java/module-info.java

@@ -12,7 +12,7 @@ module io.ebean.api {
   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 @@ module io.ebean.api {
   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;

ebean-api/src/test/java/io/ebean/ListsTest.java

@@ -0,0 +1,82 @@
+package io.ebean;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ListsTest {
+
+  @Test
+  void partition_empty() {
+    List<List<Integer>> partitions = Lists.partition(List.of(), 5);
+    assertThat(partitions).isEmpty();
+  }
+
+  @Test
+  void partition_lt() {
+    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4), 5);
+    assertThat(partitions).hasSize(1);
+    assertThat(partitions.get(0)).hasSize(4);
+  }
+
+  @Test
+  void partition_eq() {
+    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4, 5), 5);
+    assertThat(partitions).hasSize(1);
+    assertThat(partitions.get(0)).hasSize(5);
+  }
+
+  @Test
+  void partition_gt() {
+    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4, 5, 6), 5);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(5);
+    assertThat(partitions.get(1)).hasSize(1);
+    assertThat(partitions.get(0)).containsExactly(1, 2, 3, 4, 5);
+    assertThat(partitions.get(1)).containsExactly(6);
+  }
+
+  @Test
+  void partition_gt1_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d"), 3);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(1);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d");
+  }
+
+  @Test
+  void partition_gt1a_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e"), 3);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(2);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d", "e");
+  }
+
+  @Test
+  void partition_eq2_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e", "f"), 3);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(3);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d", "e", "f");
+  }
+
+  @Test
+  void partition_gt2_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e", "f", "g"), 3);
+    assertThat(partitions).hasSize(3);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(3);
+    assertThat(partitions.get(2)).hasSize(1);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d", "e", "f");
+    assertThat(partitions.get(2)).containsExactly("g");
+  }
+}