Version 13.19.0

Refactor ebean-core internal API - getters -> accessors

.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-18-ea.yml

@@ -1,39 +0,0 @@
-
-name: JDK 18-ea
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '30 6 * * 1,3,5'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [18-ea]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'zulu'
-    - name: Maven cache
-      uses: actions/cache@v2
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: Build with Maven
-      run: mvn -T 8 test
-

.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

@@ -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/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:

README.md

@@ -3,7 +3,6 @@
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean/blob/master/LICENSE)
 [![Multi-JDK Build](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml)
-[![JDK 18-ea](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml)
 
 ##### Build with database platforms
 [![H2Database](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml)
@@ -12,9 +11,9 @@
 [![MariaDB](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml)
 [![Oracle](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml)
 [![SqlServer](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml)
+[![DB2 LUW](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml)
 [![Yugabyte](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml)
 
-
 ##### Build with Java Early Access versions
 [![ebean EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml)
 [![datasource EA](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml)
@@ -121,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

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +31,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-joda-time</artifactId>
+      <version>13.18.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-jsonnode</artifactId>
+      <version>13.18.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-mapper</artifactId>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
@@ -31,22 +49,24 @@
       <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.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.1</version>
+      <version>13.19.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</version>
   </parent>
 
   <artifactId>composites</artifactId>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.19.0</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.2</version>
-    </dependency>
-
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -42,6 +36,12 @@
       <version>1.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-config</artifactId>
+      <version>3.4</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>
@@ -90,19 +90,22 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <version>1.1</version>
-      <optional>true</optional>
-    </dependency>
-
+    <!-- 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 ___
+    <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>

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

@@ -5,7 +5,6 @@ import io.avaje.lang.Nullable;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
-import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 
 import javax.persistence.OptimisticLockException;
@@ -785,12 +784,6 @@ public final class DB {
     return getDefault().createUpdate(beanType, ormUpdate);
   }
 
-  /**
-   * Create a CsvReader for a given beanType.
-   */
-  public static <T> CsvReader<T> createCsvReader(Class<T> beanType) {
-    return getDefault().createCsvReader(beanType);
-  }
 
   /**
    * Create a named query.

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

@@ -9,7 +9,6 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
-import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 
 import javax.persistence.OptimisticLockException;
@@ -36,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.
  *
@@ -167,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);
 
@@ -204,10 +203,6 @@ public interface Database {
    */
   <T> T createEntityBean(Class<T> type);
 
-  /**
-   * Create a CsvReader for a given beanType.
-   */
-  <T> CsvReader<T> createCsvReader(Class<T> beanType);
 
   /**
    * Create an Update query to perform a bulk update.

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

@@ -16,7 +16,6 @@ import static java.lang.System.Logger.Level.ERROR;
 final class DbContext {
 
   private static final System.Logger log = EbeanVersion.log;
-
   static {
     EbeanVersion.getVersion();
   }
@@ -24,14 +23,9 @@ final class DbContext {
   private static final DbContext INSTANCE = new DbContext();
 
   private final ConcurrentHashMap<String, Database> concMap = new ConcurrentHashMap<>();
-
   private final HashMap<String, Database> syncMap = new HashMap<>();
-
   private final ReentrantLock lock = new ReentrantLock();
 
-  /**
-   * The 'default' Database.
-   */
   private Database defaultDatabase;
 
   private DbContext() {
@@ -70,9 +64,9 @@ final class DbContext {
    */
   Database getDefault() {
     if (defaultDatabase == null) {
-      String msg = "The default Database has not been defined?";
-      msg += " This is normally set via the ebean.datasource.default property.";
-      msg += " Otherwise it should be registered programmatically via registerServer()";
+      String msg = "The default Database has not been defined?"
+        + " This is normally set via the ebean.datasource.default property."
+        + " Otherwise it should be registered programmatically via registerServer()";
       throw new PersistenceException(msg);
     }
     return defaultDatabase;

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

@@ -76,9 +76,9 @@ final class DbPrimary {
     defaultServerName = System.getProperty("db", defaultServerName);
     defaultServerName = System.getProperty("ebean_db", defaultServerName);
     if (isEmpty(defaultServerName)) {
-      defaultServerName = Config.get("datasource.default", null);
+      defaultServerName = Config.getOptional("datasource.default").orElse(null);
       if (isEmpty(defaultServerName)) {
-        defaultServerName = Config.get("ebean.default.datasource", null);
+        defaultServerName = Config.getOptional("ebean.default.datasource").orElse(null);
       }
     }
     if (defaultServerName == null) {

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

@@ -129,6 +129,11 @@ public interface DtoQuery<T> extends CancelableQuery {
    */
   DtoQuery<T> setParameter(String name, Object value);
 
+  /**
+   * Bind the named parameter to SQL NULL.
+   */
+  DtoQuery<T> setNullParameter(String name, int jdbcType);
+
   /**
    * Bind the named multi-value array parameter which we would use with Postgres ANY.
    * <p>
@@ -141,6 +146,11 @@ public interface DtoQuery<T> extends CancelableQuery {
    */
   DtoQuery<T> setParameter(int position, Object value);
 
+  /**
+   * Set a positioned parameter to SQL NULL.
+   */
+  DtoQuery<T> setNullParameter(int position, int jdbcType);
+
   /**
    * Set the index of the first row of the results to return.
    */

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

@@ -2,6 +2,28 @@ package io.ebean;
 
 /**
  * Thrown when a duplicate is attempted on a unique constraint.
+ * <p>
+ * In terms of catching this exception with the view of continuing processing
+ * using the same transaction look to use {@link Transaction#rollbackAndContinue()}.
+ *
+ * <pre>{@code
+ *
+ *   try (Transaction txn = database.beginTransaction()) {
+ *
+ *     try {
+ *       ...
+ *       database.save(bean);
+ *       database.flush();
+ *     } catch (DuplicateKeyException e) {
+ *       // carry on processing using the transaction
+ *       txn.rollbackAndContinue();
+ *       ...
+ *     }
+ *
+ *     txn.commit();
+ *   }
+ *
+ * }</pre>
  */
 public class DuplicateKeyException extends DataIntegrityException {
   private static final long serialVersionUID = -4771932723285724817L;

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

@@ -30,18 +30,25 @@ public final class Expr {
   private Expr() {
   }
 
+  /**
+   * Return the underlying expression factory.
+   */
+  public static ExpressionFactory factory() {
+    return DB.expressionFactory();
+  }
+
   /**
    * 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);
   }
 
   /**
@@ -49,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);
   }
 
   /**
@@ -59,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);
   }
 
   /**
@@ -88,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);
   }
 
   /**
@@ -131,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);
   }
 
   /**
@@ -146,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);
   }
 
   /**
@@ -155,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);
   }
 
   /**
@@ -170,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);
   }
 
   /**
@@ -185,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);
   }
 
   /**
@@ -200,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);
   }
 
   /**
@@ -272,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);
   }
 
   /**
@@ -292,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);
   }
 
   /**
@@ -303,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);
   }
 
   /**
@@ -314,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;
@@ -117,6 +113,11 @@ public interface ExpressionFactory {
    */
   Expression arrayIsNotEmpty(String propertyName);
 
+  /**
+   * Equal To the result of a sub-query.
+   */
+  Expression eq(String propertyName, Query<?> subQuery);
+
   /**
    * Equal To - property equal to the given value.
    */
@@ -127,6 +128,11 @@ public interface ExpressionFactory {
    */
   Expression eqOrNull(String propertyName, Object value);
 
+  /**
+   * Not Equal To the result of a sub-query.
+   */
+  Expression ne(String propertyName, Query<?> subQuery);
+
   /**
    * Not Equal To - property not equal to the given value.
    */
@@ -181,6 +187,23 @@ public interface ExpressionFactory {
    */
   Expression inRangeWith(String lowProperty, String highProperty, Object value);
 
+  /**
+   * A Property is in Range between 2 properties.
+   *
+   * <pre>{@code
+   *
+   *    .orderDate.inRangeWith(QOrder.Alias.product.startDate, QOrder.Alias.product.endDate)
+   *
+   *    // which equates to
+   *    product.startDate <= orderDate and (orderDate < product.endDate or product.endDate is null)
+   *
+   * }</pre>
+   *
+   * <p>
+   * This is a convenience expression combining a number of simple expressions.
+   */
+  Expression inRangeWithProperties(String propertyName, String lowProperty, String highProperty);
+
   /**
    * Between - property between the two given values.
    */
@@ -207,11 +230,21 @@ public interface ExpressionFactory {
    */
   Expression geOrNull(String propertyName, Object value);
 
+  /**
+   * Greater Than the result of a sub-query.
+   */
+  Expression gt(String propertyName, Query<?> subQuery);
+
   /**
    * Greater Than - property greater than the given value.
    */
   Expression gt(String propertyName, Object value);
 
+  /**
+   * Greater Than or Equal to the result of a sub-query.
+   */
+  Expression ge(String propertyName, Query<?> subQuery);
+
   /**
    * Greater Than or Equal to - property greater than or equal to the given
    * value.
@@ -234,11 +267,21 @@ public interface ExpressionFactory {
    */
   Expression leOrNull(String propertyName, Object value);
 
+  /**
+   * Less Than the result of a sub-query.
+   */
+  Expression lt(String propertyName, Query<?> subQuery);
+
   /**
    * Less Than - property less than the given value.
    */
   Expression lt(String propertyName, Object value);
 
+  /**
+   * Less Than or Equal to the result of a sub-query.
+   */
+  Expression le(String propertyName, Query<?> subQuery);
+
   /**
    * Less Than or Equal to - property less than or equal to the given value.
    */
@@ -376,6 +419,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

@@ -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")
+  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
+  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;
@@ -830,6 +820,11 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> addAll(ExpressionList<T> exprList);
 
+  /**
+   * Equal To the result of a sub-query.
+   */
+  ExpressionList<T> eq(String propertyName, Query<?> subQuery);
+
   /**
    * Equal To - property is equal to a given value.
    */
@@ -854,6 +849,11 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> eqOrNull(String propertyName, Object value);
 
+  /**
+   * Not Equal To the result of a sub-query.
+   */
+  ExpressionList<T> ne(String propertyName, Query<?> subQuery);
+
   /**
    * Not Equal To - property not equal to the given value.
    */
@@ -890,6 +890,23 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> inRangeWith(String lowProperty, String highProperty, Object value);
 
+  /**
+   * A Property is in Range between 2 properties.
+   *
+   * <pre>{@code
+   *
+   *    .orderDate.inRangeWith(QOrder.Alias.product.startDate, QOrder.Alias.product.endDate)
+   *
+   *    // which equates to
+   *    product.startDate <= orderDate and (orderDate < product.endDate or product.endDate is null)
+   *
+   * }</pre>
+   *
+   * <p>
+   * This is a convenience expression combining a number of simple expressions.
+   */
+  ExpressionList<T> inRangeWithProperties(String propertyName, String lowProperty, String highProperty);
+
   /**
    * In Range - {@code property >= value1 and property < value2}.
    * <p>
@@ -908,6 +925,11 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> betweenProperties(String lowProperty, String highProperty, Object value);
 
+  /**
+   * Greater Than the result of a sub-query.
+   */
+  ExpressionList<T> gt(String propertyName, Query<?> subQuery);
+
   /**
    * Greater Than - property greater than the given value.
    */
@@ -919,9 +941,17 @@ public interface ExpressionList<T> {
   ExpressionList<T> gtOrNull(String propertyName, Object value);
 
   /**
-   * Greater Than or Equal to OR Null - ({@code >= or null }).
+   * Is GREATER THAN if value is non-null and otherwise no expression is added to the query.
+   * <p>
+   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
+   * effectively optional. We can use <code>gtIfPresent()</code> rather than having a separate if block.
    */
-  ExpressionList<T> geOrNull(String propertyName, Object value);
+  ExpressionList<T> gtIfPresent(String propertyName, @Nullable Object value);
+
+  /**
+   * Greater Than or Equal to the result of a sub-query.
+   */
+  ExpressionList<T> ge(String propertyName, Query<?> subQuery);
 
   /**
    * Greater Than or Equal to - property greater than or equal to the given
@@ -929,6 +959,25 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> ge(String propertyName, Object value);
 
+  /**
+   * Greater Than or Equal to OR Null - ({@code >= or null }).
+   */
+  ExpressionList<T> geOrNull(String propertyName, Object value);
+
+
+  /**
+   * Is GREATER THAN OR EQUAL TO if value is non-null and otherwise no expression is added to the query.
+   * <p>
+   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
+   * effectively optional. We can use <code>geIfPresent()</code> rather than having a separate if block.
+   */
+  ExpressionList<T> geIfPresent(String propertyName, @Nullable Object value);
+
+  /**
+   * Less Than the result of a sub-query.
+   */
+  ExpressionList<T> lt(String propertyName, Query<?> subQuery);
+
   /**
    * Less Than - property less than the given value.
    */
@@ -940,15 +989,36 @@ public interface ExpressionList<T> {
   ExpressionList<T> ltOrNull(String propertyName, Object value);
 
   /**
-   * Less Than or Equal to OR Null - ({@code <= or null }).
+   * Is LESS THAN if value is non-null and otherwise no expression is added to the query.
+   * <p>
+   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
+   * effectively optional. We can use <code>ltIfPresent()</code> rather than having a separate if block.
    */
-  ExpressionList<T> leOrNull(String propertyName, Object value);
+  ExpressionList<T> ltIfPresent(String propertyName, @Nullable Object value);
+
+  /**
+   * Less Than or Equal to the result of a sub-query.
+   */
+  ExpressionList<T> le(String propertyName, Query<?> subQuery);
 
   /**
    * Less Than or Equal to - property less than or equal to the given value.
    */
   ExpressionList<T> le(String propertyName, Object value);
 
+  /**
+   * Less Than or Equal to OR Null - ({@code <= or null }).
+   */
+  ExpressionList<T> leOrNull(String propertyName, Object value);
+
+  /**
+   * Is LESS THAN OR EQUAL TO if value is non-null and otherwise no expression is added to the query.
+   * <p>
+   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
+   * effectively optional. We can use <code>leIfPresent()</code> rather than having a separate if block.
+   */
+  ExpressionList<T> leIfPresent(String propertyName, @Nullable Object value);
+
   /**
    * Is Null - property is null.
    */
@@ -1061,6 +1131,94 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> inPairs(Pairs 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.
    */
@@ -1683,4 +1841,8 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> endNot();
 
+  /**
+   * Clears the current expression list.
+   */
+  ExpressionList<T> clear();
 }

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/OrderBy.java

@@ -231,18 +231,6 @@ public class OrderBy<T> implements Serializable {
     return this;
   }
 
-  /**
-   * Return true if this order by can be used in select clause.
-   */
-  public boolean supportsSelect() {
-    for (Property property : list) {
-      if (!property.supportsSelect()) {
-        return false;
-      }
-    }
-    return true;
-  }
-
   /**
    * A property and its ascending descending order.
    */
@@ -403,12 +391,6 @@ public class OrderBy<T> implements Serializable {
       this.ascending = ascending;
     }
 
-    /**
-     * Support use in select clause if no collation or nulls ordering.
-     */
-    boolean supportsSelect() {
-      return nulls == null;
-    }
   }
 
   private void parse(String orderByClause) {

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

@@ -17,17 +17,17 @@ public interface ProfileLocation {
   }
 
   /**
-   * Create and return a new ProfileLocation with a given lineNumber and label.
+   * Create and return a new ProfileLocation with line number.
    */
-  static ProfileLocation create(int lineNumber, String label) {
-    return XServiceProvider.profileLocationFactory().create(lineNumber, label);
+  static ProfileLocation createWithLine() {
+    return XServiceProvider.profileLocationFactory().createWithLine();
   }
 
   /**
-   * Create and return a new ProfileLocation with a given location.
+   * Create and return a new ProfileLocation with a given lineNumber and label.
    */
-  static ProfileLocation createAt(String location) {
-    return XServiceProvider.profileLocationFactory().createAt(location);
+  static ProfileLocation create(String label) {
+    return XServiceProvider.profileLocationFactory().create(label);
   }
 
   /**

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

@@ -1372,13 +1372,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")
   default Query<T> order(String orderByClause) {
     return orderBy(orderByClause);
   }
@@ -1395,14 +1391,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")
   default OrderBy<T> order() {
     return orderBy();
   }
@@ -1413,8 +1404,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")
   default Query<T> setOrder(OrderBy<T> orderBy) {
     return setOrderBy(orderBy);
   }
@@ -1579,14 +1571,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>
@@ -1768,4 +1752,31 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> orderById(boolean orderById);
 
+  /**
+   * Type safe query bean properties and expressions (marker interface).
+   * <p>
+   * Implemented by query bean properties and expressions based on those properties.
+   * <p>
+   * The base type determines which {@link StdOperators} can be used on the property.
+   *
+   * @param <T> The property type.
+   */
+  interface Property<T> {
+
+    /**
+     * Return a property given the expression.
+     */
+    static <T> Property<T> of(String expression) {
+      return new SimpleProperty<>(expression);
+    }
+
+    /**
+     * Return the property in string expression form.
+     * <p>
+     * This is a path to a database column (like "name" or "billingAddress.city") or a function
+     * wrapping a path (like <em>lower(name)</em>, <em>concat(name, '-', billingAddress.city)</em>
+     */
+    @Override
+    String toString();
+  }
 }

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

@@ -0,0 +1,15 @@
+package io.ebean;
+
+final class SimpleProperty<T> implements Query.Property<T> {
+
+  private final String expression;
+
+  SimpleProperty(String expression) {
+    this.expression = expression;
+  }
+
+  @Override
+  public String toString() {
+    return expression;
+  }
+}

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

@@ -0,0 +1,332 @@
+package io.ebean;
+
+import io.ebean.Query.Property;
+
+import java.util.Collection;
+
+/**
+ * Standard Operators for use with strongly typed query construction.
+ * <p>
+ * This is currently deemed to be experimental and subject to change.
+ */
+@Deprecated(since = "experimental")
+public final class StdOperators {
+
+  // ---- Functions ---- //
+
+  /**
+   * Sum of the given property.
+   */
+  public static Property<Number> sum(Property<? extends Number> property) {
+    return Property.of("sum(" + property + ")");
+  }
+
+  /**
+   * Count of the given property.
+   */
+  public static Property<Number> count(Property<?> property) {
+    return Property.of("count(" + property + ")");
+  }
+
+  /**
+   * Average of the given property.
+   */
+  public static <T> Property<T> avg(Property<T> property) {
+    return Property.of("avg(" + property + ")");
+  }
+
+  /**
+   * Max of the given property.
+   */
+  public static <T> Property<T> max(Property<T> property) {
+    return Property.of("max(" + property + ")");
+  }
+
+  /**
+   * Min of the given property.
+   */
+  public static <T> Property<T> min(Property<T> property) {
+    return Property.of("min(" + property + ")");
+  }
+
+  /**
+   * Coalesce of the property and value.
+   */
+  public static <T> Property<T> coalesce(Property<T> property, Object value) {
+    return Property.of("coalesce(" + property.toString() + "," + sqlValue(value) + ")");
+  }
+
+  /**
+   * Lower of the given property.
+   */
+  public static Property<String> lower(Property<String> property) {
+    return Property.of("lower(" + property + ")");
+  }
+
+  /**
+   * Upper of the given property.
+   */
+  public static Property<String> upper(Property<String> property) {
+    return Property.of("upper(" + property + ")");
+  }
+
+  /**
+   * Concat of the given property and values or other properties.
+   */
+  public static Property<String> concat(Property<?> property, Object... values) {
+    StringBuilder expression = new StringBuilder(50);
+    expression.append("concat(").append(property.toString());
+    for (Object value : values) {
+      expression.append(",").append(sqlConcatString(value));
+    }
+    expression.append(")");
+    return Property.of(expression.toString());
+  }
+
+  private static String sqlConcatString(Object value) {
+    if (value instanceof Property) {
+      return value.toString();
+    } else {
+      return sqlQuote(value);
+    }
+  }
+
+  /**
+   * Allows numbers to be unquoted.
+   */
+  private static String sqlValue(Object value) {
+    if (value instanceof Property || value instanceof Number) {
+      return value.toString();
+    } else {
+      return sqlQuote(value);
+    }
+  }
+
+  /**
+   * SQL quoted escaping single quotes.
+   */
+  private static String sqlQuote(Object value) {
+    return "'" + String.valueOf(value).replace("'", "''") + "'";
+  }
+
+  // ---- Operators ---- //
+
+  /**
+   * Equal to - for a property and value.
+   */
+  public static <T> Expression eq(Property<T> property, T value) {
+    return Expr.eq(property.toString(), value);
+  }
+
+  /**
+   * Equal to - for a property and sub-query.
+   */
+  public static <T> Expression eq(Property<T> property, Query<?> subQuery) {
+    return Expr.in(property.toString(), subQuery);
+  }
+
+  /**
+   * Equal to or null - for a property and value.
+   */
+  public static <T> Expression eqOrNull(Property<T> property, T value) {
+    return Expr.factory().eqOrNull(property.toString(), value);
+  }
+
+  /**
+   * Not equal to - for a property and value.
+   */
+  public static <T> Expression ne(Property<T> property, T value) {
+    return Expr.ne(property.toString(), value);
+  }
+
+  /**
+   * Not equal to - for a property and sub-query.
+   */
+  public static <T> Expression ne(Property<T> property, Query<?> subQuery) {
+    return Expr.ne(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than - for a property and value.
+   */
+  public static <T> Expression gt(Property<T> property, T value) {
+    return Expr.gt(property.toString(), value);
+  }
+
+  /**
+   * Greater than - for a property and sub-query.
+   */
+  public static <T> Expression gt(Property<T> property, Query<?> subQuery) {
+    return Expr.gt(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than or null - for a property and value.
+   */
+  public static <T> Expression gtOrNull(Property<T> property, T value) {
+    return Expr.factory().gtOrNull(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and value.
+   */
+  public static <T> Expression ge(Property<T> property, T value) {
+    return Expr.ge(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and sub-query.
+   */
+  public static <T> Expression ge(Property<T> property, Query<?> subQuery) {
+    return Expr.ge(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than or null - for a property and value.
+   */
+  public static <T> Expression geOrNull(Property<T> property, T value) {
+    return Expr.factory().geOrNull(property.toString(), value);
+  }
+
+  /**
+   * Less than - for a property and value.
+   */
+  public static <T> Expression lt(Property<T> property, T value) {
+    return Expr.lt(property.toString(), value);
+  }
+
+  /**
+   * Less than - for a property and sub-query.
+   */
+  public static <T> Expression lt(Property<T> property, Query<?> subQuery) {
+    return Expr.lt(property.toString(), subQuery);
+  }
+
+  /**
+   * Less than or null - for a property and value.
+   */
+  public static <T> Expression ltOrNull(Property<T> property, T value) {
+    return Expr.factory().ltOrNull(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and value.
+   */
+  public static <T> Expression le(Property<T> property, T value) {
+    return Expr.le(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and sub-query.
+   */
+  public static <T> Expression le(Property<T> property, Query<?> subQuery) {
+    return Expr.le(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than or equal to or null - for a property and value.
+   */
+  public static <T> Expression leOrNull(Property<T> property, T value) {
+    return Expr.factory().leOrNull(property.toString(), value);
+  }
+
+  /**
+   * In range - for a property and values.
+   */
+  public static <T> Expression inRange(Property<T> property, T lowValue, T highValue) {
+    return Expr.factory().inRange(property.toString(), lowValue, highValue);
+  }
+
+  /**
+   * In range - for properties and a value.
+   */
+  public static <T> Expression inRange(Property<T> lowProperty, Property<T> highProperty, T value) {
+    return Expr.factory().inRangeWith(lowProperty.toString(), highProperty.toString(), value);
+  }
+
+  /**
+   * In range - for properties.
+   */
+  public static <T> Expression inRange(Property<T> lowProperty, Property<T> property, Property<T> highProperty) {
+    return Expr.factory().inRangeWithProperties(lowProperty.toString(), property.toString(), highProperty.toString());
+  }
+
+  /**
+   * In - for a given property and collection of values.
+   */
+  public static <T> Expression in(Property<T> property, Collection<T> value) {
+    return Expr.in(property.toString(), value);
+  }
+
+  /**
+   * In - for a given property and sub-query.
+   */
+  public static <T> Expression in(Property<T> property, Query<?> subQuery) {
+    return Expr.in(property.toString(), subQuery);
+  }
+
+  /**
+   * In or empty - for a given property and collection of values.
+   */
+  public static <T> Expression inOrEmpty(Property<T> property, Collection<T> value) {
+    return Expr.inOrEmpty(property.toString(), value);
+  }
+
+  /**
+   * Not In - for a given property and collection of values.
+   */
+  public static <T> Expression notIn(Property<T> property, Collection<T> value) {
+    return Expr.factory().notIn(property.toString(), value);
+  }
+
+  /**
+   * Not In - for a given property and sub-query.
+   */
+  public static <T> Expression notIn(Property<T> property, Query<?> subQuery) {
+    return Expr.factory().notIn(property.toString(), subQuery);
+  }
+
+  // ---- String operators ---- //
+
+  /**
+   * Like - for a given property and value.
+   */
+  public static Expression like(Property<String> property, String value) {
+    return Expr.like(property.toString(), value);
+  }
+
+  /**
+   * Case-insensitive Like - for a given property and value.
+   */
+  public static Expression ilike(Property<String> property, String value) {
+    return Expr.ilike(property.toString(), value);
+  }
+
+  /**
+   * Starts with - for a given property and value.
+   */
+  public static Expression startsWith(Property<String> property, String value) {
+    return Expr.startsWith(property.toString(), value);
+  }
+
+  /**
+   * Case-insensitive starts with - for a given property and value.
+   */
+  public static Expression istartsWith(Property<String> property, String value) {
+    return Expr.istartsWith(property.toString(), value);
+  }
+
+  /**
+   * Contains - for a given property and value.
+   */
+  public static Expression contains(Property<String> property, String value) {
+    return Expr.contains(property.toString(), value);
+  }
+
+  /**
+   * Case-insensitive contains - for a given property and value.
+   */
+  public static Expression icontains(Property<String> property, String value) {
+    return Expr.icontains(property.toString(), value);
+  }
+}

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

@@ -144,6 +144,35 @@ public interface Transaction extends AutoCloseable {
    */
   void rollback(Throwable e) throws PersistenceException;
 
+  /**
+   * Performs a rollback on the underlying JDBC connection with the intention of
+   * continuing to use this same transaction and performing a commit or rollback
+   * later to complete the transaction.
+   * <p>
+   * Typically used when catching {@link DuplicateKeyException} where we wish to
+   * rollback work done at that point but carry on processing using the transaction.
+   *
+   * <pre>{@code
+   *
+   *   try (Transaction txn = database.beginTransaction()) {
+   *
+   *     try {
+   *       ...
+   *       database.save(bean);
+   *       database.flush();
+   *     } catch (DuplicateKeyException e) {
+   *       // carry on processing using the transaction
+   *       txn.rollbackAndContinue();
+   *       ...
+   *     }
+   *
+   *     txn.commit();
+   *   }
+   *
+   * }</pre>
+   */
+  void rollbackAndContinue();
+
   /**
    * Set when we want nested transactions to use Savepoint's.
    * <p>

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

@@ -14,7 +14,7 @@ package io.ebean;
  *
  *  int rows = DB.update(Customer.class)
  *      .set("status", Customer.Status.ACTIVE)
- *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+ *      .set("whenUpdated", Instant.now())
  *      .where()
  *      .gt("id", 1000)
  *      .update();
@@ -25,6 +25,20 @@ package io.ebean;
  *   update o_customer set status=?, updtime=? where id > ?
  *
  * }</pre>
+ *
+ * <h4>Example: Using query bean</h4>
+ * <pre>{@code
+ *
+ *   var cust = QCustomer.alias();
+ *
+ *   int rows = new QCustomer()
+ *       .id.gt(1000)
+ *       .asUpdate()
+ *       .set(cust.status, Customer.Status.COMPLETE)
+ *       .set(cust.whenUpdated, Instant.now())
+ *       .update();
+ *
+ * }</pre>
  * <p>
  * Note that if the where() clause contains a join then the SQL update changes to use a
  * <code> WHERE ID IN () </code> form.
@@ -40,7 +54,7 @@ package io.ebean;
  *
  *   int rows = DB.update(Customer.class)
  *       .set("status", Customer.Status.ACTIVE)
- *       .set("updtime", new Timestamp(System.currentTimeMillis()))
+ *       .set("whenUpdated", Instant.now())
  *       .where()
  *         .eq("status", Customer.Status.NEW)
  *         .eq("billingAddress.country", nz)
@@ -73,7 +87,7 @@ public interface UpdateQuery<T> {
    *
    *   int rows = DB.update(Customer.class)
    *      .set("status", Customer.Status.ACTIVE)
-   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+   *      .set("whenUpdated", Instant.now())
    *      .where()
    *      .gt("id", 1000)
    *      .update();
@@ -85,6 +99,27 @@ public interface UpdateQuery<T> {
    */
   UpdateQuery<T> set(String property, Object value);
 
+  /**
+   * Set the value of a property.
+   * <p>
+   * <pre>{@code
+   *
+   *   var cust = QCustomer.alias();
+   *
+   *   int rows = new QCustomer()
+   *       .id.gt(1000)
+   *       .asUpdate()
+   *       .set(cust.status, Customer.Status.COMPLETE)
+   *       .set(cust.whenUpdated, Instant.now())
+   *       .update();
+   *
+   * }</pre>
+   *
+   * @param property The bean property to be set
+   * @param value    The value to set the property to
+   */
+  <P> UpdateQuery<T> set(Query.Property<P> property, P value);
+
   /**
    * Set the property to be null.
    * <p>
@@ -102,6 +137,13 @@ public interface UpdateQuery<T> {
    */
   UpdateQuery<T> setNull(String property);
 
+  /**
+   * Set the property to be null.
+   *
+   * @param property The bean property to be set
+   */
+  UpdateQuery<T> setNull(Query.Property<?> property);
+
   /**
    * Set using a property expression that does not need any bind values.
    * <p>

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

@@ -2,6 +2,7 @@ package io.ebean.bean;
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.List;
 
 import static io.ebean.util.EncodeB64.enc;
 
@@ -27,20 +28,27 @@ public final class CallStack implements Serializable, CallOrigin {
 
   private final String zeroHash;
   private final String pathHash;
-  private final StackTraceElement[] callStack;
+  private final Object[] callStack;
   private final int hc;
 
-  public CallStack(StackTraceElement[] callStack, int zeroHash, int pathHash) {
+  public CallStack(Object[] callStack, int zeroHash, int pathHash) {
     this.callStack = callStack;
+    this.hc = computeHashCode();
     this.zeroHash = enc(zeroHash);
     this.pathHash = enc(pathHash);
+  }
+
+  public CallStack(List<StackWalker.StackFrame> frames) {
+    this.callStack = frames.toArray(new Object[0]);
     this.hc = computeHashCode();
+    this.zeroHash = enc(callStack[0].toString().hashCode());
+    this.pathHash = enc(hc);
   }
 
   private int computeHashCode() {
     int hc = 0;
-    for (StackTraceElement element : callStack) {
-      hc = 92821 * hc + element.hashCode();
+    for (Object element : callStack) {
+      hc = 92821 * hc + element.toString().hashCode();
     }
     return hc;
   }
@@ -71,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();
   }
 
@@ -79,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) {
@@ -91,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

@@ -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,14 +734,14 @@ 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;
       loader.loadBean(this);
       if (lazyLoadFailure) {
         // failed when lazy loading this bean
-        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);
       }
       // bean should be loaded and intercepting now. setLoaded() has
       // been called by the lazy loading mechanism
@@ -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;
@@ -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) {

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

@@ -6,7 +6,6 @@ import java.util.Set;
  * Notification event that dependent tables have been modified.
  * <p>
  * This is sent to other interested servers (in the cluster).
- * </p>
  */
 public class ServerCacheNotification {
 

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

@@ -6,7 +6,6 @@ import io.ebean.config.DatabaseConfig;
  * Plugin that provides a ServerCacheNotify implementation.
  * <p>
  * Is supplied this will be used to send the ServerCacheNotification event to other cluster members.
- * </p>
  */
 public interface ServerCacheNotifyPlugin {
 

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

@@ -29,6 +29,11 @@ public class ServerCacheStatistics {
 
   protected long evictCount;
 
+  protected long gcCount;
+  protected long idleCount;
+  protected long ttlCount;
+  protected long lruCount;
+
   @Override
   public String toString() {
     //noinspection StringBufferReplaceableByString
@@ -43,6 +48,10 @@ public class ServerCacheStatistics {
     sb.append(" remove:").append(removeCount);
     sb.append(" clear:").append(clearCount);
     sb.append(" evict:").append(evictCount);
+    sb.append(" gc:").append(gcCount);
+    sb.append(" idle:").append(idleCount);
+    sb.append(" ttl:").append(ttlCount);
+    sb.append(" lru:").append(lruCount);
     return sb.toString();
   }
 
@@ -191,4 +200,37 @@ public class ServerCacheStatistics {
     return evictCount;
   }
 
+  /**
+   * Set the count of entries removed by the garbage collection.
+   */
+  public void setGcCount(long gcCount) {
+    this.gcCount = gcCount;
+  }
+
+  /**
+   * Return the count of entries removed by the garbage collection.
+   */
+  public long getGcCount() {
+    return gcCount;
+  }
+
+  public void setIdleCount(long idleCount) {
+    this.idleCount = idleCount;
+  }
+
+  public long getIdleCount() {
+    return idleCount;
+  }
+
+  public void setTtlCount(long ttlCount) {
+    this.ttlCount = ttlCount;
+  }
+
+  public long getTtlCount() {
+    return ttlCount;
+  }
+
+  public void setLruCount(long lruCount) {
+    this.lruCount = lruCount;
+  }
 }

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
@@ -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

@@ -237,7 +237,7 @@ public abstract class AbstractNamingConvention implements NamingConvention {
     }
     buffer.append(rhsTableName);
 
-    int maxTableNameLength = databasePlatform.getMaxTableNameLength();
+    int maxTableNameLength = databasePlatform.maxTableNameLength();
 
     // maxConstraintNameLength is used as the max table name length.
     if (buffer.length() > maxTableNameLength) {

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

@@ -6,6 +6,10 @@ import java.util.concurrent.Callable;
  * BackgroundExecutorWrapper that can be used to wrap tasks that are sent to background (i.e. another thread).
  * It should copy all necessary thread-local variables. See {@link MdcBackgroundExecutorWrapper} for implementation details.
  *
+ * Note: only tasks that are executed immediately (submit, execute) are wrapped. Periodic or scheduled tasks are not wrapped,
+ * as these may keep copied variables in memory either forever or until the scheduled task is finished.
+ * The caller is responsible to handle these cases.
+ *
  * @author Roland Praml, FOCONIS AG
  */
 public interface BackgroundExecutorWrapper {

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

@@ -32,13 +32,11 @@ import java.util.function.Function;
  * <p>
  * Used to programmatically construct an Database and optionally register it
  * with the DB singleton.
- * </p>
  * <p>
  * If you just use DB thout this programmatic configuration Ebean will read
  * the application.properties file and take the configuration from there. This usually
  * includes searching the class path and automatically registering any entity
  * classes and listeners etc.
- * </p>
  * <pre>{@code
  *
  * DatabaseConfig config = new DatabaseConfig();
@@ -58,7 +56,6 @@ import java.util.function.Function;
  * <p>
  * Note that DatabaseConfigProvider provides a standard Java ServiceLoader mechanism that can
  * be used to apply configuration to the DatabaseConfig.
- * </p>
  *
  * @author emcgreal
  * @author rbygrave
@@ -126,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
@@ -529,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.
    */
@@ -598,24 +590,8 @@ 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 passed to a plugin.
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
    * <p>
    * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
    */
@@ -623,6 +599,23 @@ public class DatabaseConfig {
     serviceObject.put(key, configObject);
   }
 
+  /**
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
+   * <p>
+   * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
+   * You can also override some SPI objects that should be used for that Database. Currently, the following
+   * objects are possible.
+   * <ul>
+   *   <li>DataSourceAlertFactory (e.g. add different alert factories for different ebean instances)</li>
+   *   <li>DocStoreFactory</li>
+   *   <li>SlowQueryListener (e.g. add custom query listener for a certain ebean instance)</li>
+   *   <li>ServerCacheNotifyPlugin</li>
+   * </ul>
+   */
+  public <T> void putServiceObject(Class<T> iface, T configObject) {
+    serviceObject.put(serviceObjectKey(iface), configObject);
+  }
+
   /**
    * Return the service object given the key.
    */
@@ -631,7 +624,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Put a service object into configuration such that it can be passed to a plugin.
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
    *
    * <pre>{@code
    *
@@ -656,7 +649,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Used by plugins to obtain service objects.
+   * Used by ebean or plugins to obtain service objects.
    *
    * <pre>{@code
    *
@@ -2306,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);
@@ -2327,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);
     }
@@ -2369,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
+  public Set<Class<?>> getClasses() {
     return classes;
   }
 
@@ -2746,8 +2746,6 @@ public class DatabaseConfig {
     this.classLoadConfig = classLoadConfig;
   }
 
-
-
   /**
    * Load settings from application.properties, application.yaml and other sources.
    * <p>
@@ -2892,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);
@@ -2921,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);
@@ -2968,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) {
@@ -2985,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)) {
@@ -3006,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);
@@ -3024,7 +3021,7 @@ public class DatabaseConfig {
   public PersistBatch appliedPersistBatchOnCascade() {
     if (persistBatchOnCascade == PersistBatch.INHERIT) {
       // use the platform default (ALL except SQL Server which has NONE)
-      return databasePlatform.getPersistBatchOnCascade();
+      return databasePlatform.persistBatchOnCascade();
     }
     return persistBatchOnCascade;
   }
@@ -3385,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
   public boolean isAutoLoadModuleInfo() {
-    return loadModuleInfo && classes.isEmpty();
+    return loadModuleInfo;
   }
 
   /**

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

@@ -1,20 +1,16 @@
-package io.ebean.platform.db2;
+package io.ebean.config.dbplatform;
 
-import io.ebean.config.dbplatform.SqlLimitRequest;
-import io.ebean.config.dbplatform.SqlLimitResponse;
-import io.ebean.config.dbplatform.SqlLimiter;
-
-public class Db2SqlLimiter implements SqlLimiter {
+public final class AnsiSqlRowsLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    StringBuilder sb = new StringBuilder(512);
+    String dbSql = request.getDbSql();
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
     sb.append("select ");
     if (request.isDistinct()) {
       sb.append("distinct ");
     }
-    sb.append(request.getDbSql());
+    sb.append(dbSql);
     int firstRow = request.getFirstRow();
     if (firstRow > 0) {
       sb.append(" offset ").append(firstRow).append(" rows");
@@ -23,7 +19,6 @@ public class Db2SqlLimiter implements SqlLimiter {
     if (maxRows > 0) {
       sb.append(" fetch next ").append(maxRows).append(" rows only");
     }
-
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql);
   }

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

@@ -22,23 +22,6 @@ public class DatabasePlatform {
 
   private static final System.Logger log = EbeanVersion.log;
 
-  /**
-   * Behavior used when ending a query only transaction (at read committed isolation level).
-   */
-  public enum OnQueryOnly {
-
-    /**
-     * Rollback the transaction.
-     */
-    ROLLBACK,
-
-    /**
-     * Commit the transaction
-     */
-    COMMIT
-  }
-
-
   /**
    * Set to true for MySql, no other jdbc drivers need this workaround.
    */
@@ -59,11 +42,6 @@ public class DatabasePlatform {
    */
   protected boolean supportsNativeJavaTime = true;
 
-  /**
-   * The behaviour used when ending a read only transaction at read committed isolation level.
-   */
-  protected OnQueryOnly onQueryOnly = OnQueryOnly.COMMIT;
-
   /**
    * The open quote used by quoted identifiers.
    */
@@ -288,7 +266,7 @@ public class DatabasePlatform {
   /**
    * Return the platform key.
    */
-  public Platform getPlatform() {
+  public Platform platform() {
     return platform;
   }
 
@@ -298,14 +276,14 @@ public class DatabasePlatform {
    * "generic" is returned when no specific database platform has been set or found.
    * </p>
    */
-  public String getName() {
+  public String name() {
     return platform.name().toLowerCase();
   }
 
   /**
    * Return true if we are using Sequence batch mode rather than STEP.
    */
-  public boolean isSequenceBatchMode() {
+  public boolean sequenceBatchMode() {
     return sequenceBatchMode;
   }
 
@@ -319,52 +297,52 @@ public class DatabasePlatform {
   /**
    * Return true if this database platform supports native ILIKE expression.
    */
-  public boolean isSupportsNativeIlike() {
+  public boolean supportsNativeIlike() {
     return supportsNativeIlike;
   }
 
   /**
    * Return true if the platform supports delete statements with table alias.
    */
-  public boolean isSupportsDeleteTableAlias() {
+  public boolean supportsDeleteTableAlias() {
     return supportsDeleteTableAlias;
   }
 
   /**
-   * Return true if the collation is case sensitive.
+   * Return true if the collation is case-sensitive.
    * <p>
    * This is expected to be used for testing only.
    * </p>
    */
-  public boolean isCaseSensitiveCollation() {
+  public boolean caseSensitiveCollation() {
     return caseSensitiveCollation;
   }
 
   /**
    * Return true if the platform supports SavepointId values.
    */
-  public boolean isSupportsSavepointId() {
+  public boolean supportsSavepointId() {
     return supportsSavepointId;
   }
 
   /**
    * Return true if migrations should use stored procedures.
    */
-  public boolean isUseMigrationStoredProcedures() {
+  public boolean useMigrationStoredProcedures() {
     return useMigrationStoredProcedures;
   }
 
   /**
    * Return true if the platform supports LIMIT with sql update.
    */
-  public boolean isInlineSqlUpdateLimit() {
+  public boolean inlineSqlUpdateLimit() {
     return inlineSqlUpdateLimit;
   }
 
   /**
    * Return the maximum number of bind values this database platform allows or zero for no limit.
    */
-  public int getMaxInBinding() {
+  public int maxInBinding() {
     return maxInBinding;
   }
 
@@ -374,14 +352,14 @@ public class DatabasePlatform {
    * This is used when deriving names of intersection tables.
    * </p>
    */
-  public int getMaxTableNameLength() {
+  public int maxTableNameLength() {
     return maxTableNameLength;
   }
 
   /**
    * Return the maximum constraint name allowed for the platform.
    */
-  public int getMaxConstraintNameLength() {
+  public int maxConstraintNameLength() {
     return maxConstraintNameLength;
   }
 
@@ -409,24 +387,10 @@ public class DatabasePlatform {
     return null;
   }
 
-  /**
-   * Return the behaviour to use when ending a read only transaction.
-   */
-  public OnQueryOnly getOnQueryOnly() {
-    return onQueryOnly;
-  }
-
-  /**
-   * Set the behaviour to use when ending a read only transaction.
-   */
-  public void setOnQueryOnly(OnQueryOnly onQueryOnly) {
-    this.onQueryOnly = onQueryOnly;
-  }
-
   /**
    * Return the DbEncrypt handler for this DB platform.
    */
-  public DbEncrypt getDbEncrypt() {
+  public DbEncrypt dbEncrypt() {
     return dbEncrypt;
   }
 
@@ -440,7 +404,7 @@ public class DatabasePlatform {
   /**
    * Return the history support for this database platform.
    */
-  public DbHistorySupport getHistorySupport() {
+  public DbHistorySupport historySupport() {
     return historySupport;
   }
 
@@ -454,14 +418,14 @@ public class DatabasePlatform {
   /**
    * So no except for Postgres and CockroachDB.
    */
-  public boolean isNativeArrayType() {
+  public boolean nativeArrayType() {
     return false;
   }
 
   /**
    * Return true if the DB supports native UUID.
    */
-  public boolean isNativeUuidType() {
+  public boolean nativeUuidType() {
     return nativeUuidType;
   }
 
@@ -470,21 +434,21 @@ public class DatabasePlatform {
    *
    * @return the db type map
    */
-  public DbPlatformTypeMapping getDbTypeMap() {
+  public DbPlatformTypeMapping dbTypeMap() {
     return dbTypeMap;
   }
 
   /**
    * Return the mapping for DB column default values.
    */
-  public DbDefaultValue getDbDefaultValue() {
+  public DbDefaultValue dbDefaultValue() {
     return dbDefaultValue;
   }
 
   /**
    * Return the column alias prefix.
    */
-  public String getColumnAliasPrefix() {
+  public String columnAliasPrefix() {
     return columnAliasPrefix;
   }
 
@@ -498,21 +462,21 @@ public class DatabasePlatform {
   /**
    * Return the close quote for quoted identifiers.
    */
-  public String getCloseQuote() {
+  public String closeQuote() {
     return closeQuote;
   }
 
   /**
    * Return the open quote for quoted identifiers.
    */
-  public String getOpenQuote() {
+  public String openQuote() {
     return openQuote;
   }
 
   /**
    * Return the JDBC type used to store booleans.
    */
-  public int getBooleanDbType() {
+  public int booleanDbType() {
     return booleanDbType;
   }
 
@@ -523,7 +487,7 @@ public class DatabasePlatform {
    * example.
    * </p>
    */
-  public int getBlobDbType() {
+  public int blobDbType() {
     return blobDbType;
   }
 
@@ -533,7 +497,7 @@ public class DatabasePlatform {
    * This is typically Types.CLOB but for Postgres is Types.VARCHAR.
    * </p>
    */
-  public int getClobDbType() {
+  public int clobDbType() {
     return clobDbType;
   }
 
@@ -542,7 +506,7 @@ public class DatabasePlatform {
    * expanded form of (a=? and b=?) or (a=? and b=?) or ... rather than (a,b) in
    * ((?,?),(?,?),...);
    */
-  public boolean isIdInExpandedForm() {
+  public boolean idInExpandedForm() {
     return idInExpandedForm;
   }
 
@@ -553,7 +517,7 @@ public class DatabasePlatform {
    * This specifically is required for MySql when processing large results.
    * </p>
    */
-  public boolean isForwardOnlyHintOnFindIterate() {
+  public boolean forwardOnlyHintOnFindIterate() {
     return forwardOnlyHintOnFindIterate;
   }
 
@@ -571,7 +535,7 @@ public class DatabasePlatform {
    * This specifically is required for Hana which doesn't support CONCUR_UPDATABLE
    * </p>
    */
-  public boolean isSupportsResultSetConcurrencyModeUpdatable() {
+  public boolean supportsResultSetConcurrencyModeUpdatable() {
     return supportsResultSetConcurrencyModeUpdatable;
   }
 
@@ -591,7 +555,7 @@ public class DatabasePlatform {
    *
    * @return the db identity
    */
-  public DbIdentity getDbIdentity() {
+  public DbIdentity dbIdentity() {
     return dbIdentity;
   }
 
@@ -604,14 +568,14 @@ public class DatabasePlatform {
    *
    * @return the sql limiter
    */
-  public SqlLimiter getSqlLimiter() {
+  public SqlLimiter sqlLimiter() {
     return sqlLimiter;
   }
 
   /**
    * Return the BasicSqlLimiter for limit/offset of SqlQuery queries.
    */
-  public BasicSqlLimiter getBasicSqlLimiter() {
+  public BasicSqlLimiter basicSqlLimiter() {
     return basicSqlLimiter;
   }
 
@@ -680,14 +644,14 @@ public class DatabasePlatform {
   /**
    * Set to true if select count against anonymous view requires an alias.
    */
-  public boolean isSelectCountWithAlias() {
+  public boolean selectCountWithAlias() {
     return selectCountWithAlias;
   }
 
   /**
    * Return true if select count with subquery needs column alias (SQL Server).
    */
-  public boolean isSelectCountWithColumnAlias() {
+  public boolean selectCountWithColumnAlias() {
     return selectCountWithColumnAlias;
   }
 
@@ -709,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;
   }
 
@@ -718,14 +682,14 @@ public class DatabasePlatform {
    * <p>
    * This may include an escape clause to disable a default escape character.
    */
-  public String getLikeClause(boolean rawLikeExpression) {
+  public String likeClause(boolean rawLikeExpression) {
     return rawLikeExpression ? likeClauseRaw : likeClauseEscaped;
   }
 
   /**
    * Return the platform default JDBC batch mode for persist cascade.
    */
-  public PersistBatch getPersistBatchOnCascade() {
+  public PersistBatch persistBatchOnCascade() {
     return persistBatchOnCascade;
   }
 
@@ -769,19 +733,6 @@ public class DatabasePlatform {
     return false;
   }
 
-  /**
-   * Return true if the table exists.
-   */
-  public boolean tableExists(Connection connection, String catalog, String schema, String table) throws SQLException {
-    DatabaseMetaData metaData = connection.getMetaData();
-    ResultSet tables = metaData.getTables(catalog, schema, table, null);
-    try {
-      return tables.next();
-    } finally {
-      JdbcClose.close(tables);
-    }
-  }
-
   /**
    * Escapes the like string for this DB-Platform
    */

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

@@ -3,42 +3,25 @@ package io.ebean.config.dbplatform;
 /**
  * Adds LIMIT OFFSET clauses to a SQL query.
  */
-public class LimitOffsetSqlLimiter implements SqlLimiter {
-
-  /**
-   * LIMIT keyword.
-   */
-  private static final String LIMIT = "limit";
-
-  /**
-   * OFFSET keyword.
-   */
-  private static final String OFFSET = "offset";
+public final class LimitOffsetSqlLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
     String dbSql = request.getDbSql();
-
     StringBuilder sb = new StringBuilder(50 + dbSql.length());
     sb.append("select ");
     if (request.isDistinct()) {
       sb.append("distinct ");
     }
-
     sb.append(dbSql);
-
-    int firstRow = request.getFirstRow();
     int maxRows = request.getMaxRows();
-
-    if (maxRows > 0 || firstRow > 0) {
-      sb.append(" ").append(LIMIT).append(" ").append(maxRows);
-      if (firstRow > 0) {
-        sb.append(" ").append(OFFSET).append(" ");
-        sb.append(firstRow);
-      }
+    if (maxRows > 0) {
+      sb.append(" limit ").append(maxRows);
+    }
+    int firstRow = request.getFirstRow();
+    if (firstRow > 0) {
+      sb.append(" offset ").append(firstRow);
     }
-
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql);
   }

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

@@ -5,14 +5,6 @@ package io.ebean.config.dbplatform;
  */
 public interface SqlLimiter {
 
-  /**
-   * the new line character used.
-   * <p>
-   * Note that this is removed for logging sql to the transaction log.
-   * </p>
-   */
-  char NEW_LINE = '\n';
-
   /**
    * Add the SQL limiting statements around the query.
    */

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

@@ -122,9 +122,7 @@ public final class ShutdownManager {
         // Already run shutdown...
         return;
       }
-      if (log.isLoggable(DEBUG)) {
-        log.log(DEBUG, "Ebean shutting down");
-      }
+      log.log(DEBUG, "Ebean shutting down");
       stopping = true;
       deregisterShutdownHook();
 
@@ -145,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/plugin/ExpressionPath.java

@@ -39,18 +39,6 @@ public interface ExpressionPath {
    */
   StringParser stringParser();
 
-  /**
-   * For DateTime capable scalar types convert the long systemTimeMillis into
-   * an appropriate java time (Date,Timestamp,Time,Calendar, JODA type etc).
-   */
-  Object parseDateTime(long systemTimeMillis);
-
-  /**
-   * Return true if the last type is "DateTime capable" - can support
-   * {@link #parseDateTime(long)}.
-   */
-  boolean isDateTimeCapable();
-
   /**
    * Return the underlying JDBC type or 0 if this is not a scalar type.
    */

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

@@ -13,9 +13,16 @@ public interface SpiProfileLocationFactory {
   ProfileLocation create();
 
   /**
-   * Create a profile location with a line number.
+   * Create a profile location with line numbering.
    */
-  ProfileLocation create(int lineNumber, String label);
+  ProfileLocation createWithLine();
+
+  /**
+   * Create with a given label - used only with {@code @Transaction}.
+   *
+   * @param label the label for the transaction
+   */
+  ProfileLocation create(String label);
 
   /**
    * Create a known location.

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

@@ -6,6 +6,7 @@ package io.ebean.text;
  * Basic interface to support CSV, JSON and XML processing.
  * </p>
  */
+@FunctionalInterface
 public interface StringFormatter {
 
   /**

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

@@ -5,6 +5,7 @@ package io.ebean.text;
  * <p>
  * Basic interface to support CSV, JSON and XML processing.
  */
+@FunctionalInterface
 public interface StringParser {
 
   /**

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

@@ -1,55 +0,0 @@
-package io.ebean.text;
-
-import java.sql.Time;
-
-/**
- * Parser for TIME types that supports both HH:mm:ss and HH:mm.
- */
-public final class TimeStringParser implements StringParser {
-
-  private static final TimeStringParser SHARED = new TimeStringParser();
-
-  /**
-   * Return a shared instance as this is thread safe.
-   */
-  public static TimeStringParser get() {
-    return SHARED;
-  }
-
-  /**
-   * Parse the String supporting both HH:mm:ss and HH:mm formats.
-   */
-  @Override
-  @SuppressWarnings("deprecation")
-  public Object parse(String value) {
-    if (value == null || value.trim().isEmpty()) {
-      return null;
-    }
-
-    String s = value.trim();
-    int firstColon = s.indexOf(':');
-
-    if (firstColon == -1) {
-      throw new java.lang.IllegalArgumentException("No ':' in value [" + s + "]");
-    }
-    try {
-      int second;
-      int minute;
-      int hour = Integer.parseInt(s.substring(0, firstColon));
-      int secondColon = s.indexOf(':', firstColon + 1);
-
-      if (secondColon == -1) {
-        minute = Integer.parseInt(s.substring(firstColon + 1, s.length()));
-        second = 0;
-      } else {
-        minute = Integer.parseInt(s.substring(firstColon + 1, secondColon));
-        second = Integer.parseInt(s.substring(secondColon + 1));
-      }
-
-      return new Time(hour, minute, second);
-
-    } catch (NumberFormatException e) {
-      throw new java.lang.IllegalArgumentException("Number format Error parsing time [" + s + "] " + e.getMessage(), e);
-    }
-  }
-}

ebean-api/src/main/java/io/ebean/text/csv/CsvCallback.java

@@ -1,78 +0,0 @@
-package io.ebean.text.csv;
-
-import io.ebean.Database;
-
-/**
- * Provides callback methods for customisation of CSV processing.
- * <p>
- * You can provide your own CsvCallback implementation to customise the CSV
- * processing. It is expected that the DefaultCsvCallback provides a good base
- * class that you can extend.
- */
-public interface CsvCallback<T> {
-
-  /**
-   * The processing is about to begin.
-   * <p>
-   * Typically the callback will create a transaction, set batch mode, batch
-   * size etc.
-   * </p>
-   */
-  void begin(Database database);
-
-  /**
-   * Read the header row.
-   * <p>
-   * This is only called if {@link CsvReader#setHasHeader(boolean, boolean)} has
-   * been set to true.
-   * </p>
-   *
-   * @param line the header line content.
-   */
-  void readHeader(String[] line);
-
-  /**
-   * Check that the row should be processed - return true to process the row or
-   * false to ignore the row. Gives ability to handle bad data... empty rows etc
-   * and ignore it rather than fail.
-   */
-  boolean processLine(int row, String[] line);
-
-  /**
-   * Called for each bean after it has been loaded from the CSV content.
-   * <p>
-   * This allows you to process the bean however you like.
-   * </p>
-   * <p>
-   * When you use a CsvCallback the CsvReader *WILL NOT* create a transaction
-   * and will not save the bean for you. You have complete control and must do
-   * these things yourself (if that is want you want).
-   * </p>
-   *
-   * @param row  the index of the content being processed
-   * @param line the content that has been used to load the bean
-   * @param bean the entity bean after it has been loaded from the csv content
-   */
-  void processBean(int row, String[] line, T bean);
-
-  /**
-   * The processing has ended successfully.
-   * <p>
-   * Typically the callback will commit the transaction.
-   * </p>
-   */
-  void end(int row);
-
-  /**
-   * The processing has ended due to an error.
-   * <p>
-   * This gives the callback the opportunity to rollback the transaction if one
-   * was created.
-   * </p>
-   *
-   * @param row the row that the error has occurred on
-   * @param e   the error that occurred
-   */
-  void endWithError(int row, Exception e);
-
-}

ebean-api/src/main/java/io/ebean/text/csv/CsvReader.java

@@ -1,171 +0,0 @@
-package io.ebean.text.csv;
-
-import io.ebean.text.StringParser;
-
-import java.io.Reader;
-import java.util.Locale;
-
-/**
- * Reads CSV data turning it into object graphs that you can be saved (inserted)
- * or processed yourself.
- * <p>
- * This first example doesn't use a {@link CsvCallback} and this means it will
- * automatically create a transaction, save the customers and commit the
- * transaction when successful.
- * </p>
- *
- * <pre>{@code
- * try {
- *   File f = new File("src/test/resources/test1.csv");
- *
- *   FileReader reader = new FileReader(f, encoding);
- *
- *   CsvReader<Customer> csvReader = DB.createCsvReader(Customer.class);
- *
- *   csvReader.setPersistBatchSize(20);
- *
- *   csvReader.addProperty("status");
- *   // ignore the next property
- *   csvReader.addIgnore();
- *   csvReader.addProperty("name");
- *   csvReader.addDateTime("anniversary", "dd-MMM-yyyy");
- *   csvReader.addProperty("billingAddress.line1");
- *   csvReader.addProperty("billingAddress.city");
- *
- *   csvReader.process(reader);
- *
- * } catch (Exception e) {
- *   throw new RuntimeException(e);
- * }
- * }</pre>
- *
- * @param <T> the entity bean type
- */
-public interface CsvReader<T> {
-
-  /**
-   * Explicitly set the default Locale.
-   */
-  void setDefaultLocale(Locale defaultLocale);
-
-  /**
-   * Set the default format to use for Time types.
-   */
-  void setDefaultTimeFormat(String defaultTimeFormat);
-
-  /**
-   * Set the default format to use for Date types.
-   */
-  void setDefaultDateFormat(String defaultDateFormat);
-
-  /**
-   * Set the default format to use for Timestamp types.
-   */
-  void setDefaultTimestampFormat(String defaultTimestampFormat);
-
-  /**
-   * Set the batch size for using JDBC statement batching.
-   * <p>
-   * By default this is set to 20 and setting this to 1 will disable the use of
-   * JDBC statement batching.
-   * </p>
-   */
-  void setPersistBatchSize(int persistBatchSize);
-
-  /**
-   * Set to true if there is a header row that should be ignored.
-   * <p>
-   * If addPropertiesFromHeader is true then all the properties are added using
-   * the default time,date and timestamp formats.
-   * <p>
-   * If you have a mix of dateTime formats you can not use this method and must
-   * add the properties yourself.
-   * </p>
-   */
-  void setHasHeader(boolean hasHeader, boolean addPropertiesFromHeader);
-
-  /**
-   * Same as setHasHeader(true,true);
-   * <p>
-   * This will use a header to define all the properties to load using the
-   * default formats for time, date and datetime types.
-   * </p>
-   */
-  void setAddPropertiesFromHeader();
-
-  /**
-   * Same as setHasHeader(true, false);
-   * <p>
-   * This indicates that there is a header but that it should be ignored.
-   * </p>
-   */
-  void setIgnoreHeader();
-
-  /**
-   * Set the frequency with which a INFO message will be logged showing the
-   * progress of the processing. You might set this to 1000 or 10000 etc.
-   * <p>
-   * If this is not set then no INFO messages will be logged.
-   * </p>
-   */
-  void setLogInfoFrequency(int logInfoFrequency);
-
-  /**
-   * Ignore the next column of data.
-   */
-  void addIgnore();
-
-  /**
-   * Define the property which will be loaded from the next column of data.
-   * <p>
-   * This takes into account the data type of the property and handles the
-   * String to object conversion automatically.
-   * </p>
-   */
-  void addProperty(String propertyName);
-
-  /**
-   * Define the next property and use a custom StringParser to convert the
-   * string content into the appropriate type for the property.
-   */
-  void addProperty(String propertyName, StringParser parser);
-
-  /**
-   * Add a property with a custom Date/Time/Timestamp format using the default
-   * Locale. This will convert the string into the appropriate java type for the
-   * given property (Date, Calendar, SQL Date, Time, Timestamp, JODA etc).
-   */
-  void addDateTime(String propertyName, String dateTimeFormat);
-
-  /**
-   * Add a property with a custom Date/Time/Timestamp format. This will convert
-   * the string into the appropriate java type for the given property (Date,
-   * Calendar, SQL Date, Time, Timestamp, JODA etc).
-   */
-  void addDateTime(String propertyName, String dateTimeFormat, Locale locale);
-
-  /**
-   * Automatically create a transaction if required to process all the CSV
-   * content from the reader.
-   * <p>
-   * This will check for a current transaction. If there is no current
-   * transaction then one is started and will commit (or rollback) at the end of
-   * processing. This will also set the persistBatchSize on the transaction.
-   * </p>
-   */
-  void process(Reader reader) throws Exception;
-
-  /**
-   * Process the CSV content passing the bean to the CsvCallback after each row.
-   * <p>
-   * This provides you with the ability to modify and process the bean.
-   * </p>
-   * <p>
-   * When using a CsvCallback the reader WILL NOT create a transaction or save
-   * the bean(s) for you. If you want to insert the processed beans you must
-   * create your own transaction and save the bean(s) yourself.
-   * </p>
-   */
-  void process(Reader reader, CsvCallback<T> callback) throws Exception;
-
-}

ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java

@@ -1,196 +0,0 @@
-package io.ebean.text.csv;
-
-import io.ebean.Database;
-import io.ebean.EbeanVersion;
-import io.ebean.Transaction;
-
-import static java.lang.System.Logger.Level.DEBUG;
-import static java.lang.System.Logger.Level.INFO;
-
-/**
- * Provides the default implementation of CsvCallback.
- * <p>
- * This handles transaction creation (if no current transaction existed) and
- * transaction commit or rollback on error.
- * </p>
- * <p>
- * For customising the processing you can extend this object and override the
- * appropriate methods.
- * </p>
- *
- * @param <T>
- */
-public class DefaultCsvCallback<T> implements CsvCallback<T> {
-
-  private static final System.Logger log = EbeanVersion.log;
-
-  /**
-   * The transaction to use (if not using CsvCallback).
-   */
-  protected Transaction transaction;
-
-  /**
-   * Flag set when we created the transaction.
-   */
-  protected boolean createdTransaction;
-
-  /**
-   * The EbeanServer used to save the beans.
-   */
-  protected Database server;
-
-  /**
-   * Used to log a message to indicate progress through large files.
-   */
-  protected final int logInfoFrequency;
-
-  /**
-   * The batch size used when saving the beans.
-   */
-  protected final int persistBatchSize;
-
-  /**
-   * The time the process started.
-   */
-  protected long startTime;
-
-  /**
-   * The execution time of the process.
-   */
-  protected long exeTime;
-
-  /**
-   * Construct with a default batch size of 30 and logging info messages every
-   * 1000 rows.
-   */
-  public DefaultCsvCallback() {
-    this(30, 1000);
-  }
-
-  /**
-   * Construct with explicit batch size and logging info frequency.
-   */
-  public DefaultCsvCallback(int persistBatchSize, int logInfoFrequency) {
-    this.persistBatchSize = persistBatchSize;
-    this.logInfoFrequency = logInfoFrequency;
-  }
-
-  /**
-   * Create a transaction if required.
-   */
-  @Override
-  public void begin(Database server) {
-    this.server = server;
-    this.startTime = System.currentTimeMillis();
-    initTransactionIfRequired();
-  }
-
-  /**
-   * Override to read the heading line.
-   * <p>
-   * This is only called if {@link CsvReader#setHasHeader(boolean, boolean)} is
-   * set to true.
-   * <p>
-   * By default this does nothing (effectively ignoring the heading).
-   */
-  @Override
-  public void readHeader(String[] line) {
-
-  }
-
-  /**
-   * Validate that the content is valid and return false if the row should be
-   * ignored.
-   * <p>
-   * By default this just returns true.
-   * </p>
-   * <p>
-   * Override this to add custom validation logic returning false if you want
-   * the row to be ignored. For example, if all the content is empty return
-   * false to ignore the row (rather than having the processing fail with some
-   * error).
-   * </p>
-   */
-  @Override
-  public boolean processLine(int row, String[] line) {
-    return true;
-  }
-
-  /**
-   * Will save the bean.
-   * <p>
-   * Override this method to customise the bean (set additional properties etc)
-   * or to control the saving of other related beans (when you can't/don't want
-   * to use Cascade.PERSIST etc).
-   * </p>
-   */
-  @Override
-  public void processBean(int row, String[] line, T bean) {
-    // assumes single bean or Cascade.PERSIST will save any
-    // related beans (e.g. customer -> customer.billingAddress
-    server.save(bean, transaction);
-    if (logInfoFrequency > 0 && (row % logInfoFrequency == 0)) {
-      log.log(DEBUG, "processed {0} rows", row);
-    }
-  }
-
-  /**
-   * Commit the transaction if one was created.
-   */
-  @Override
-  public void end(int row) {
-    commitTransactionIfCreated();
-    exeTime = System.currentTimeMillis() - startTime;
-    log.log(INFO, "Csv finished, rows[{0}] exeMillis[{1}]", row, exeTime);
-  }
-
-  /**
-   * Rollback the transaction if one was created.
-   */
-  @Override
-  public void endWithError(int row, Exception e) {
-    rollbackTransactionIfCreated(e);
-  }
-
-  /**
-   * Create a transaction if one is not already active and set its batch mode
-   * and batch size.
-   */
-  protected void initTransactionIfRequired() {
-    transaction = server.currentTransaction();
-    if (transaction == null || !transaction.isActive()) {
-      transaction = server.beginTransaction();
-      createdTransaction = true;
-      if (persistBatchSize > 1) {
-        transaction.setBatchMode(true);
-        transaction.setBatchSize(persistBatchSize);
-        transaction.setGetGeneratedKeys(false);
-      } else {
-        // explicitly turn off JDBC batching in case
-        // is has been turned on globally
-        transaction.setBatchMode(false);
-      }
-    }
-  }
-
-  /**
-   * If we created a transaction commit it. We have successfully processed all
-   * the rows.
-   */
-  protected void commitTransactionIfCreated() {
-    if (createdTransaction) {
-      transaction.commit();
-    }
-  }
-
-  /**
-   * Rollback the transaction if we where not successful in processing all the
-   * rows.
-   */
-  protected void rollbackTransactionIfCreated(Throwable e) {
-    if (createdTransaction) {
-      transaction.rollback(e);
-    }
-  }
-
-}

ebean-api/src/main/java/io/ebean/text/csv/package-info.java

@@ -1,4 +0,0 @@
-/**
- * CSV processing objects.
- */
-package io.ebean.text.csv;

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

@@ -0,0 +1,29 @@
+package io.ebean.util;
+
+import java.util.function.Predicate;
+
+/**
+ * Provides a stack filter that excludes ebean and jdk code.
+ */
+public final class StackWalkFilter {
+
+  private static final Filter FILTER = new Filter();
+
+  /**
+   * Return a stack filter that excludes ebean and jdk code.
+   */
+  public static Predicate<StackWalker.StackFrame> filter() {
+    return FILTER;
+  }
+
+  private static class Filter implements Predicate<StackWalker.StackFrame> {
+
+    @Override
+    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

@@ -40,7 +40,6 @@ module io.ebean.api {
   exports io.ebean.service;
   exports io.ebean.text;
   exports io.ebean.text.json;
-  exports io.ebean.text.csv;
   exports io.ebean.util;
 
 }

ebean-api/src/main/resources/META-INF/ebean-version.mf

@@ -0,0 +1 @@
+ebean-version: 143

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

@@ -0,0 +1,78 @@
+package io.ebean;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDate;
+
+import static io.ebean.StdOperators.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class StdOperatorsTest {
+
+  final Query.Property<Number> amount = Query.Property.of("amount");
+  final Query.Property<String> foo = Query.Property.of("foo");
+  final Query.Property<String> bar = Query.Property.of("bar");
+
+  @Test
+  void testAvg() {
+    assertThat(avg(foo).toString()).isEqualTo("avg(foo)");
+  }
+
+  @Test
+  void testCount() {
+    assertThat(count(foo).toString()).isEqualTo("count(foo)");
+  }
+
+  @Test
+  void testMax() {
+    assertThat(max(foo).toString()).isEqualTo("max(foo)");
+  }
+
+  @Test
+  void testMin() {
+    assertThat(min(foo).toString()).isEqualTo("min(foo)");
+  }
+
+  @Test
+  void testSum() {
+    assertThat(sum(amount).toString()).isEqualTo("sum(amount)");
+  }
+
+  @Test
+  void testLower() {
+    assertThat(lower(foo).toString()).isEqualTo("lower(foo)");
+  }
+
+  @Test
+  void testUpper() {
+    assertThat(upper(foo).toString()).isEqualTo("upper(foo)");
+  }
+
+  @Test
+  void testConcat() {
+    assertThat(concat(foo, "+").toString()).isEqualTo("concat(foo,'+')");
+    assertThat(concat(foo, 42).toString()).isEqualTo("concat(foo,'42')");
+    assertThat(concat(foo, LocalDate.of(2022, 9, 1)).toString()).isEqualTo("concat(foo,'2022-09-01')");
+    assertThat(concat(foo, bar).toString()).isEqualTo("concat(foo,bar)");
+    assertThat(concat(foo, ":", 42, bar).toString()).isEqualTo("concat(foo,':','42',bar)");
+  }
+
+  @Test
+  void testCoalesce() {
+    assertThat(coalesce(foo, bar).toString()).isEqualTo("coalesce(foo,bar)");
+    assertThat(coalesce(foo, 42).toString()).isEqualTo("coalesce(foo,42)");
+    assertThat(coalesce(foo, 0).toString()).isEqualTo("coalesce(foo,0)");
+    assertThat(coalesce(foo, "apple").toString()).isEqualTo("coalesce(foo,'apple')");
+    assertThat(coalesce(foo, "banana").toString()).isEqualTo("coalesce(foo,'banana')");
+  }
+
+  @Test
+  void testCoalesceWithQuoted() {
+    assertThat(coalesce(foo, "ba'nana").toString()).isEqualTo("coalesce(foo,'ba''nana')");
+  }
+
+  @Test
+  void testConcatWithQuoted() {
+    assertThat(concat(foo, "ba'nana").toString()).isEqualTo("concat(foo,'ba''nana')");
+  }
+}

ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java

@@ -3,10 +3,6 @@ package io.ebean.config;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.annotation.PersistBatch;
-import io.ebean.config.DatabaseConfig;
-import io.ebean.config.JsonConfig;
-import io.ebean.config.MatchingNamingConvention;
-import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.datasource.DataSourceConfig;
 import org.junit.jupiter.api.Assertions;
@@ -93,6 +89,7 @@ class DatabaseConfigTest {
     assertTrue(config.isDbOffline());
     assertTrue(config.isAutoReadOnlyDataSource());
     assertTrue(config.isAutoLoadModuleInfo());
+    assertTrue(config.isLoadModuleInfo());
     assertTrue(config.skipDataSourceCheck());
 
     assertTrue(config.isIdGeneratorAutomatic());
@@ -165,6 +162,7 @@ class DatabaseConfigTest {
     assertEquals(MutationDetection.HASH, config.getJsonMutationDetection());
     assertTrue(config.getPlatformConfig().isCaseSensitiveCollation());
     assertTrue(config.isAutoLoadModuleInfo());
+    assertTrue(config.isLoadModuleInfo());
 
     assertFalse(config.isQueryPlanEnable());
     assertEquals(Long.MAX_VALUE, config.getQueryPlanThresholdMicros());
@@ -175,6 +173,7 @@ class DatabaseConfigTest {
 
     config.setLoadModuleInfo(false);
     assertFalse(config.isAutoLoadModuleInfo());
+    assertFalse(config.isLoadModuleInfo());
     config.setAutoPersistUpdates(true);
     assertTrue(config.isAutoPersistUpdates());
     config.setSkipDataSourceCheck(true);

ebean-autotune/pom.xml

@@ -1,80 +0,0 @@
-<?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.8.1</version>
-  </parent>
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java8-oss</artifactId>-->
-<!--    <version>2.2</version>-->
-<!--  </parent>-->
-
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
-
-  <name>ebean autotune</name>
-  <description>ebean automatic query tuning module</description>
-  <artifactId>ebean-autotune</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- needed for java 11+ -->
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.6</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:13.6.5</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java

@@ -1,133 +0,0 @@
-package io.ebeaninternal.server.autotune.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Java class for anonymous complex type.
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileDiff" minOccurs="0"/>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileNew" minOccurs="0"/>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileEmpty" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin",
-  "profileDiff",
-  "profileNew",
-  "profileEmpty"
-})
-@XmlRootElement(name = "autotune")
-public class Autotune {
-
-  protected List<Origin> origin;
-  protected ProfileDiff profileDiff;
-  protected ProfileNew profileNew;
-  protected ProfileEmpty profileEmpty;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-  /**
-   * Gets the value of the profileDiff property.
-   *
-   * @return possible object is
-   * {@link ProfileDiff }
-   */
-  public ProfileDiff getProfileDiff() {
-    return profileDiff;
-  }
-
-  /**
-   * Sets the value of the profileDiff property.
-   *
-   * @param value allowed object is
-   *              {@link ProfileDiff }
-   */
-  public void setProfileDiff(ProfileDiff value) {
-    this.profileDiff = value;
-  }
-
-  /**
-   * Gets the value of the profileNew property.
-   *
-   * @return possible object is
-   * {@link ProfileNew }
-   */
-  public ProfileNew getProfileNew() {
-    return profileNew;
-  }
-
-  /**
-   * Sets the value of the profileNew property.
-   *
-   * @param value allowed object is
-   *              {@link ProfileNew }
-   */
-  public void setProfileNew(ProfileNew value) {
-    this.profileNew = value;
-  }
-
-  /**
-   * Gets the value of the profileEmpty property.
-   *
-   * @return possible object is
-   * {@link ProfileEmpty }
-   */
-  public ProfileEmpty getProfileEmpty() {
-    return profileEmpty;
-  }
-
-  /**
-   * Sets the value of the profileEmpty property.
-   *
-   * @param value allowed object is
-   *              {@link ProfileEmpty }
-   */
-  public void setProfileEmpty(ProfileEmpty value) {
-    this.profileEmpty = value;
-  }
-
-}

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java

@@ -1,64 +0,0 @@
-package io.ebeaninternal.server.autotune.model;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the io.ebeaninternal.server.autotune.model package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups.  Factory methods for each of these are
- * provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-  /**
-   * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.server.autotune.model
-   */
-  public ObjectFactory() {
-  }
-
-  /**
-   * Create an instance of {@link ProfileNew }
-   */
-  public ProfileNew createProfileNew() {
-    return new ProfileNew();
-  }
-
-  /**
-   * Create an instance of {@link Origin }
-   */
-  public Origin createOrigin() {
-    return new Origin();
-  }
-
-  /**
-   * Create an instance of {@link ProfileEmpty }
-   */
-  public ProfileEmpty createProfileEmpty() {
-    return new ProfileEmpty();
-  }
-
-  /**
-   * Create an instance of {@link Autotune }
-   */
-  public Autotune createAutotune() {
-    return new Autotune();
-  }
-
-  /**
-   * Create an instance of {@link ProfileDiff }
-   */
-  public ProfileDiff createProfileDiff() {
-    return new ProfileDiff();
-  }
-
-}

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java

@@ -1,148 +0,0 @@
-package io.ebeaninternal.server.autotune.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="callStack" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="beanType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="detail" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="original" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "callStack"
-})
-@XmlRootElement(name = "origin")
-public class Origin {
-
-  protected String callStack;
-  @XmlAttribute(name = "key", required = true)
-  protected String key;
-  @XmlAttribute(name = "beanType")
-  protected String beanType;
-  @XmlAttribute(name = "detail")
-  protected String detail;
-  @XmlAttribute(name = "original")
-  protected String original;
-
-  /**
-   * Gets the value of the callStack property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getCallStack() {
-    return callStack;
-  }
-
-  /**
-   * Sets the value of the callStack property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setCallStack(String value) {
-    this.callStack = value;
-  }
-
-  /**
-   * Gets the value of the key property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getKey() {
-    return key;
-  }
-
-  /**
-   * Sets the value of the key property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setKey(String value) {
-    this.key = value;
-  }
-
-  /**
-   * Gets the value of the beanType property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getBeanType() {
-    return beanType;
-  }
-
-  /**
-   * Sets the value of the beanType property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setBeanType(String value) {
-    this.beanType = value;
-  }
-
-  /**
-   * Gets the value of the detail property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getDetail() {
-    return detail;
-  }
-
-  /**
-   * Sets the value of the detail property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setDetail(String value) {
-    this.detail = value;
-  }
-
-  /**
-   * Gets the value of the original property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getOriginal() {
-    return original;
-  }
-
-  /**
-   * Sets the value of the original property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setOriginal(String value) {
-    this.original = value;
-  }
-
-}

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java

@@ -1,64 +0,0 @@
-package io.ebeaninternal.server.autotune.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin"
-})
-@XmlRootElement(name = "profileDiff")
-public class ProfileDiff {
-
-  protected List<Origin> origin;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-}

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java

@@ -1,64 +0,0 @@
-package io.ebeaninternal.server.autotune.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin"
-})
-@XmlRootElement(name = "profileEmpty")
-public class ProfileEmpty {
-
-  protected List<Origin> origin;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-}

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java

@@ -1,64 +0,0 @@
-package io.ebeaninternal.server.autotune.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin"
-})
-@XmlRootElement(name = "profileNew")
-public class ProfileNew {
-
-  protected List<Origin> origin;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-}

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java

@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package io.ebeaninternal.server.autotune.model;

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java

@@ -1,61 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebeaninternal.server.autotune.model.Autotune;
-
-import java.util.Collection;
-
-/**
- * Event where all tuned query information is collected.
- * <p>
- * This is for writing the "all" file on shutdown when using runtime tuning.
- * </p>
- */
-public class AutoTuneAllCollection {
-
-  final Autotune document = new Autotune();
-
-  final BaseQueryTuner queryTuner;
-
-  /**
-   * Construct to collect/report all tuned queries.
-   */
-  public AutoTuneAllCollection(BaseQueryTuner queryTuner) {
-    this.queryTuner = queryTuner;
-    loadAllTuned();
-  }
-
-  /**
-   * Return the number of origin elements in the document.
-   */
-  public int size() {
-    return document.getOrigin().size();
-  }
-
-  /**
-   * Return the Autotune document object.
-   */
-  public Autotune getDocument() {
-    return document;
-  }
-
-  /**
-   * Write the document as an xml file.
-   */
-  public void writeFile(String filePrefix, boolean withNow) {
-
-    AutoTuneXmlWriter writer = new AutoTuneXmlWriter();
-    writer.write(document, filePrefix, withNow);
-  }
-
-  /**
-   * Loads all the existing query tuning into the document.
-   */
-  private void loadAllTuned() {
-
-    Collection<TunedQueryInfo> all = queryTuner.getAll();
-    for (TunedQueryInfo tuned : all) {
-      document.getOrigin().add(tuned.getOrigin());
-    }
-  }
-
-}